diff --git a/DEPS b/DEPS index ae2f72d..134d712 100644 --- a/DEPS +++ b/DEPS
@@ -172,11 +172,11 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': 'f9cad2f75cd25752da4330220167bac148e10087', + 'skia_revision': '40d34e36512a350712fa331b0ed38cfc133cd7f3', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. - 'v8_revision': 'b96468673dae5e92379a49f641ee6bab682ba224', + 'v8_revision': 'adfb6ba32d881a5bba73f9c7121ca9f8dba881b4', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. @@ -188,7 +188,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. - 'swiftshader_revision': 'fb7ca1d5aca5c885520a6ddae7806de9f28ad8ec', + 'swiftshader_revision': '6e2ff45fa936ff77087852d22b1c910d2b3ab487', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. @@ -223,7 +223,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. - 'freetype_revision': 'd4f9c249893a146b0c94a152f7674e288d181f95', + 'freetype_revision': '4270e9f3243079bb90b6af618ed4d4fd31266412', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling HarfBuzz # and whatever else without interference from each other. @@ -243,7 +243,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': '5e2f45a379a7ac7b611b5acb7c2f532cf0505da5', + 'devtools_frontend_revision': '65342e6449b9aa4fcde80f08a62872c219193928', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -303,7 +303,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. - 'dawn_revision': '77f6db7a0b7856376553b470dbe3940a4fbbc30c', + 'dawn_revision': 'fd12e1b746bded4b4432d0ec7c804d6a86deab40', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -862,7 +862,7 @@ # Build tools for Chrome OS. Note: This depends on third_party/pyelftools. 'src/third_party/chromite': { - 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + 'f145c823462756f01ec3c4acac78f4bd4d745127', + 'url': Var('chromium_git') + '/chromiumos/chromite.git' + '@' + '4a339a15d536e12e3e80aca47f8a193195b322f1', 'condition': 'checkout_linux', }, @@ -887,7 +887,7 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '7c62ed63ace59cbdfda4a26c6a24ca0c668e9ef3', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '5ae4817ada0bd02f8c0d9f141d0f3c65701068a5', 'src/third_party/devtools-frontend/src': Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), @@ -1293,7 +1293,7 @@ }, 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + '31b0a5681deabef31e6a114fd954fc911f0c993f', + Var('android_git') + '/platform/external/perfetto.git' + '@' + '8df9e6a2d570315412ec100f9a19dc7105960627', 'src/third_party/perl': { 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', @@ -1494,7 +1494,7 @@ Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'dd55f3ca8f2ea716ca917a4aaf36f0729fe902b1', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '79685304182cd81f34c3d2b80527d4e8de92b04c', + Var('webrtc_git') + '/src.git' + '@' + '89313451d8e2338845716b0ab8760ed0552580f9', # Wuffs' canonical repository is at github.com/google/wuffs, but we use # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file. @@ -1561,7 +1561,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@ae8c170db133c420883e248268212c7ae418097b', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@2f875842fbe0ed2b2763c5b492a82bdfd1bc60d2', 'condition': 'checkout_src_internal', },
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 6c86a695..2d978e9 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py
@@ -415,7 +415,6 @@ '^remoting/signaling/', '^remoting/test/', '^services/', - '^storage/browser/', '^third_party/blink/', '^third_party/crashpad/crashpad/test/gtest_main.cc', '^third_party/leveldatabase/leveldb_chrome.cc',
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 92ee935..3ca2f8c 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc
@@ -887,7 +887,7 @@ bool AwContentBrowserClient::HandleExternalProtocol( const GURL& url, - content::WebContents::Getter web_contents_getter, + content::WebContents::OnceGetter web_contents_getter, int child_id, content::NavigationUIData* navigation_data, bool is_main_frame,
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index 6c639fe..e1ca9d47 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h
@@ -183,7 +183,7 @@ LoginAuthRequiredCallback auth_required_callback) override; bool HandleExternalProtocol( const GURL& url, - content::WebContents::Getter web_contents_getter, + content::WebContents::OnceGetter web_contents_getter, int child_id, content::NavigationUIData* navigation_data, bool is_main_frame,
diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni index fa19e5c..83ac423 100644 --- a/chrome/android/chrome_junit_test_java_sources.gni +++ b/chrome/android/chrome_junit_test_java_sources.gni
@@ -190,6 +190,7 @@ "junit/src/org/chromium/chrome/browser/settings/password/TimedCallbackDelayerTest.java", "junit/src/org/chromium/chrome/browser/settings/privacy/PrivacyPreferencesManagerTest.java", "junit/src/org/chromium/chrome/browser/sharing/click_to_call/ClickToCallMessageHandlerTest.java", + "junit/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachineDelegateTest.java", "junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java", "junit/src/org/chromium/chrome/browser/signin/SigninPromoUtilTest.java", "junit/src/org/chromium/chrome/browser/snackbar/SnackbarCollectionUnitTest.java",
diff --git a/chrome/android/chrome_test_java_sources.gni b/chrome/android/chrome_test_java_sources.gni index fda1101..0e10836 100644 --- a/chrome/android/chrome_test_java_sources.gni +++ b/chrome/android/chrome_test_java_sources.gni
@@ -433,6 +433,7 @@ "javatests/src/org/chromium/chrome/browser/share/ShareUrlTest.java", "javatests/src/org/chromium/chrome/browser/signin/IdentityManagerIntegrationTest.java", "javatests/src/org/chromium/chrome/browser/signin/ProfileDataCacheRenderTest.java", + "javatests/src/org/chromium/chrome/browser/signin/SigninFragmentTest.java", "javatests/src/org/chromium/chrome/browser/signin/SigninHelperTest.java", "javatests/src/org/chromium/chrome/browser/signin/SigninTest.java", "javatests/src/org/chromium/chrome/browser/sms/SmsReceiverInfoBarTest.java",
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTest.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTest.java new file mode 100644 index 0000000..579a8bc5 --- /dev/null +++ b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTest.java
@@ -0,0 +1,132 @@ +// Copyright 2019 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. + +package org.chromium.chrome.browser.tasks.tab_management.suggestions; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.mock; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.annotation.Config; + +import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tab.TabImpl; +import org.chromium.chrome.browser.tabmodel.TabModelFilter; +import org.chromium.chrome.browser.tabmodel.TabModelFilterProvider; +import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.test.util.browser.Features; +import org.chromium.content_public.browser.NavigationController; +import org.chromium.content_public.browser.NavigationEntry; +import org.chromium.content_public.browser.WebContents; +import org.chromium.testing.local.LocalRobolectricTestRunner; + +import java.util.Arrays; +import java.util.List; + +/** + * Tests functionality related to TabContext + */ +@RunWith(LocalRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class TabContextTest { + private static final int TAB_0_ID = 0; + private static final int RELATED_TAB_0_ID = 1; + private static final int RELATED_TAB_1_ID = 2; + private static final int LAST_COMMITTED_INDEX = 1; + + @Rule + public TestRule mProcessor = new Features.JUnitProcessor(); + + @Mock + private TabModelSelector mTabModelSelector; + + @Mock + private TabModelFilterProvider mTabModelFilterProvider; + + @Mock + private TabModelFilter mTabModelFilter; + + private static Tab sTab0 = mockTab(TAB_0_ID, 6, "mock_title_tab_0", "mock_url_tab_0", + "mock_original_url_tab_0", "mock_referrer_url_tab_0", 100); + private static Tab sRelatedTab0 = + mockTab(RELATED_TAB_0_ID, 6, "mock_title_related_tab_0", "mock_url_related_tab_0", + "mock_original_url_related_tab_0", "mock_referrer_url_related_tab_0", 200); + private static Tab sRelatedTab1 = + mockTab(RELATED_TAB_1_ID, 6, "mock_title_related_tab_1", "mock_url_related_tab_1", + "mock_original_url_related_tab_1", "mock_referrer_url_related_tab_1", 300); + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + doReturn(mTabModelFilterProvider).when(mTabModelSelector).getTabModelFilterProvider(); + doReturn(mTabModelFilter).when(mTabModelFilterProvider).getCurrentTabModelFilter(); + } + + private static TabImpl mockTab(int id, int rootId, String title, String url, String originalUrl, + String referrerUrl, long getTimestampMillis) { + TabImpl tab = mock(TabImpl.class); + doReturn(id).when(tab).getId(); + doReturn(rootId).when(tab).getRootId(); + doReturn(title).when(tab).getTitle(); + doReturn(url).when(tab).getUrl(); + doReturn(originalUrl).when(tab).getOriginalUrl(); + WebContents webContents = mock(WebContents.class); + doReturn(webContents).when(tab).getWebContents(); + NavigationController navigationController = mock(NavigationController.class); + doReturn(navigationController).when(webContents).getNavigationController(); + doReturn(LAST_COMMITTED_INDEX).when(navigationController).getLastCommittedEntryIndex(); + NavigationEntry navigationEntry = mock(NavigationEntry.class); + doReturn(navigationEntry) + .when(navigationController) + .getEntryAtIndex(eq(LAST_COMMITTED_INDEX)); + doReturn(referrerUrl).when(navigationEntry).getReferrerUrl(); + return tab; + } + + /** + * Test finding related tabs + */ + @Test + public void testRelatedTabsExist() { + doReturn(sTab0).when(mTabModelFilter).getTabAt(eq(TAB_0_ID)); + doReturn(1).when(mTabModelFilter).getCount(); + doReturn(Arrays.asList(sTab0, sRelatedTab0, sRelatedTab1)) + .when(mTabModelFilter) + .getRelatedTabList(eq(TAB_0_ID)); + TabContext tabContext = TabContext.createCurrentContext(mTabModelSelector); + Assert.assertEquals(tabContext.getUngroupedTabs().size(), 0); + List<TabContext.TabGroupInfo> tabGroupInfo = tabContext.getTabGroups(); + Assert.assertEquals(1, tabGroupInfo.size()); + List<TabContext.TabInfo> groupedTabs = tabGroupInfo.get(0).tabs; + Assert.assertEquals(3, groupedTabs.size()); + Assert.assertEquals(TAB_0_ID, groupedTabs.get(0).id); + Assert.assertEquals(RELATED_TAB_0_ID, groupedTabs.get(1).id); + Assert.assertEquals(RELATED_TAB_1_ID, groupedTabs.get(2).id); + } + + /** + * Test finding no related tabs + */ + @Test + public void testFindNoRelatedTabs() { + doReturn(sTab0).when(mTabModelFilter).getTabAt(eq(TAB_0_ID)); + doReturn(1).when(mTabModelFilter).getCount(); + doReturn(Arrays.asList(sTab0)).when(mTabModelFilter).getRelatedTabList(eq(TAB_0_ID)); + TabContext tabContext = TabContext.createCurrentContext(mTabModelSelector); + Assert.assertEquals(tabContext.getUngroupedTabs().size(), 1); + List<TabContext.TabGroupInfo> tabGroups = tabContext.getTabGroups(); + Assert.assertEquals(0, tabGroups.size()); + List<TabContext.TabInfo> ungroupedTabs = tabContext.getUngroupedTabs(); + Assert.assertEquals(1, ungroupedTabs.size()); + Assert.assertEquals(TAB_0_ID, ungroupedTabs.get(0).id); + } +}
diff --git a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTests.java b/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTests.java deleted file mode 100644 index 2ee11bd3..0000000 --- a/chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTests.java +++ /dev/null
@@ -1,132 +0,0 @@ -// Copyright 2019 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. - -package org.chromium.chrome.browser.tasks.tab_management.suggestions; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.mock; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; - -import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.tab.TabImpl; -import org.chromium.chrome.browser.tabmodel.TabModelFilter; -import org.chromium.chrome.browser.tabmodel.TabModelFilterProvider; -import org.chromium.chrome.browser.tabmodel.TabModelSelector; -import org.chromium.chrome.test.util.browser.Features; -import org.chromium.content_public.browser.NavigationController; -import org.chromium.content_public.browser.NavigationEntry; -import org.chromium.content_public.browser.WebContents; -import org.chromium.testing.local.LocalRobolectricTestRunner; - -import java.util.Arrays; -import java.util.List; - -/** - * Tests functionality related to TabContext - */ -@RunWith(LocalRobolectricTestRunner.class) -@Config(manifest = Config.NONE) -public class TabContextTests { - private static final int TAB_0_ID = 0; - private static final int RELATED_TAB_0_ID = 1; - private static final int RELATED_TAB_1_ID = 2; - private static final int LAST_COMMITTED_INDEX = 1; - - @Rule - public TestRule mProcessor = new Features.JUnitProcessor(); - - @Mock - private TabModelSelector mTabModelSelector; - - @Mock - private TabModelFilterProvider mTabModelFilterProvider; - - @Mock - private TabModelFilter mTabModelFilter; - - private static Tab sTab0 = mockTab(TAB_0_ID, 6, "mock_title_tab_0", "mock_url_tab_0", - "mock_original_url_tab_0", "mock_referrer_url_tab_0", 100); - private static Tab sRelatedTab0 = - mockTab(RELATED_TAB_0_ID, 6, "mock_title_related_tab_0", "mock_url_related_tab_0", - "mock_original_url_related_tab_0", "mock_referrer_url_related_tab_0", 200); - private static Tab sRelatedTab1 = - mockTab(RELATED_TAB_1_ID, 6, "mock_title_related_tab_1", "mock_url_related_tab_1", - "mock_original_url_related_tab_1", "mock_referrer_url_related_tab_1", 300); - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - doReturn(mTabModelFilterProvider).when(mTabModelSelector).getTabModelFilterProvider(); - doReturn(mTabModelFilter).when(mTabModelFilterProvider).getCurrentTabModelFilter(); - } - - private static TabImpl mockTab(int id, int rootId, String title, String url, String originalUrl, - String referrerUrl, long getTimestampMillis) { - TabImpl tab = mock(TabImpl.class); - doReturn(id).when(tab).getId(); - doReturn(rootId).when(tab).getRootId(); - doReturn(title).when(tab).getTitle(); - doReturn(url).when(tab).getUrl(); - doReturn(originalUrl).when(tab).getOriginalUrl(); - WebContents webContents = mock(WebContents.class); - doReturn(webContents).when(tab).getWebContents(); - NavigationController navigationController = mock(NavigationController.class); - doReturn(navigationController).when(webContents).getNavigationController(); - doReturn(LAST_COMMITTED_INDEX).when(navigationController).getLastCommittedEntryIndex(); - NavigationEntry navigationEntry = mock(NavigationEntry.class); - doReturn(navigationEntry) - .when(navigationController) - .getEntryAtIndex(eq(LAST_COMMITTED_INDEX)); - doReturn(referrerUrl).when(navigationEntry).getReferrerUrl(); - return tab; - } - - /** - * Test finding related tabs - */ - @Test - public void testRelatedTabsExist() { - doReturn(sTab0).when(mTabModelFilter).getTabAt(eq(TAB_0_ID)); - doReturn(1).when(mTabModelFilter).getCount(); - doReturn(Arrays.asList(sTab0, sRelatedTab0, sRelatedTab1)) - .when(mTabModelFilter) - .getRelatedTabList(eq(TAB_0_ID)); - TabContext tabContext = TabContext.createCurrentContext(mTabModelSelector); - Assert.assertEquals(tabContext.getUngroupedTabs().size(), 0); - List<TabContext.TabGroupInfo> tabGroupInfo = tabContext.getTabGroups(); - Assert.assertEquals(1, tabGroupInfo.size()); - List<TabContext.TabInfo> groupedTabs = tabGroupInfo.get(0).tabs; - Assert.assertEquals(3, groupedTabs.size()); - Assert.assertEquals(TAB_0_ID, groupedTabs.get(0).id); - Assert.assertEquals(RELATED_TAB_0_ID, groupedTabs.get(1).id); - Assert.assertEquals(RELATED_TAB_1_ID, groupedTabs.get(2).id); - } - - /** - * Test finding no related tabs - */ - @Test - public void testFindNoRelatedTabs() { - doReturn(sTab0).when(mTabModelFilter).getTabAt(eq(TAB_0_ID)); - doReturn(1).when(mTabModelFilter).getCount(); - doReturn(Arrays.asList(sTab0)).when(mTabModelFilter).getRelatedTabList(eq(TAB_0_ID)); - TabContext tabContext = TabContext.createCurrentContext(mTabModelSelector); - Assert.assertEquals(tabContext.getUngroupedTabs().size(), 1); - List<TabContext.TabGroupInfo> tabGroups = tabContext.getTabGroups(); - Assert.assertEquals(0, tabGroups.size()); - List<TabContext.TabInfo> ungroupedTabs = tabContext.getUngroupedTabs(); - Assert.assertEquals(1, ungroupedTabs.size()); - Assert.assertEquals(TAB_0_ID, ungroupedTabs.get(0).id); - } -}
diff --git a/chrome/android/features/tab_ui/tab_management_java_sources.gni b/chrome/android/features/tab_ui/tab_management_java_sources.gni index fb50f5e9..df01a1c5 100644 --- a/chrome/android/features/tab_ui/tab_management_java_sources.gni +++ b/chrome/android/features/tab_ui/tab_management_java_sources.gni
@@ -63,7 +63,7 @@ "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSuggestionMessageServiceUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabSwitcherMediatorUnitTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabUiUnitTestUtils.java", - "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTests.java", + "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabContextObserverTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsOrchestratorTest.java", "//chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/StaleTabSuggestionProviderTest.java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/FetchIconWorkerTask.java b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/FetchIconWorkerTask.java index 7e31c68..6bb6f2d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/FetchIconWorkerTask.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/FetchIconWorkerTask.java
@@ -78,7 +78,6 @@ if (cursor.moveToFirst()) { byte[] data = cursor.getBlob(0); if (data != null) { - // TODO(finnur): Before launching, verify images have already been re-encoded. return BitmapFactory.decodeStream(new ByteArrayInputStream(data)); } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java index f8028dc..6fc5cd4e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerBitmapView.java
@@ -9,6 +9,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; +import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.BitmapDrawable; @@ -97,6 +98,10 @@ // Whether the image has been loaded already. private boolean mImageLoaded; + // The background color to use for the tile (either the special tile or for pictures, when not + // animating). + private int mBackgroundColor = Color.TRANSPARENT; + // The selected state of a given picture tile. private boolean mSelectedState; @@ -188,6 +193,7 @@ @Override protected boolean toggleSelectionForItem(PickerBitmap item) { if (isGalleryTile() || isCameraTile()) return false; + if (mCategoryView.isZoomSwitchingInEffect()) return false; return super.toggleSelectionForItem(item); } @@ -458,7 +464,9 @@ setEnabled(!anySelection); } - setBackgroundColor(ApiCompatibilityUtils.getColor(resources, bgColorId)); + mBackgroundColor = ApiCompatibilityUtils.getColor(resources, bgColorId); + setBackgroundColor(mCategoryView.isZoomSwitchingInEffect() && !special ? Color.TRANSPARENT + : mBackgroundColor); // The visibility of the unselected toggle for multi-selection mode is a little more complex // because we don't want to show it when nothing is selected and also not on a blank canvas.
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java index 8799b3ca..103a8ae 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PickerCategoryView.java
@@ -15,6 +15,9 @@ import android.os.SystemClock; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; +import android.transition.ChangeBounds; +import android.transition.Transition; +import android.transition.TransitionManager; import android.util.DisplayMetrics; import android.util.LruCache; import android.view.LayoutInflater; @@ -44,6 +47,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; /** @@ -410,6 +414,14 @@ } private void flipZoomMode() { + // Bitmap scaling is cumulative, so if an image is selected when we switch modes, it will + // become skewed when switching between full size and square modes because dimensions of the + // picture also change (from square to full width). We therefore un-select all items before + // starting the animation and then reselect them once animation has ended. + final HashSet<PickerBitmap> selectedItems = + new HashSet<>(mSelectionDelegate.getSelectedItems()); + mSelectionDelegate.clearSelection(); + mMagnifyingMode = !mMagnifyingMode; ImageView zoom = findViewById(R.id.zoom); @@ -421,6 +433,33 @@ calculateGridMetrics(); + mZoomSwitchingInEffect = true; + + ChangeBounds transition = new ChangeBounds(); + transition.addListener(new Transition.TransitionListener() { + @Override + public void onTransitionStart(Transition transition) {} + + @Override + public void onTransitionEnd(Transition transition) { + mZoomSwitchingInEffect = false; + + // Redo selection when switching between modes to make it obvious what got selected. + mSelectionDelegate.setSelectedItems(selectedItems); + } + + @Override + public void onTransitionCancel(Transition transition) {} + + @Override + public void onTransitionPause(Transition transition) {} + + @Override + public void onTransitionResume(Transition transition) {} + }); + + TransitionManager.beginDelayedTransition(mRecyclerView, transition); + mLayoutManager.setSpanCount(mColumns); mPickerAdapter.notifyDataSetChanged(); mRecyclerView.requestLayout(); @@ -444,6 +483,10 @@ return mMagnifyingMode; } + public boolean isZoomSwitchingInEffect() { + return mZoomSwitchingInEffect; + } + public SelectionDelegate<PickerBitmap> getSelectionDelegate() { return mSelectionDelegate; }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivity.java index 889790d..d0b6e0f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivity.java
@@ -5,11 +5,13 @@ package org.chromium.chrome.browser.signin; import android.content.Context; +import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import androidx.annotation.IntDef; + import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeBaseAppCompatActivity; import org.chromium.chrome.browser.init.ChromeBrowserInitializer; @@ -24,7 +26,7 @@ */ // TODO(https://crbug.com/820491): extend AsyncInitializationActivity. public class SigninActivity extends ChromeBaseAppCompatActivity { - static final String ARGUMENT_FRAGMENT_ARGS = "SigninActivity.FragmentArgs"; + private static final String ARGUMENT_FRAGMENT_ARGS = "SigninActivity.FragmentArgs"; @IntDef({SigninAccessPoint.SETTINGS, SigninAccessPoint.BOOKMARK_MANAGER, SigninAccessPoint.RECENT_TABS, SigninAccessPoint.SIGNIN_PROMO, @@ -64,8 +66,20 @@ Fragment fragment = fragmentManager.findFragmentById(R.id.fragment_container); if (fragment == null) { Bundle fragmentArgs = getIntent().getBundleExtra(ARGUMENT_FRAGMENT_ARGS); - fragment = Fragment.instantiate(this, SigninFragment.class.getName(), fragmentArgs); + fragment = new SigninFragment(); + fragment.setArguments(fragmentArgs); fragmentManager.beginTransaction().add(R.id.fragment_container, fragment).commit(); } } + + /** + * Create a new intent to start the SigninActivity. + * + * @param fragmentArgs arguments to create an Sign-in Fragment. + */ + static Intent createIntent(Context context, Bundle fragmentArgs) { + Intent intent = new Intent(context, SigninActivity.class); + intent.putExtra(ARGUMENT_FRAGMENT_ARGS, fragmentArgs); + return intent; + } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivityLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivityLauncher.java index 82a5eb8..f8923b71 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivityLauncher.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninActivityLauncher.java
@@ -79,8 +79,7 @@ } private void launchInternal(Context context, Bundle fragmentArgs) { - Intent intent = new Intent(context, SigninActivity.class); - intent.putExtra(SigninActivity.ARGUMENT_FRAGMENT_ARGS, fragmentArgs); + Intent intent = SigninActivity.createIntent(context, fragmentArgs); context.startActivity(intent); } }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragment.java index fe07611..698aed0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninFragment.java
@@ -11,7 +11,6 @@ import androidx.annotation.IntDef; import androidx.annotation.Nullable; -import org.chromium.base.annotations.UsedByReflection; import org.chromium.base.metrics.RecordHistogram; import org.chromium.base.metrics.RecordUserAction; import org.chromium.chrome.R; @@ -96,10 +95,6 @@ return result; } - // Every fragment must have a public default constructor. - @UsedByReflection("SigninActivity.java") - public SigninFragment() {} - @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninFragmentTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninFragmentTest.java new file mode 100644 index 0000000..9c408d5 --- /dev/null +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/signin/SigninFragmentTest.java
@@ -0,0 +1,85 @@ +// Copyright 2019 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. +package org.chromium.chrome.browser.signin; + +import android.accounts.Account; +import android.support.test.InstrumentationRegistry; +import android.view.View; + +import androidx.test.filters.LargeTest; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.chromium.base.test.util.CommandLineFlags; +import org.chromium.base.test.util.Feature; +import org.chromium.chrome.R; +import org.chromium.chrome.browser.ChromeSwitches; +import org.chromium.chrome.browser.sync.SyncTestRule; +import org.chromium.chrome.test.ChromeJUnit4ClassRunner; +import org.chromium.chrome.test.ui.DisableAnimationsTestRule; +import org.chromium.chrome.test.util.ActivityUtils; +import org.chromium.chrome.test.util.RenderTestRule; +import org.chromium.components.signin.metrics.SigninAccessPoint; + +import java.io.IOException; + +/** + * Render tests for signin fragment. + */ +@RunWith(ChromeJUnit4ClassRunner.class) +@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) +public class SigninFragmentTest { + @Rule + public final DisableAnimationsTestRule mNoAnimationsRule = new DisableAnimationsTestRule(); + + @Rule + public final SyncTestRule mSyncTestRule = new SyncTestRule(); + + @Rule + public final RenderTestRule mRenderTestRule = new RenderTestRule(); + + @Test + @LargeTest + @Feature("RenderTest") + public void testSigninFragmentNewAccount() throws IOException { + View view = getSigninFragmentViewAfterStartingActivity(() -> { + SigninActivityLauncher.get().launchActivityForPromoAddAccountFlow( + mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER); + }); + mRenderTestRule.render(view, "signin_fragment_new_account"); + } + + @Test + @LargeTest + @Feature("RenderTest") + public void testSigninFragmentNotDefaultAccount() throws IOException { + Account account = mSyncTestRule.setUpTestAccount(); + View view = getSigninFragmentViewAfterStartingActivity(() -> { + SigninActivityLauncher.get().launchActivityForPromoChooseAccountFlow( + mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER, account.name); + }); + mRenderTestRule.render(view, "signin_fragment_not_default_account"); + } + + @Test + @LargeTest + @Feature("RenderTest") + public void testSigninFragmentDefaultAccount() throws IOException { + Account account = mSyncTestRule.setUpTestAccount(); + View view = getSigninFragmentViewAfterStartingActivity(() -> { + SigninActivityLauncher.get().launchActivityForPromoDefaultFlow( + mSyncTestRule.getActivity(), SigninAccessPoint.BOOKMARK_MANAGER, account.name); + }); + mRenderTestRule.render(view, "signin_fragment_default_account"); + } + + private View getSigninFragmentViewAfterStartingActivity(Runnable activityTrigger) { + SigninActivity signinActivity = + ActivityUtils.waitForActivity(InstrumentationRegistry.getInstrumentation(), + SigninActivity.class, activityTrigger); + return signinActivity.findViewById(R.id.fragment_container); + } +}
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachineDelegateTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachineDelegateTest.java new file mode 100644 index 0000000..efacef6 --- /dev/null +++ b/chrome/android/junit/src/org/chromium/chrome/browser/signin/ConfirmSyncDataStateMachineDelegateTest.java
@@ -0,0 +1,76 @@ +// Copyright 2019 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. +package org.chromium.chrome.browser.signin; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; +import android.support.v7.app.AlertDialog; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.Robolectric; +import org.robolectric.annotation.Config; +import org.robolectric.shadows.ShadowAlertDialog; + +import org.chromium.base.test.BaseRobolectricTestRunner; + +/** Tests for {@link ConfirmSyncDataStateMachineDelegate}. */ +@RunWith(BaseRobolectricTestRunner.class) +@Config(manifest = Config.NONE) +public class ConfirmSyncDataStateMachineDelegateTest { + private FragmentManager mFragmentManager; + private ConfirmSyncDataStateMachineDelegate mStateMachineDelegate; + + @Before + public void setUp() { + mFragmentManager = + Robolectric.setupActivity(FragmentActivity.class).getSupportFragmentManager(); + mStateMachineDelegate = new ConfirmSyncDataStateMachineDelegate(mFragmentManager); + } + + @Test + public void testTimeoutDialogWhenPositiveButtonPressed() { + ConfirmSyncDataStateMachineDelegate.TimeoutDialogListener mockListener = + mock(ConfirmSyncDataStateMachineDelegate.TimeoutDialogListener.class); + mStateMachineDelegate.showFetchManagementPolicyTimeoutDialog(mockListener); + AlertDialog alertDialog = (AlertDialog) ShadowAlertDialog.getLatestDialog(); + alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick(); + verify(mockListener).onRetry(); + } + + @Test + public void testTimeoutDialogWhenNegativeButtonPressed() { + ConfirmSyncDataStateMachineDelegate.TimeoutDialogListener mockListener = + mock(ConfirmSyncDataStateMachineDelegate.TimeoutDialogListener.class); + mStateMachineDelegate.showFetchManagementPolicyTimeoutDialog(mockListener); + AlertDialog alertDialog = (AlertDialog) ShadowAlertDialog.getLatestDialog(); + alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); + verify(mockListener).onCancel(); + } + + @Test + public void testProgressDialog() { + ConfirmSyncDataStateMachineDelegate.ProgressDialogListener mockListener = + mock(ConfirmSyncDataStateMachineDelegate.ProgressDialogListener.class); + mStateMachineDelegate.showFetchManagementPolicyProgressDialog(mockListener); + AlertDialog alertDialog = (AlertDialog) ShadowAlertDialog.getLatestDialog(); + alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick(); + verify(mockListener).onCancel(); + } + + @Test + public void testDismissAllDialogs() { + ConfirmSyncDataStateMachineDelegate.TimeoutDialogListener mockListener = + mock(ConfirmSyncDataStateMachineDelegate.TimeoutDialogListener.class); + mStateMachineDelegate.showFetchManagementPolicyTimeoutDialog(mockListener); + Assert.assertEquals(1, mFragmentManager.getFragments().size()); + mStateMachineDelegate.dismissAllDialogs(); + Assert.assertEquals(0, mFragmentManager.getFragments().size()); + } +}
diff --git a/chrome/app/bookmarks_strings.grdp b/chrome/app/bookmarks_strings.grdp index 45a6627..d049041 100644 --- a/chrome/app/bookmarks_strings.grdp +++ b/chrome/app/bookmarks_strings.grdp
@@ -200,16 +200,7 @@ </if> <!-- End of Bookmarks Bubble strings. --> - <!-- Begin of Bookmarks Sync Promo strings. --> - <message name="IDS_BOOKMARK_SYNC_PROMO_MESSAGE" desc="Text of the sync promo displayed at the bottom of the bookmark bubble."> - To get your bookmarks on all your devices, <ph name="SIGN_IN_LINK">$1<ex>sign in</ex></ph>. - </message> - <!-- End of Bookmarks Sync Promo strings. --> - <!-- Begin of Bookmarks Sync Promo strings for Desktop Identity Consistency. --> - <message name="IDS_BOOKMARK_DICE_PROMO_SIGNIN_MESSAGE" desc="Text of the sync promo displayed at the bottom of the bookmark bubble asking the user to sign in and enable sync."> - To get your bookmarks on all your devices, sign in and turn on sync. - </message> <message name="IDS_BOOKMARK_DICE_PROMO_SYNC_MESSAGE" desc="Text of the sync promo displayed at the bottom of the bookmark bubble asking the user to enable sync."> To get your bookmarks on all your devices, turn on sync. </message>
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index e9142c3..90228f4 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd
@@ -188,9 +188,6 @@ New window </message> </if> - <message name="IDS_BOOKMARK_SYNC_PROMO_LINK" desc="Text of the link to sign in from the bookmark sync promo."> - sign in to Chromium - </message> <message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window"> Task Manager - Chromium </message> @@ -489,9 +486,6 @@ <message name="IDS_EXTENSION_INSTALLED_HEADING" desc="Title of the extension-installed bubble. Instructs that the extension was installed."> <ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph> has been added to Chromium </message> - <message name="IDS_EXTENSION_INSTALLED_SYNC_PROMO_LINK_NEW" desc="Text of the link to sign in to Chromium from the extension installed bubble. This will be converted to a link, with additional text around it."> - sign in to Chromium - </message> <!-- Extension uninstall prompt --> <message name="IDS_EXTENSION_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX" desc="Checkbox text to ask the user whether they want to remove associated data at uninstall time. Only used when uninstalling an app associated with a particular website.">
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 9674b49d..3503325 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd
@@ -4152,14 +4152,8 @@ <message name="IDS_EXTENSION_INSTALLED_MANAGE_SHORTCUTS" desc="Text for the link in the InfoBubble that opens the chrome://extensions page with the Configure Commands UI visible."> Manage shortcuts </message> - <message name="IDS_EXTENSION_INSTALLED_SYNC_PROMO_NEW" desc="Text of the sync promo at the bottom of the extension installed bubble, prompting the user to sign in in order to sync extensions."> - To get your extensions on all your computers, <ph name="SIGN_IN_LINK">$1<ex>sign in to Chrome</ex></ph>. - </message> <!-- Begin of Sync Promo strings for Desktop Identity Consistency. --> - <message name="IDS_EXTENSION_INSTALLED_DICE_PROMO_SIGNIN_MESSAGE" desc="Text of the sync promo displayed at the bottom of the extension installed bubble asking the user to sign in and enable sync."> - To get your extensions on all your computers, sign in and turn on sync - </message> <message name="IDS_EXTENSION_INSTALLED_DICE_PROMO_SYNC_MESSAGE" desc="Text of the sync promo displayed at the bottom of the extension installed bubble asking the user to enable sync."> To get your extensions on all your computers, turn on sync </message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 9d93478..d30a18e 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd
@@ -194,9 +194,6 @@ New window </message> </if> - <message name="IDS_BOOKMARK_SYNC_PROMO_LINK" desc="Text of the link to sign in from the bookmark sync promo."> - sign in to Chrome - </message> <message name="IDS_TASK_MANAGER_TITLE" desc="The title of the Task Manager window"> Task Manager - Google Chrome </message> @@ -501,9 +498,6 @@ <message name="IDS_EXTENSION_INSTALLED_HEADING" desc="Title of the extension-installed bubble. Instructs that the extension was installed."> <ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph> has been added to Chrome </message> - <message name="IDS_EXTENSION_INSTALLED_SYNC_PROMO_LINK_NEW" desc="Text of the link to sign in to Chrome from the extension installed bubble. This will be converted to a link, with additional text around it."> - sign in to Chrome - </message> <!-- Extension uninstall prompt --> <message name="IDS_EXTENSION_UNINSTALL_PROMPT_REMOVE_DATA_CHECKBOX" desc="Checkbox text to ask the user whether they want to remove associated data at uninstall time. Only used when uninstalling an app associated with a particular website.">
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index baea9dd..5bf1789 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -312,6 +312,8 @@ "component_updater/component_updater_utils.h", "component_updater/crl_set_component_installer.cc", "component_updater/crl_set_component_installer.h", + "component_updater/crowd_deny_component_installer.cc", + "component_updater/crowd_deny_component_installer.h", "component_updater/file_type_policies_component_installer.cc", "component_updater/file_type_policies_component_installer.h", "component_updater/games_component_installer.cc", @@ -1170,6 +1172,8 @@ "permissions/adaptive_notification_permission_ui_selector.h", "permissions/chooser_context_base.cc", "permissions/chooser_context_base.h", + "permissions/crowd_deny_preload_data.cc", + "permissions/crowd_deny_preload_data.h", "permissions/crowd_deny_safe_browsing_request.cc", "permissions/crowd_deny_safe_browsing_request.h", "permissions/permission_context_base.cc", @@ -1941,6 +1945,7 @@ ":buildflags", ":expired_flags_list", ":ntp_background_proto", + ":permissions_proto", ":resource_prefetch_predictor_proto", "//base:i18n", "//base/allocator:buildflags", @@ -3096,6 +3101,7 @@ "enterprise_reporting/profile_report_generator.h", "enterprise_reporting/report_generator.cc", "enterprise_reporting/report_generator.h", + "enterprise_reporting/report_request_definition.h", "enterprise_reporting/report_request_queue_generator.cc", "enterprise_reporting/report_request_queue_generator.h", "enterprise_reporting/report_scheduler.cc", @@ -3460,6 +3466,8 @@ "serial/serial_chooser_context_factory.h", "sharing/click_to_call/click_to_call_context_menu_observer.cc", "sharing/click_to_call/click_to_call_context_menu_observer.h", + "sharing/click_to_call/click_to_call_metrics.cc", + "sharing/click_to_call/click_to_call_metrics.h", "sharing/click_to_call/click_to_call_ui_controller.cc", "sharing/click_to_call/click_to_call_ui_controller.h", "sharing/click_to_call/click_to_call_utils.cc", @@ -5333,6 +5341,12 @@ ] } +proto_library("permissions_proto") { + sources = [ + "permissions/crowd_deny.proto", + ] +} + grit("resources") { source = "browser_resources.grd"
diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc index 110cca0..18a6966a2 100644 --- a/chrome/browser/accessibility/accessibility_ui.cc +++ b/chrome/browser/accessibility/accessibility_ui.cc
@@ -163,7 +163,7 @@ void HandleAccessibilityRequestCallback( content::BrowserContext* current_context, const std::string& path, - const content::WebUIDataSource::GotDataCallback& callback) { + content::WebUIDataSource::GotDataCallback callback) { DCHECK(ShouldHandleAccessibilityRequestCallback(path)); base::DictionaryValue data; @@ -250,7 +250,7 @@ std::string json_string; base::JSONWriter::Write(data, &json_string); - callback.Run(base::RefCountedString::TakeString(&json_string)); + std::move(callback).Run(base::RefCountedString::TakeString(&json_string)); } bool MatchesPropertyFilters(
diff --git a/chrome/browser/apps/app_service/app_icon_source.cc b/chrome/browser/apps/app_service/app_icon_source.cc index 997b847..4744dfa 100644 --- a/chrome/browser/apps/app_service/app_icon_source.cc +++ b/chrome/browser/apps/app_service/app_icon_source.cc
@@ -24,7 +24,7 @@ namespace { -void LoadDefaultImage(const content::URLDataSource::GotDataCallback& callback) { +void LoadDefaultImage(content::URLDataSource::GotDataCallback callback) { base::StringPiece contents = ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( IDR_APP_DEFAULT_ICON, apps_util::GetPrimaryDisplayUIScaleFactor()); @@ -32,18 +32,18 @@ base::RefCountedBytes* image_bytes = new base::RefCountedBytes(); image_bytes->data().assign(contents.data(), contents.data() + contents.size()); - callback.Run(image_bytes); + std::move(callback).Run(image_bytes); } -void RunCallback(const content::URLDataSource::GotDataCallback& callback, +void RunCallback(content::URLDataSource::GotDataCallback callback, apps::mojom::IconValuePtr iv) { if (!iv->compressed.has_value() || iv->compressed.value().empty()) { - LoadDefaultImage(callback); + LoadDefaultImage(std::move(callback)); return; } base::RefCountedBytes* image_bytes = new base::RefCountedBytes(iv->compressed.value()); - callback.Run(image_bytes); + std::move(callback).Run(image_bytes); } } // namespace @@ -59,7 +59,7 @@ void AppIconSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { const std::string path_lower = base::ToLowerASCII(content::URLDataSource::URLToRequestPath(url)); std::vector<std::string> path_parts = base::SplitString( @@ -67,7 +67,7 @@ // Check data exists, load default image if it doesn't. if (path_lower.empty() || path_parts.size() < 2) { - LoadDefaultImage(callback); + LoadDefaultImage(std::move(callback)); return; } @@ -76,7 +76,7 @@ std::string size_param = path_parts[1]; int size = 0; if (!base::StringToInt(size_param, &size)) { - LoadDefaultImage(callback); + LoadDefaultImage(std::move(callback)); return; } constexpr bool quantize_to_supported_scale_factor = true; @@ -86,7 +86,7 @@ apps::AppServiceProxy* app_service_proxy = apps::AppServiceProxyFactory::GetForProfile(profile_); if (!app_service_proxy) { - LoadDefaultImage(callback); + LoadDefaultImage(std::move(callback)); return; } @@ -95,7 +95,8 @@ constexpr bool allow_placeholder_icon = false; app_service_proxy->LoadIcon( app_type, app_id, apps::mojom::IconCompression::kCompressed, size_in_dip, - allow_placeholder_icon, base::BindOnce(&RunCallback, callback)); + allow_placeholder_icon, + base::BindOnce(&RunCallback, std::move(callback))); } std::string AppIconSource::GetMimeType(const std::string&) {
diff --git a/chrome/browser/apps/app_service/app_icon_source.h b/chrome/browser/apps/app_service/app_icon_source.h index 296036d0..4a2c03c 100644 --- a/chrome/browser/apps/app_service/app_icon_source.h +++ b/chrome/browser/apps/app_service/app_icon_source.h
@@ -39,7 +39,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string&) override; bool AllowCaching() override; bool ShouldReplaceExistingSource() override;
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc index 6928507..6e047ab 100644 --- a/chrome/browser/apps/guest_view/web_view_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -158,7 +158,7 @@ class WebContentsHiddenObserver : public content::WebContentsObserver { public: WebContentsHiddenObserver(content::WebContents* web_contents, - base::Closure hidden_callback) + base::OnceClosure hidden_callback) : WebContentsObserver(web_contents), hidden_callback_(std::move(hidden_callback)), hidden_observed_(false) {} @@ -167,14 +167,14 @@ void OnVisibilityChanged(content::Visibility visibility) override { if (visibility == content::Visibility::HIDDEN) { hidden_observed_ = true; - hidden_callback_.Run(); + std::move(hidden_callback_).Run(); } } bool hidden_observed() { return hidden_observed_; } private: - base::Closure hidden_callback_; + base::OnceClosure hidden_callback_; bool hidden_observed_; DISALLOW_COPY_AND_ASSIGN(WebContentsHiddenObserver);
diff --git a/chrome/browser/autofill/content_autofill_driver_browsertest.cc b/chrome/browser/autofill/content_autofill_driver_browsertest.cc index a0e590b..3bb6320 100644 --- a/chrome/browser/autofill/content_autofill_driver_browsertest.cc +++ b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
@@ -116,8 +116,8 @@ void OnVisibilityChanged(content::Visibility visibility) override { if (visibility == content::Visibility::HIDDEN && - !web_contents_hidden_callback_.is_null()) { - web_contents_hidden_callback_.Run(); + web_contents_hidden_callback_) { + std::move(web_contents_hidden_callback_).Run(); } } @@ -126,17 +126,16 @@ if (!navigation_handle->HasCommitted()) return; - if (!nav_entry_committed_callback_.is_null()) - nav_entry_committed_callback_.Run(); + if (nav_entry_committed_callback_) + std::move(nav_entry_committed_callback_).Run(); if (navigation_handle->IsSameDocument() && - !same_document_navigation_callback_.is_null()) { - same_document_navigation_callback_.Run(); + same_document_navigation_callback_) { + std::move(same_document_navigation_callback_).Run(); } - if (!navigation_handle->IsInMainFrame() && - !subframe_navigation_callback_.is_null()) { - subframe_navigation_callback_.Run(); + if (!navigation_handle->IsInMainFrame() && subframe_navigation_callback_) { + std::move(subframe_navigation_callback_).Run(); } } @@ -174,10 +173,10 @@ } protected: - base::Closure web_contents_hidden_callback_; - base::Closure nav_entry_committed_callback_; - base::Closure same_document_navigation_callback_; - base::Closure subframe_navigation_callback_; + base::OnceClosure web_contents_hidden_callback_; + base::OnceClosure nav_entry_committed_callback_; + base::OnceClosure same_document_navigation_callback_; + base::OnceClosure subframe_navigation_callback_; std::unique_ptr<testing::NiceMock<MockAutofillClient>> autofill_client_; }; @@ -193,7 +192,6 @@ GURL(url::kAboutBlankURL), ui::PAGE_TRANSITION_AUTO_TOPLEVEL); runner->Run(); - web_contents_hidden_callback_.Reset(); } IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest, @@ -216,7 +214,6 @@ embedded_test_server()->GetURL("/autofill/autofill_test_form.html#foo")); // This will block until a same document navigation is observed. runner->Run(); - same_document_navigation_callback_.Reset(); } IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest, @@ -239,7 +236,6 @@ iframe_url)); // This will block until a subframe navigation is observed. runner->Run(); - subframe_navigation_callback_.Reset(); } IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest, @@ -257,7 +253,6 @@ GURL(chrome::kChromeUIAboutURL), content::Referrer(), WindowOpenDisposition::CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false)); runner->Run(); - nav_entry_committed_callback_.Reset(); } IN_PROC_BROWSER_TEST_F(ContentAutofillDriverBrowserTest,
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 95f1240..becd64d7 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc
@@ -19,10 +19,12 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/common/chrome_features.h" #include "chrome/common/extensions/extension_constants.h" #include "components/crx_file/id_util.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_host.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" @@ -85,9 +87,14 @@ ExtensionRegistry* registry = ExtensionRegistry::Get(service->profile()); const ExtensionSet& enabled_extensions = registry->enabled_extensions(); + auto* process_manager = extensions::ProcessManager::Get(service->profile()); + for (const auto& extension : enabled_extensions) { - if (BackgroundApplicationListModel::IsBackgroundApp(*extension, - service->profile())) { + if (BackgroundApplicationListModel::IsPersistentBackgroundApp( + *extension, service->profile()) || + (BackgroundApplicationListModel::IsTransientBackgroundApp( + *extension, service->profile()) && + process_manager->GetBackgroundHostForExtension(extension->id()))) { applications_result->push_back(extension); } } @@ -96,8 +103,8 @@ // crashed doesn't mean we should ignore it). const ExtensionSet& terminated_extensions = registry->terminated_extensions(); for (const auto& extension : terminated_extensions) { - if (BackgroundApplicationListModel::IsBackgroundApp(*extension, - service->profile())) { + if (BackgroundApplicationListModel::IsPersistentBackgroundApp( + *extension, service->profile())) { applications_result->push_back(extension); } } @@ -230,8 +237,9 @@ } // static -bool BackgroundApplicationListModel::IsBackgroundApp( - const Extension& extension, Profile* profile) { +bool BackgroundApplicationListModel::IsPersistentBackgroundApp( + const Extension& extension, + Profile* profile) { // An extension is a "background app" if it has the "background API" // permission, and meets one of the following criteria: // 1) It is an extension (not a hosted app). @@ -269,6 +277,25 @@ return false; } +// static +bool BackgroundApplicationListModel::IsTransientBackgroundApp( + const Extension& extension, + Profile* profile) { + return base::FeatureList::IsEnabled(features::kOnConnectNative) && + extension.permissions_data()->HasAPIPermission( + APIPermission::kTransientBackground) && + extensions::BackgroundInfo::HasLazyBackgroundPage(&extension); +} + +bool BackgroundApplicationListModel::HasPersistentBackgroundApps() const { + for (auto& extension : extensions_) { + if (IsPersistentBackgroundApp(*extension, profile_)) { + return true; + } + } + return false; +} + void BackgroundApplicationListModel::Observe( int type, const content::NotificationSource& source, @@ -321,12 +348,16 @@ background_contents_service_observer_.Add( BackgroundContentsServiceFactory::GetForProfile(profile_)); + if (base::FeatureList::IsEnabled(features::kOnConnectNative)) + process_manager_observer_.Add(extensions::ProcessManager::Get(profile_)); + startup_done_ = true; } void BackgroundApplicationListModel::OnShutdown(ExtensionRegistry* registry) { DCHECK_EQ(ExtensionRegistry::Get(profile_), registry); extension_registry_observer_.Remove(registry); + process_manager_observer_.RemoveAll(); } void BackgroundApplicationListModel::OnBackgroundContentsServiceChanged() { @@ -341,17 +372,18 @@ const Extension* extension, UpdatedExtensionPermissionsInfo::Reason reason, const PermissionSet& permissions) { - if (permissions.HasAPIPermission(APIPermission::kBackground)) { + if (permissions.HasAPIPermission(APIPermission::kBackground) || + (base::FeatureList::IsEnabled(features::kOnConnectNative) && + permissions.HasAPIPermission(APIPermission::kTransientBackground))) { switch (reason) { case UpdatedExtensionPermissionsInfo::ADDED: - DCHECK(IsBackgroundApp(*extension, profile_)); - Update(); - AssociateApplicationData(extension); - break; case UpdatedExtensionPermissionsInfo::REMOVED: - DCHECK(!IsBackgroundApp(*extension, profile_)); Update(); - DissociateApplicationData(extension); + if (IsBackgroundApp(*extension, profile_)) { + AssociateApplicationData(extension); + } else { + DissociateApplicationData(extension); + } break; default: NOTREACHED(); @@ -391,3 +423,22 @@ observer.OnApplicationListChanged(profile_); } } + +void BackgroundApplicationListModel::OnBackgroundHostCreated( + extensions::ExtensionHost* host) { + if (IsTransientBackgroundApp(*host->extension(), profile_)) { + Update(); + } +} + +void BackgroundApplicationListModel::OnBackgroundHostClose( + const std::string& extension_id) { + auto* extension = + ExtensionRegistry::Get(profile_)->GetInstalledExtension(extension_id); + + if (!extension || !IsTransientBackgroundApp(*extension, profile_)) { + return; + } + + Update(); +}
diff --git a/chrome/browser/background/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h index 5f2d648..9a1c8087 100644 --- a/chrome/browser/background/background_application_list_model.h +++ b/chrome/browser/background/background_application_list_model.h
@@ -20,6 +20,8 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/extension_registry_observer.h" +#include "extensions/browser/process_manager.h" +#include "extensions/browser/process_manager_observer.h" #include "extensions/common/extension.h" class Profile; @@ -38,7 +40,8 @@ class BackgroundApplicationListModel : public content::NotificationObserver, public extensions::ExtensionRegistryObserver, - public BackgroundContentsServiceObserver { + public BackgroundContentsServiceObserver, + public extensions::ProcessManagerObserver { public: // Observer is informed of changes to the model. Users of the // BackgroundApplicationListModel should anticipate that associated data, @@ -83,7 +86,20 @@ // Returns true if the passed extension is a background app. static bool IsBackgroundApp(const extensions::Extension& extension, - Profile* profile); + Profile* profile) { + return IsPersistentBackgroundApp(extension, profile) || + IsTransientBackgroundApp(extension, profile); + } + + // Returns true if the passed extension is a persistent background app. + static bool IsPersistentBackgroundApp(const extensions::Extension& extension, + Profile* profile); + + // Returns true if the passed extension is a transient background app. + // Transient background apps should only be treated as background apps while + // their background page is active. + static bool IsTransientBackgroundApp(const extensions::Extension& extension, + Profile* profile); // Dissociate observer from this model. void RemoveObserver(Observer* observer); @@ -103,6 +119,8 @@ // Returns true if all startup notifications have already been issued. bool startup_done() const { return startup_done_; } + bool HasPersistentBackgroundApps() const; + private: // Contains data associated with a background application that is not // represented by the Extension class. @@ -145,10 +163,6 @@ // application, e.g. the Icon, has changed. void SendApplicationDataChangedNotifications(); - // Notifies observers that at least one background application has been added - // or removed. - void SendApplicationListChangedNotifications(); - // Invoked by Observe for NOTIFICATION_EXTENSION_PERMISSIONS_UPDATED. void OnExtensionPermissionsUpdated( const extensions::Extension* extension, @@ -158,6 +172,10 @@ // Refresh the list of background applications and generate notifications. void Update(); + // ProcessManagerObserver: + void OnBackgroundHostCreated(extensions::ExtensionHost* host) override; + void OnBackgroundHostClose(const std::string& extension_id) override; + // Associates extension id strings with Application objects. std::map<std::string, std::unique_ptr<Application>> applications_; @@ -175,6 +193,9 @@ ScopedObserver<BackgroundContentsService, BackgroundContentsServiceObserver> background_contents_service_observer_{this}; + ScopedObserver<extensions::ProcessManager, extensions::ProcessManagerObserver> + process_manager_observer_{this}; + base::WeakPtrFactory<BackgroundApplicationListModel> weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(BackgroundApplicationListModel);
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index 04a4a21..4b1cbb5 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc
@@ -130,14 +130,19 @@ return BackgroundModeManager::GetBrowserWindowForProfile(profile_); } -bool BackgroundModeManager::BackgroundModeData::HasBackgroundClient() const { +bool BackgroundModeManager::BackgroundModeData::HasPersistentBackgroundClient() + const { + return applications_->HasPersistentBackgroundApps(); +} + +bool BackgroundModeManager::BackgroundModeData::HasAnyBackgroundClient() const { return applications_->size() > 0; } void BackgroundModeManager::BackgroundModeData::BuildProfileMenu( StatusIconMenuModel* menu, StatusIconMenuModel* containing_menu) { - if (HasBackgroundClient()) { + if (HasAnyBackgroundClient()) { // Add a menu item for each application (extension). for (const auto& application : *applications_) { gfx::ImageSkia icon = applications_->GetIcon(application.get()); @@ -205,10 +210,13 @@ // Not found in our set yet - add it and maybe return as a previously // unseen extension. current_extensions_.insert(id); - // If this application has been newly loaded after the initial startup, - // notify the user. - if (applications_->startup_done()) + // If this application has been newly loaded after the initial startup and + // this is a persistent background app, notify the user. + if (applications_->startup_done() && + BackgroundApplicationListModel::IsPersistentBackgroundApp( + *application, profile_)) { new_apps.insert(application.get()); + } } } return new_apps; @@ -416,6 +424,7 @@ bool enabled = IsBackgroundModePrefEnabled(); UMA_HISTOGRAM_BOOLEAN("BackgroundMode.BackgroundModeEnabledPrefChanged", enabled); + UpdateEnableLaunchOnStartup(); if (enabled) EnableBackgroundMode(); else @@ -481,8 +490,8 @@ background_mode_data_.erase(it); // If there are no background mode profiles any longer, then turn off // background mode. + UpdateEnableLaunchOnStartup(); if (!ShouldBeInBackgroundMode()) { - EnableLaunchOnStartup(false); EndBackgroundMode(); } UpdateStatusTrayIconContextMenu(); @@ -633,7 +642,7 @@ if (!in_background_mode_ && ShouldBeInBackgroundMode()) { StartBackgroundMode(); - EnableLaunchOnStartup(true); + UpdateEnableLaunchOnStartup(); } } @@ -642,7 +651,6 @@ // If background mode is currently enabled, turn it off. if (in_background_mode_) { EndBackgroundMode(); - EnableLaunchOnStartup(false); } } @@ -685,13 +693,14 @@ ProfileAttributesEntry* entry; if (profile_storage_-> GetProfileAttributesWithPath(profile->GetPath(), &entry)) { - entry->SetBackgroundStatus(HasBackgroundClientForProfile(profile)); + entry->SetBackgroundStatus( + HasPersistentBackgroundClientForProfile(profile)); } + UpdateEnableLaunchOnStartup(); if (!ShouldBeInBackgroundMode()) { // We've uninstalled our last background client, make sure we exit // background mode and no longer launch on startup. - EnableLaunchOnStartup(false); EndBackgroundMode(); } else { // We have at least one background client - make sure we're in background @@ -701,7 +710,6 @@ // enabled. On Mac, the platform-specific code tracks whether the user // has deleted a login item in the past, and if so, no login item will // be created (to avoid overriding the specific user action). - EnableLaunchOnStartup(true); StartBackgroundMode(); } @@ -714,24 +722,32 @@ } } -bool BackgroundModeManager::HasBackgroundClient() const { +bool BackgroundModeManager::HasPersistentBackgroundClient() const { for (const auto& it : background_mode_data_) { - if (it.second->HasBackgroundClient()) + if (it.second->HasPersistentBackgroundClient()) return true; } return false; } -bool BackgroundModeManager::HasBackgroundClientForProfile( +bool BackgroundModeManager::HasAnyBackgroundClient() const { + for (const auto& it : background_mode_data_) { + if (it.second->HasAnyBackgroundClient()) + return true; + } + return false; +} + +bool BackgroundModeManager::HasPersistentBackgroundClientForProfile( const Profile* profile) const { BackgroundModeManager::BackgroundModeData* bmd = GetBackgroundModeData(profile); - return bmd && bmd->HasBackgroundClient(); + return bmd && bmd->HasPersistentBackgroundClient(); } bool BackgroundModeManager::ShouldBeInBackgroundMode() const { return IsBackgroundModePrefEnabled() && - (HasBackgroundClient() || keep_alive_for_test_); + (HasAnyBackgroundClient() || keep_alive_for_test_); } void BackgroundModeManager::OnBackgroundClientInstalled( @@ -750,6 +766,17 @@ DisplayClientInstalledNotification(name); } +void BackgroundModeManager::UpdateEnableLaunchOnStartup() { + bool new_launch_on_startup = + ShouldBeInBackgroundMode() && HasPersistentBackgroundClient(); + if (launch_on_startup_enabled_ && + new_launch_on_startup == *launch_on_startup_enabled_) { + return; + } + launch_on_startup_enabled_.emplace(new_launch_on_startup); + EnableLaunchOnStartup(*launch_on_startup_enabled_); +} + // Gets the image for the status tray icon, at the correct size for the current // platform and display settings. gfx::ImageSkia GetStatusTrayIcon() { @@ -841,7 +868,7 @@ for (auto* bmd : bmd_vector) { // We should only display the profile in the status icon if it has at // least one background app. - if (bmd->HasBackgroundClient()) { + if (bmd->HasAnyBackgroundClient()) { // The submenu constructor caller owns the lifetime of the submenu. // The containing menu does not handle the lifetime. submenus.push_back(std::make_unique<StatusIconMenuModel>(bmd));
diff --git a/chrome/browser/background/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h index 1d3fba2..d1ff6b8 100644 --- a/chrome/browser/background/background_mode_manager.h +++ b/chrome/browser/background/background_mode_manager.h
@@ -168,8 +168,13 @@ // Browser window. Browser* GetBrowserWindow(); - // Returns if this profile has background clients. A client is an extension. - bool HasBackgroundClient() const; + // Returns if this profile has persistent background clients. A client is an + // extension. + bool HasPersistentBackgroundClient() const; + + // Returns if this profile has any background clients. A client is an + // extension. + bool HasAnyBackgroundClient() const; // Builds the profile specific parts of the menu. The menu passed in may // be a submenu in the case of multi-profiles or the main menu in the case @@ -257,6 +262,10 @@ // launch-on-startup is enabled if appropriate. void OnBackgroundClientInstalled(const base::string16& name); + // Update whether Chrome should be launched on startup, depending on whether + // |this| has any persistent background clients. + void UpdateEnableLaunchOnStartup(); + // Called to make sure that our launch-on-startup mode is properly set. // (virtual so it can be mocked in tests). virtual void EnableLaunchOnStartup(bool should_launch); @@ -321,13 +330,18 @@ // Turns on background mode if it's currently disabled. void EnableBackgroundMode(); - // Returns if any profile on the system has a background client. + // Returns if any profile on the system has a persistent background client. // A client is an extension. (virtual to allow overriding in unit tests) - virtual bool HasBackgroundClient() const; + virtual bool HasPersistentBackgroundClient() const; - // Returns if there are background clients for a profile. A client is an - // extension. - virtual bool HasBackgroundClientForProfile(const Profile* profile) const; + // Returns if any profile on the system has any background client. + // A client is an extension. (virtual to allow overriding in unit tests) + virtual bool HasAnyBackgroundClient() const; + + // Returns if there are persistent background clients for a profile. A client + // is an extension. + virtual bool HasPersistentBackgroundClientForProfile( + const Profile* profile) const; // Returns true if we should be in background mode. bool ShouldBeInBackgroundMode() const; @@ -406,6 +420,8 @@ // Set to true when background mode is suspended. bool background_mode_suspended_ = false; + base::Optional<bool> launch_on_startup_enabled_; + // Task runner for making startup/login configuration changes that may // require file system or registry access. const scoped_refptr<base::SequencedTaskRunner> task_runner_;
diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc index cf2f59c..56d5b88 100644 --- a/chrome/browser/background/background_mode_manager_unittest.cc +++ b/chrome/browser/background/background_mode_manager_unittest.cc
@@ -136,35 +136,54 @@ ~AdvancedTestBackgroundModeManager() override {} // TestBackgroundModeManager: - bool HasBackgroundClient() const override { - for (const auto& profile_count_pair : profile_app_counts_) { - if (profile_count_pair.second > 0) - return true; - } - return false; + bool HasPersistentBackgroundClient() const override { + return std::find_if(profile_app_counts_.begin(), profile_app_counts_.end(), + [](const auto& profile_count_pair) { + return profile_count_pair.second.persistent > 0; + }) != profile_app_counts_.end(); } - bool HasBackgroundClientForProfile(const Profile* profile) const override { + bool HasAnyBackgroundClient() const override { + return std::find_if(profile_app_counts_.begin(), profile_app_counts_.end(), + [](const auto& profile_count_pair) { + return profile_count_pair.second.any > 0; + }) != profile_app_counts_.end(); + } + bool HasPersistentBackgroundClientForProfile( + const Profile* profile) const override { auto it = profile_app_counts_.find(profile); if (it == profile_app_counts_.end()) { ADD_FAILURE(); return false; } - return it->second > 0; + return it->second.persistent > 0; } + bool IsBackgroundModePrefEnabled() const override { return enabled_; } void SetBackgroundClientCountForProfile(const Profile* profile, size_t count) { - profile_app_counts_[profile] = count; + profile_app_counts_[profile] = {count, count}; } + + void SetPersistentBackgroundClientCountForProfile(const Profile* profile, + size_t count) { + profile_app_counts_[profile].persistent = count; + } + void SetEnabled(bool enabled) { enabled_ = enabled; OnBackgroundModeEnabledPrefChanged(); } + using BackgroundModeManager::OnApplicationListChanged; + private: + struct AppCounts { + size_t any = 0; + size_t persistent = 0; + }; bool enabled_; - std::map<const Profile*, size_t> profile_app_counts_; + std::map<const Profile*, AppCounts> profile_app_counts_; DISALLOW_COPY_AND_ASSIGN(AdvancedTestBackgroundModeManager); }; @@ -358,10 +377,12 @@ *command_line_, profile_manager_->profile_attributes_storage(), true); manager.RegisterProfile(profile_); - // Turn off background mode (shouldn't explicitly disable launch-on-startup as - // the app-count is zero and launch-on-startup shouldn't be considered on). + // Turn off background mode (should explicitly disable launch-on-startup as + // the app-count is zero and launch-on-startup hasn't been initialized yet). + EXPECT_CALL(manager, EnableLaunchOnStartup(false)).Times(Exactly(1)); manager.SetEnabled(false); AssertBackgroundModeInactive(manager); + Mock::VerifyAndClearExpectations(&manager); // When a new client is installed, status tray icons will not be created, // launch on startup status will not be modified. @@ -890,3 +911,128 @@ service->AddExtension(upgraded_no_bg_ext_has_bg.get()); EXPECT_TRUE(manager_->HasShownBalloon()); } + +TEST_F(BackgroundModeManagerTest, TransientBackgroundApp) { + AdvancedTestBackgroundModeManager manager( + *command_line_, profile_manager_->profile_attributes_storage(), true); + manager.RegisterProfile(profile_); + ProfileAttributesEntry* entry; + ASSERT_TRUE(profile_manager_->profile_attributes_storage() + ->GetProfileAttributesWithPath(profile_->GetPath(), &entry)); + EXPECT_FALSE(entry->GetBackgroundStatus()); + + EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsKeepingAlive()); + + EXPECT_CALL(manager, EnableLaunchOnStartup(false)).Times(1); + manager.SetBackgroundClientCountForProfile(profile_, 0); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + + // Mimic transient app launch. + EXPECT_CALL(manager, EnableLaunchOnStartup(_)).Times(0); + manager.SetBackgroundClientCountForProfile(profile_, 1); + manager.SetPersistentBackgroundClientCountForProfile(profile_, 0); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeActive(manager); + EXPECT_FALSE(entry->GetBackgroundStatus()); + + manager.SuspendBackgroundMode(); + AssertBackgroundModeInactive(manager); + EXPECT_FALSE(entry->GetBackgroundStatus()); + manager.ResumeBackgroundMode(); + + // Mimic transient app shutdown. + EXPECT_CALL(manager, EnableLaunchOnStartup(_)).Times(0); + manager.SetBackgroundClientCountForProfile(profile_, 0); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeInactive(manager); + EXPECT_FALSE(entry->GetBackgroundStatus()); +} + +TEST_F(BackgroundModeManagerTest, TransientBackgroundAppWithPersistent) { + AdvancedTestBackgroundModeManager manager( + *command_line_, profile_manager_->profile_attributes_storage(), true); + manager.RegisterProfile(profile_); + ProfileAttributesEntry* entry; + ASSERT_TRUE(profile_manager_->profile_attributes_storage() + ->GetProfileAttributesWithPath(profile_->GetPath(), &entry)); + EXPECT_FALSE(entry->GetBackgroundStatus()); + + EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsKeepingAlive()); + + EXPECT_CALL(manager, EnableLaunchOnStartup(true)).Times(1); + manager.SetBackgroundClientCountForProfile(profile_, 1); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeActive(manager); + EXPECT_TRUE(entry->GetBackgroundStatus()); + + // Mimic transient app launch. + EXPECT_CALL(manager, EnableLaunchOnStartup(_)).Times(0); + manager.SetBackgroundClientCountForProfile(profile_, 2); + manager.SetPersistentBackgroundClientCountForProfile(profile_, 1); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeActive(manager); + EXPECT_TRUE(entry->GetBackgroundStatus()); + + manager.SuspendBackgroundMode(); + AssertBackgroundModeInactive(manager); + EXPECT_TRUE(entry->GetBackgroundStatus()); + manager.ResumeBackgroundMode(); + + // Mimic transient app shutdown. + EXPECT_CALL(manager, EnableLaunchOnStartup(_)).Times(0); + manager.SetBackgroundClientCountForProfile(profile_, 1); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeActive(manager); + EXPECT_TRUE(entry->GetBackgroundStatus()); +} + +TEST_F(BackgroundModeManagerTest, + BackgroundPersistentAppWhileTransientRunning) { + AdvancedTestBackgroundModeManager manager( + *command_line_, profile_manager_->profile_attributes_storage(), true); + manager.RegisterProfile(profile_); + ProfileAttributesEntry* entry; + ASSERT_TRUE(profile_manager_->profile_attributes_storage() + ->GetProfileAttributesWithPath(profile_->GetPath(), &entry)); + EXPECT_FALSE(entry->GetBackgroundStatus()); + + EXPECT_FALSE(KeepAliveRegistry::GetInstance()->IsKeepingAlive()); + + // Mimic transient app launch. + EXPECT_CALL(manager, EnableLaunchOnStartup(false)).Times(1); + manager.SetBackgroundClientCountForProfile(profile_, 1); + manager.SetPersistentBackgroundClientCountForProfile(profile_, 0); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeActive(manager); + EXPECT_FALSE(entry->GetBackgroundStatus()); + + // Mimic persistent app install. + EXPECT_CALL(manager, EnableLaunchOnStartup(true)).Times(1); + manager.SetBackgroundClientCountForProfile(profile_, 2); + manager.SetPersistentBackgroundClientCountForProfile(profile_, 1); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeActive(manager); + EXPECT_TRUE(entry->GetBackgroundStatus()); + + manager.SuspendBackgroundMode(); + AssertBackgroundModeInactive(manager); + EXPECT_TRUE(entry->GetBackgroundStatus()); + manager.ResumeBackgroundMode(); + + // Mimic persistent app uninstall. + EXPECT_CALL(manager, EnableLaunchOnStartup(false)).Times(1); + manager.SetBackgroundClientCountForProfile(profile_, 1); + manager.SetPersistentBackgroundClientCountForProfile(profile_, 0); + manager.OnApplicationListChanged(profile_); + Mock::VerifyAndClearExpectations(&manager); + AssertBackgroundModeActive(manager); + EXPECT_FALSE(entry->GetBackgroundStatus()); +}
diff --git a/chrome/browser/browser_process_platform_part_chromeos.cc b/chrome/browser/browser_process_platform_part_chromeos.cc index 19e37e7..c725b44 100644 --- a/chrome/browser/browser_process_platform_part_chromeos.cc +++ b/chrome/browser/browser_process_platform_part_chromeos.cc
@@ -13,7 +13,6 @@ #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h" #include "chrome/browser/chromeos/login/saml/in_session_password_change_manager.h" #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h" @@ -153,11 +152,6 @@ Profile* primary_profile) { DCHECK(primary_profile); - DCHECK(!kerberos_credentials_manager_); - kerberos_credentials_manager_ = - std::make_unique<chromeos::KerberosCredentialsManager>( - g_browser_process->local_state(), primary_profile); - DCHECK(!in_session_password_change_manager_); in_session_password_change_manager_ = chromeos::InSessionPasswordChangeManager::CreateIfEnabled( @@ -172,7 +166,6 @@ } void BrowserProcessPlatformPart::ShutdownPrimaryProfileServices() { - kerberos_credentials_manager_.reset(); in_session_password_change_manager_.reset(); }
diff --git a/chrome/browser/browser_process_platform_part_chromeos.h b/chrome/browser/browser_process_platform_part_chromeos.h index 3c0927d..b2e2b75 100644 --- a/chrome/browser/browser_process_platform_part_chromeos.h +++ b/chrome/browser/browser_process_platform_part_chromeos.h
@@ -21,7 +21,6 @@ class AccountManagerFactory; class ChromeSessionManager; class ChromeUserManager; -class KerberosCredentialsManager; class InSessionPasswordChangeManager; class ProfileHelper; class TimeZoneResolver; @@ -167,9 +166,6 @@ std::unique_ptr<chromeos::AccountManagerFactory> account_manager_factory_; - std::unique_ptr<chromeos::KerberosCredentialsManager> - kerberos_credentials_manager_; - std::unique_ptr<chromeos::InSessionPasswordChangeManager> in_session_password_change_manager_;
diff --git a/chrome/browser/chrome_back_forward_cache_browsertest.cc b/chrome/browser/chrome_back_forward_cache_browsertest.cc index b02950c9..6daa32f 100644 --- a/chrome/browser/chrome_back_forward_cache_browsertest.cc +++ b/chrome/browser/chrome_back_forward_cache_browsertest.cc
@@ -4,10 +4,17 @@ #include "base/command_line.h" #include "base/macros.h" +#include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" +#include "chrome/browser/content_settings/host_content_settings_map_factory.h" +#include "chrome/browser/permissions/permission_manager.h" +#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h" +#include "components/content_settings/core/browser/host_content_settings_map.h" +#include "components/content_settings/core/common/content_settings.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/network_session_configurator/common/network_switches.h" #include "content/public/browser/render_process_host.h" #include "content/public/common/content_features.h" @@ -199,3 +206,35 @@ EXPECT_TRUE(content::NavigateToURL(web_contents(), GetURL("b.com"))); delete_observer.WaitUntilDeleted(); } + +IN_PROC_BROWSER_TEST_F(ChromeBackForwardCacheBrowserTest, + PermissionContextBase) { + // HTTPS needed for GEOLOCATION permission + net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS); + https_server.AddDefaultHandlers(GetChromeTestDataDir()); + https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_OK); + ASSERT_TRUE(https_server.Start()); + + GURL url_a(https_server.GetURL("a.com", "/title1.html")); + GURL url_b(https_server.GetURL("b.com", "/title1.html")); + + HostContentSettingsMapFactory::GetForProfile(browser()->profile()) + ->SetDefaultContentSetting(ContentSettingsType::GEOLOCATION, + ContentSetting::CONTENT_SETTING_ASK); + + // 1) Navigate to A. + EXPECT_TRUE(NavigateToURL(web_contents(), url_a)); + content::RenderFrameHost* rfh_a = current_frame_host(); + content::RenderFrameDeletedObserver delete_observer_rfh_a(rfh_a); + + // 2) Navigate to B. + EXPECT_TRUE(NavigateToURL(web_contents(), url_b)); + ASSERT_FALSE(delete_observer_rfh_a.deleted()); + base::MockOnceCallback<void(ContentSetting)> callback; + EXPECT_CALL(callback, Run(ContentSetting::CONTENT_SETTING_ASK)); + PermissionManager::Get(browser()->profile()) + ->RequestPermission(ContentSettingsType::GEOLOCATION, rfh_a, url_a, + /* user_gesture = */ true, callback.Get()); + + delete_observer_rfh_a.WaitUntilDeleted(); +}
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 440fa3f..859d003 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc
@@ -57,6 +57,7 @@ #include "chrome/browser/chrome_browser_field_trials.h" #include "chrome/browser/chrome_browser_main_extra_parts.h" #include "chrome/browser/component_updater/crl_set_component_installer.h" +#include "chrome/browser/component_updater/crowd_deny_component_installer.h" #include "chrome/browser/component_updater/file_type_policies_component_installer.h" #include "chrome/browser/component_updater/games_component_installer.h" #include "chrome/browser/component_updater/mei_preload_component_installer.h" @@ -553,6 +554,7 @@ #endif RegisterSafetyTipsComponent(cus, path); + RegisterCrowdDenyComponent(cus, path); #if BUILDFLAG(GOOGLE_CHROME_BRANDING) && defined(OS_ANDROID) component_updater::RegisterGamesComponent(cus, profile_prefs);
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 8ebb3cc8..b39e5a0 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -940,13 +940,13 @@ } void LaunchURL(const GURL& url, - const content::WebContents::Getter& web_contents_getter, + content::WebContents::OnceGetter web_contents_getter, ui::PageTransition page_transition, bool has_user_gesture, const base::Optional<url::Origin>& initiating_origin) { // If there is no longer a WebContents, the request may have raced with tab // closing. Don't fire the external request. (It may have been a prerender.) - content::WebContents* web_contents = web_contents_getter.Run(); + content::WebContents* web_contents = std::move(web_contents_getter).Run(); if (!web_contents) return; @@ -4768,7 +4768,7 @@ bool ChromeContentBrowserClient::HandleExternalProtocol( const GURL& url, - content::WebContents::Getter web_contents_getter, + content::WebContents::OnceGetter web_contents_getter, int child_id, content::NavigationUIData* navigation_data, bool is_main_frame, @@ -4799,8 +4799,8 @@ base::PostTask( FROM_HERE, {BrowserThread::UI}, - base::BindOnce(&LaunchURL, url, web_contents_getter, page_transition, - has_user_gesture, initiating_origin)); + base::BindOnce(&LaunchURL, url, std::move(web_contents_getter), + page_transition, has_user_gesture, initiating_origin)); return true; }
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index eac552d..7995a32 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h
@@ -549,7 +549,7 @@ LoginAuthRequiredCallback auth_required_callback) override; bool HandleExternalProtocol( const GURL& url, - content::WebContents::Getter web_contents_getter, + content::WebContents::OnceGetter web_contents_getter, int child_id, content::NavigationUIData* navigation_data, bool is_main_frame,
diff --git a/chrome/browser/chrome_plugin_browsertest.cc b/chrome/browser/chrome_plugin_browsertest.cc index 7994a69..572cba70 100644 --- a/chrome/browser/chrome_plugin_browsertest.cc +++ b/chrome/browser/chrome_plugin_browsertest.cc
@@ -132,8 +132,8 @@ std::vector<content::WebPluginInfo> plugins; scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; - content::PluginService::GetInstance()->GetPlugins( - base::Bind(&GetPluginsInfoCallback, &plugins, runner->QuitClosure())); + content::PluginService::GetInstance()->GetPlugins(base::BindOnce( + &GetPluginsInfoCallback, &plugins, runner->QuitClosure())); runner->Run(); return plugins; } @@ -150,7 +150,7 @@ } private: - static void CrashFlashInternal(const base::Closure& quit_task) { + static void CrashFlashInternal(base::OnceClosure quit_task) { bool found = false; for (content::BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) { if (iter.GetData().process_type != content::PROCESS_TYPE_PPAPI_PLUGIN) @@ -159,23 +159,23 @@ found = true; } ASSERT_TRUE(found) << "Didn't find Flash process!"; - base::PostTask(FROM_HERE, {BrowserThread::UI}, quit_task); + base::PostTask(FROM_HERE, {BrowserThread::UI}, std::move(quit_task)); } static void GetPluginsInfoCallback( std::vector<content::WebPluginInfo>* rv, - const base::Closure& quit_task, + base::OnceClosure quit_task, const std::vector<content::WebPluginInfo>& plugins) { *rv = plugins; - quit_task.Run(); + std::move(quit_task).Run(); } - static void CountPluginProcesses(int* count, const base::Closure& quit_task) { + static void CountPluginProcesses(int* count, base::OnceClosure quit_task) { for (content::BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) { if (iter.GetData().process_type == content::PROCESS_TYPE_PPAPI_PLUGIN) (*count)++; } - base::PostTask(FROM_HERE, {BrowserThread::UI}, quit_task); + base::PostTask(FROM_HERE, {BrowserThread::UI}, std::move(quit_task)); } };
diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc index 84a34c7..b5aa3d6 100644 --- a/chrome/browser/chrome_service_worker_browsertest.cc +++ b/chrome/browser/chrome_service_worker_browsertest.cc
@@ -699,9 +699,9 @@ std::string GetSource() override { return source_; } void StartDataRequest(const GURL& url, const content::WebContents::Getter& wc_getter, - const GotDataCallback& callback) override { + GotDataCallback callback) override { std::string data(content_); - callback.Run(base::RefCountedString::TakeString(&data)); + std::move(callback).Run(base::RefCountedString::TakeString(&data)); } std::string GetMimeType(const std::string& path) override { return "application/javascript";
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index d335b86..6144a4d 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn
@@ -1201,6 +1201,8 @@ "input_method/native_input_method_engine.h", "kerberos/kerberos_credentials_manager.cc", "kerberos/kerberos_credentials_manager.h", + "kerberos/kerberos_credentials_manager_factory.cc", + "kerberos/kerberos_credentials_manager_factory.h", "kerberos/kerberos_ticket_expiry_notification.cc", "kerberos/kerberos_ticket_expiry_notification.h", "language_preferences.cc",
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc index e0bd8a3..0633cede 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.cc
@@ -295,10 +295,10 @@ } void KioskAppManager::EnableConsumerKioskAutoLaunch( - const KioskAppManager::EnableKioskAutoLaunchCallback& callback) { + KioskAppManager::EnableKioskAutoLaunchCallback callback) { if (!IsConsumerKioskEnabled()) { - if (!callback.is_null()) - callback.Run(false); + if (callback) + std::move(callback).Run(false); return; } @@ -309,24 +309,23 @@ std::string(), // domain std::string(), // realm std::string(), // device_id - base::Bind( - &KioskAppManager::OnLockDevice, base::Unretained(this), callback)); + base::BindOnce(&KioskAppManager::OnLockDevice, base::Unretained(this), + std::move(callback))); } void KioskAppManager::GetConsumerKioskAutoLaunchStatus( - const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback& callback) { + KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback callback) { if (!IsConsumerKioskEnabled()) { - if (!callback.is_null()) - callback.Run(CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED); + if (callback) + std::move(callback).Run(CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED); return; } policy::BrowserPolicyConnectorChromeOS* connector = g_browser_process->platform_part()->browser_policy_connector_chromeos(); connector->GetInstallAttributes()->ReadImmutableAttributes( - base::Bind(&KioskAppManager::OnReadImmutableAttributes, - base::Unretained(this), - callback)); + base::BindOnce(&KioskAppManager::OnReadImmutableAttributes, + base::Unretained(this), std::move(callback))); } bool KioskAppManager::IsConsumerKioskDeviceWithAutoLaunch() { @@ -338,34 +337,33 @@ } void KioskAppManager::OnLockDevice( - const KioskAppManager::EnableKioskAutoLaunchCallback& callback, + KioskAppManager::EnableKioskAutoLaunchCallback callback, InstallAttributes::LockResult result) { - if (callback.is_null()) + if (!callback) return; - callback.Run(result == InstallAttributes::LOCK_SUCCESS); + std::move(callback).Run(result == InstallAttributes::LOCK_SUCCESS); } void KioskAppManager::OnOwnerFileChecked( - const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback& callback, + KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback callback, bool* owner_present) { ownership_established_ = *owner_present; - if (callback.is_null()) + if (!callback) return; // If we have owner already established on the machine, don't let // consumer kiosk to be enabled. if (ownership_established_) - callback.Run(CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED); + std::move(callback).Run(CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED); else - callback.Run(CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE); + std::move(callback).Run(CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE); } void KioskAppManager::OnReadImmutableAttributes( - const KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback& - callback) { - if (callback.is_null()) + KioskAppManager::GetConsumerKioskAutoLaunchStatusCallback callback) { + if (!callback) return; ConsumerKioskAutoLaunchStatus status = @@ -385,7 +383,7 @@ base::TaskPriority::BEST_EFFORT}, base::BindOnce(&CheckOwnerFilePresence, owner_present), base::BindOnce(&KioskAppManager::OnOwnerFileChecked, - base::Unretained(this), callback, + base::Unretained(this), std::move(callback), base::Owned(owner_present))); return; } @@ -398,7 +396,7 @@ break; } - callback.Run(status); + std::move(callback).Run(status); } void KioskAppManager::SetEnableAutoLaunch(bool value) {
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h index af73a1f..92501c9 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager.h
@@ -56,9 +56,9 @@ CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED, }; - typedef base::Callback<void(bool success)> EnableKioskAutoLaunchCallback; - typedef base::Callback<void(ConsumerKioskAutoLaunchStatus status)> - GetConsumerKioskAutoLaunchStatusCallback; + using EnableKioskAutoLaunchCallback = base::OnceCallback<void(bool success)>; + using GetConsumerKioskAutoLaunchStatusCallback = + base::OnceCallback<void(ConsumerKioskAutoLaunchStatus status)>; typedef std::vector<App> Apps; @@ -109,12 +109,11 @@ // Initiates reading of consumer kiosk mode auto-launch status. void GetConsumerKioskAutoLaunchStatus( - const GetConsumerKioskAutoLaunchStatusCallback& callback); + GetConsumerKioskAutoLaunchStatusCallback callback); // Enables consumer kiosk mode app auto-launch feature. Upon completion, // |callback| will be invoked with outcome of this operation. - void EnableConsumerKioskAutoLaunch( - const EnableKioskAutoLaunchCallback& callback); + void EnableConsumerKioskAutoLaunch(EnableKioskAutoLaunchCallback callback); // Returns true if this device is consumer kiosk auto launch enabled. bool IsConsumerKioskDeviceWithAutoLaunch(); @@ -291,18 +290,17 @@ // Callback for InstallAttributes::LockDevice() during // EnableConsumerModeKiosk() call. - void OnLockDevice(const EnableKioskAutoLaunchCallback& callback, + void OnLockDevice(EnableKioskAutoLaunchCallback callback, InstallAttributes::LockResult result); // Callback for InstallAttributes::ReadImmutableAttributes() during // GetConsumerKioskModeStatus() call. void OnReadImmutableAttributes( - const GetConsumerKioskAutoLaunchStatusCallback& callback); + GetConsumerKioskAutoLaunchStatusCallback callback); // Callback for reading handling checks of the owner public. - void OnOwnerFileChecked( - const GetConsumerKioskAutoLaunchStatusCallback& callback, - bool* owner_present); + void OnOwnerFileChecked(GetConsumerKioskAutoLaunchStatusCallback callback, + bool* owner_present); // Reads/writes auto login state from/to local state. AutoLoginState GetAutoLoginState() const;
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc index 0b212e3..597aee96 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
@@ -68,30 +68,29 @@ // implementation. void ConsumerKioskAutoLaunchStatusCheck( KioskAppManager::ConsumerKioskAutoLaunchStatus* out_status, - const base::Closure& runner_quit_task, + base::OnceClosure runner_quit_task, KioskAppManager::ConsumerKioskAutoLaunchStatus in_status) { LOG(INFO) << "ConsumerKioskAutoLaunchStatus = " << in_status; *out_status = in_status; - runner_quit_task.Run(); + std::move(runner_quit_task).Run(); } // Helper KioskAppManager::EnableKioskModeCallback implementation. -void ConsumerKioskModeLockCheck( - bool* out_locked, - const base::Closure& runner_quit_task, - bool in_locked) { +void ConsumerKioskModeLockCheck(bool* out_locked, + base::OnceClosure runner_quit_task, + bool in_locked) { LOG(INFO) << "kiosk locked = " << in_locked; *out_locked = in_locked; - runner_quit_task.Run(); + std::move(runner_quit_task).Run(); } // Helper InstallAttributes::LockResultCallback implementation. void OnEnterpriseDeviceLock(InstallAttributes::LockResult* out_locked, - const base::Closure& runner_quit_task, + base::OnceClosure runner_quit_task, InstallAttributes::LockResult in_locked) { LOG(INFO) << "Enterprise lock = " << in_locked; *out_locked = in_locked; - runner_quit_task.Run(); + std::move(runner_quit_task).Run(); } scoped_refptr<extensions::Extension> MakeKioskApp( @@ -298,12 +297,11 @@ policy::BrowserPolicyConnectorChromeOS* connector = g_browser_process->platform_part()->browser_policy_connector_chromeos(); connector->GetInstallAttributes()->LockDevice( - policy::DEVICE_MODE_ENTERPRISE, - "domain.com", + policy::DEVICE_MODE_ENTERPRISE, "domain.com", std::string(), // realm "device-id", - base::Bind( - &OnEnterpriseDeviceLock, lock_result.get(), runner->QuitClosure())); + base::BindOnce(&OnEnterpriseDeviceLock, lock_result.get(), + runner->QuitClosure())); runner->Run(); return *lock_result.get(); } @@ -826,21 +824,21 @@ scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; - manager()->GetConsumerKioskAutoLaunchStatus(base::Bind( + manager()->GetConsumerKioskAutoLaunchStatus(base::BindOnce( &ConsumerKioskAutoLaunchStatusCheck, &status, runner->QuitClosure())); runner->Run(); EXPECT_EQ(status, KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_CONFIGURABLE); scoped_refptr<content::MessageLoopRunner> runner2 = new content::MessageLoopRunner; - manager()->EnableConsumerKioskAutoLaunch( - base::Bind(&ConsumerKioskModeLockCheck, &locked, runner2->QuitClosure())); + manager()->EnableConsumerKioskAutoLaunch(base::BindOnce( + &ConsumerKioskModeLockCheck, &locked, runner2->QuitClosure())); runner2->Run(); EXPECT_TRUE(locked); scoped_refptr<content::MessageLoopRunner> runner3 = new content::MessageLoopRunner; - manager()->GetConsumerKioskAutoLaunchStatus(base::Bind( + manager()->GetConsumerKioskAutoLaunchStatus(base::BindOnce( &ConsumerKioskAutoLaunchStatusCheck, &status, runner3->QuitClosure())); runner3->Run(); EXPECT_EQ(status, KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_ENABLED); @@ -852,7 +850,7 @@ scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; - manager()->GetConsumerKioskAutoLaunchStatus(base::Bind( + manager()->GetConsumerKioskAutoLaunchStatus(base::BindOnce( &ConsumerKioskAutoLaunchStatusCheck, &status, runner->QuitClosure())); runner->Run(); EXPECT_EQ(status, KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED); @@ -873,21 +871,21 @@ scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; - manager()->GetConsumerKioskAutoLaunchStatus(base::Bind( + manager()->GetConsumerKioskAutoLaunchStatus(base::BindOnce( &ConsumerKioskAutoLaunchStatusCheck, &status, runner->QuitClosure())); runner->Run(); EXPECT_EQ(status, KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED); scoped_refptr<content::MessageLoopRunner> runner2 = new content::MessageLoopRunner; - manager()->EnableConsumerKioskAutoLaunch( - base::Bind(&ConsumerKioskModeLockCheck, &locked, runner2->QuitClosure())); + manager()->EnableConsumerKioskAutoLaunch(base::BindOnce( + &ConsumerKioskModeLockCheck, &locked, runner2->QuitClosure())); runner2->Run(); EXPECT_FALSE(locked); scoped_refptr<content::MessageLoopRunner> runner3 = new content::MessageLoopRunner; - manager()->GetConsumerKioskAutoLaunchStatus(base::Bind( + manager()->GetConsumerKioskAutoLaunchStatus(base::BindOnce( &ConsumerKioskAutoLaunchStatusCheck, &status, runner3->QuitClosure())); runner3->Run(); EXPECT_EQ(status, KioskAppManager::CONSUMER_KIOSK_AUTO_LAUNCH_DISABLED);
diff --git a/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_root.cc b/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_root.cc index f32d7ff8..2b6227e 100644 --- a/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_root.cc +++ b/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_root.cc
@@ -205,9 +205,9 @@ path_to_watcher_data_.insert( std::make_pair(path, WatcherData{kInvalidWatcherId, watcher_request_id})); ResolveToDocumentId( - path, base::Bind(&ArcDocumentsProviderRoot::AddWatcherWithDocumentId, - weak_ptr_factory_.GetWeakPtr(), path, watcher_request_id, - watcher_callback)); + path, base::BindOnce(&ArcDocumentsProviderRoot::AddWatcherWithDocumentId, + weak_ptr_factory_.GetWeakPtr(), path, + watcher_request_id, std::move(watcher_callback))); // HACK: Invoke |callback| immediately. //
diff --git a/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_watcher_manager.cc b/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_watcher_manager.cc index 02d5400..33d932d5 100644 --- a/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_watcher_manager.cc +++ b/chrome/browser/chromeos/arc/fileapi/arc_documents_provider_watcher_manager.cc
@@ -67,7 +67,8 @@ root->AddWatcher( path, - base::BindRepeating(&OnNotificationOnUIThread, notification_callback), + base::BindRepeating(&OnNotificationOnUIThread, + std::move(notification_callback)), base::BindOnce(&OnAddWatcherOnUIThread, std::move(callback))); } @@ -125,7 +126,8 @@ weak_ptr_factory_.GetWeakPtr(), std::move(callback)), base::BindRepeating( &ArcDocumentsProviderWatcherManager::OnNotification, - weak_ptr_factory_.GetWeakPtr(), notification_callback))); + weak_ptr_factory_.GetWeakPtr(), + std::move(notification_callback)))); } void ArcDocumentsProviderWatcherManager::RemoveWatcher(
diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc b/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc index ba2f2be..7117869 100644 --- a/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc +++ b/chrome/browser/chromeos/arc/intent_helper/arc_external_protocol_dialog.cc
@@ -15,9 +15,9 @@ #include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/chromeos/arc/intent_helper/arc_intent_picker_app_fetcher.h" #include "chrome/browser/chromeos/external_protocol_dialog.h" +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h" #include "chrome/browser/sharing/click_to_call/click_to_call_utils.h" -#include "chrome/browser/sharing/sharing_metrics.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/chromeos/browser_context_keyed_service_factories.cc b/chrome/browser/chromeos/browser_context_keyed_service_factories.cc index dad3ac667..62b03fc 100644 --- a/chrome/browser/chromeos/browser_context_keyed_service_factories.cc +++ b/chrome/browser/chromeos/browser_context_keyed_service_factories.cc
@@ -15,6 +15,7 @@ #include "chrome/browser/chromeos/extensions/media_player_api.h" #include "chrome/browser/chromeos/extensions/printing/printing_api_handler.h" #include "chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher.h" +#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h" #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service_factory.h" #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h" #include "chrome/browser/chromeos/plugin_vm/plugin_vm_engagement_metrics_service.h" @@ -63,6 +64,7 @@ extensions::VirtualKeyboardAPI::GetFactoryInstance(); extensions::WebcamPrivateAPI::GetFactoryInstance(); file_manager::EventRouterFactory::GetInstance(); + KerberosCredentialsManagerFactory::GetInstance(); OwnerSettingsServiceChromeOSFactory::GetInstance(); plugin_vm::PluginVmEngagementMetricsService::Factory::GetInstance(); policy::PolicyCertServiceFactory::GetInstance();
diff --git a/chrome/browser/chromeos/crostini/crostini_installer.cc b/chrome/browser/chromeos/crostini/crostini_installer.cc index 3216efee..5343564 100644 --- a/chrome/browser/chromeos/crostini/crostini_installer.cc +++ b/chrome/browser/chromeos/crostini/crostini_installer.cc
@@ -377,14 +377,27 @@ if (!success) { LOG(ERROR) << "Failed to configure container"; - HandleError(InstallerError::kErrorConfiguringContainer); + CrostiniManager::GetForProfile(profile_)->RemoveCrostini( + kCrostiniDefaultVmName, + base::BindOnce( + &CrostiniInstaller::OnCrostiniRemovedAfterConfigurationFailed, + weak_ptr_factory_.GetWeakPtr())); return; } } +void CrostiniInstaller::OnCrostiniRemovedAfterConfigurationFailed( + CrostiniResult result) { + if (result != CrostiniResult::SUCCESS) { + LOG(ERROR) << "Failed to remove Crostini after failed configuration"; + } + HandleError(InstallerError::kErrorConfiguringContainer); +} + void CrostiniInstaller::OnContainerStarted(CrostiniResult result) { if (result == CrostiniResult::CONTAINER_CONFIGURATION_FAILED) { - DCHECK_EQ(state_, State::ERROR); + LOG(ERROR) << "Container start failed due to failed configuration"; + NOTREACHED(); return; }
diff --git a/chrome/browser/chromeos/crostini/crostini_installer.h b/chrome/browser/chromeos/crostini/crostini_installer.h index 27d192b..f3da069 100644 --- a/chrome/browser/chromeos/crostini/crostini_installer.h +++ b/chrome/browser/chromeos/crostini/crostini_installer.h
@@ -125,6 +125,9 @@ void OnCrostiniRestartFinished(crostini::CrostiniResult result); void OnAvailableDiskSpace(int64_t bytes); + void OnCrostiniRemovedAfterConfigurationFailed( + crostini::CrostiniResult result); + Profile* profile_; State state_ = State::IDLE;
diff --git a/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc b/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc index 52f8f83..717fae6e 100644 --- a/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc +++ b/chrome/browser/chromeos/crostini/crostini_installer_unittest.cc
@@ -236,7 +236,7 @@ Install(); - base::RunLoop().RunUntilIdle(); + task_environment_.RunUntilIdle(); test_helper.SendSucceededApplySignal(); mount_path_waiter_.WaitForMountPathCalled(); @@ -347,4 +347,30 @@ << "Installer should recover to installable state"; } +TEST_F(CrostiniInstallerTest, InstallerErrorWhileConfiguring) { + AnsibleManagementTestHelper test_helper(profile_.get()); + test_helper.SetUpAnsibleInfra(); + test_helper.SetUpAnsibleInstallation( + vm_tools::cicerone::InstallLinuxPackageResponse::FAILED); + + Expectation expect_progresses = + EXPECT_CALL(mock_callbacks_, OnProgress(_, _)).Times(AnyNumber()); + // |OnProgress()| should not happens after |OnFinished()| + EXPECT_CALL(mock_callbacks_, + OnFinished(InstallerError::kErrorConfiguringContainer)) + .After(expect_progresses); + + Install(); + + task_environment_.RunUntilIdle(); + histogram_tester_.ExpectUniqueSample( + "Crostini.SetupResult", + static_cast<base::HistogramBase::Sample>( + CrostiniInstaller::SetupResult::kErrorConfiguringContainer), + 1); + + EXPECT_TRUE(crostini_installer_->CanInstall()) + << "Installer should recover to installable state"; +} + } // namespace crostini
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc index 4ebbedc8..01d96d2 100644 --- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
@@ -407,19 +407,19 @@ namespace { void PostResponseCallbackTaskToUIThread( - const FileWatchFunctionBase::ResponseCallback& callback, + FileWatchFunctionBase::ResponseCallback callback, bool success) { DCHECK_CURRENTLY_ON(BrowserThread::IO); base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, success)); + base::BindOnce(std::move(callback), success)); } void PostNotificationCallbackTaskToUIThread( - const storage::WatcherManager::NotificationCallback& callback, + storage::WatcherManager::NotificationCallback callback, storage::WatcherManager::ChangeType type) { DCHECK_CURRENTLY_ON(BrowserThread::IO); base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, type)); + base::BindOnce(std::move(callback), type)); } } // namespace
diff --git a/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc index c48bc46..dd33856 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_jstest_base.cc
@@ -38,23 +38,24 @@ ~TestFilesDataSource() override {} private: - // This has to match kTestResourceURL + // This has to match TestResourceUrl() std::string GetSource() override { return "file_manager_test"; } void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override { + content::URLDataSource::GotDataCallback callback) override { const std::string path = content::URLDataSource::URLToRequestPath(url); - base::PostTask(FROM_HERE, - {base::ThreadPool(), base::MayBlock(), - base::TaskPriority::USER_BLOCKING}, - base::BindOnce(&TestFilesDataSource::ReadFile, - base::Unretained(this), path, callback)); + base::PostTask( + FROM_HERE, + {base::ThreadPool(), base::MayBlock(), + base::TaskPriority::USER_BLOCKING}, + base::BindOnce(&TestFilesDataSource::ReadFile, base::Unretained(this), + path, std::move(callback))); } void ReadFile(const std::string& path, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { if (source_root_.empty()) { CHECK(base::PathService::Get(base::DIR_SOURCE_ROOT, &source_root_)); } @@ -85,7 +86,7 @@ scoped_refptr<base::RefCountedString> response = base::RefCountedString::TakeString(&content); - callback.Run(response.get()); + std::move(callback).Run(response.get()); } // It currently only serves HTML/JS/CSS. @@ -138,6 +139,11 @@ base::LazyInstance<TestWebUIProvider>::DestructorAtExit test_webui_provider_ = LAZY_INSTANCE_INITIALIZER; +static const GURL TestResourceUrl() { + static GURL url(content::GetWebUIURLString("file_manager_test")); + return url; +} + } // namespace FileManagerJsTestBase::FileManagerJsTestBase(const base::FilePath& base_path) @@ -145,9 +151,6 @@ FileManagerJsTestBase::~FileManagerJsTestBase() {} -const std::string FileManagerJsTestBase::kTestResourceURL = - content::GetWebUIURLString("file_manager_test"); - void FileManagerJsTestBase::RunTest(const base::FilePath& file) { base::FilePath root_path; ASSERT_TRUE(base::PathService::Get(base::DIR_SOURCE_ROOT, &root_path)); @@ -196,15 +199,14 @@ std::make_unique<TestChromeWebUIControllerFactory>(); content::WebUIControllerFactory::RegisterFactory( webui_controller_factory_.get()); - webui_controller_factory_->AddFactoryOverride(GURL(kTestResourceURL).host(), + webui_controller_factory_->AddFactoryOverride(TestResourceUrl().host(), test_webui_provider_.Pointer()); } void FileManagerJsTestBase::TearDownOnMainThread() { InProcessBrowserTest::TearDownOnMainThread(); - webui_controller_factory_->RemoveFactoryOverride( - GURL(kTestResourceURL).host()); + webui_controller_factory_->RemoveFactoryOverride(TestResourceUrl().host()); content::WebUIControllerFactory::UnregisterFactoryForTesting( webui_controller_factory_.get());
diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc index 84df059..e0f7993 100644 --- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc +++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.cc
@@ -375,8 +375,7 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& - notification_callback) { + storage::WatcherManager::NotificationCallback notification_callback) { // TODO(mtomasz): Implement it once needed. return PostAbortableTask( base::BindOnce(std::move(callback), base::File::FILE_OK));
diff --git a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h index 64c4f9f7..df47c70 100644 --- a/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h
@@ -141,7 +141,7 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& + storage::WatcherManager::NotificationCallback notification_callback) override; void RemoveWatcher(const GURL& origin, const base::FilePath& entry_path,
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc index 5662140..5b01c48 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system.cc +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.cc
@@ -74,21 +74,21 @@ } struct ProvidedFileSystem::AddWatcherInQueueArgs { - AddWatcherInQueueArgs(size_t token, - const GURL& origin, - const base::FilePath& entry_path, - bool recursive, - bool persistent, - storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& - notification_callback) + AddWatcherInQueueArgs( + size_t token, + const GURL& origin, + const base::FilePath& entry_path, + bool recursive, + bool persistent, + storage::AsyncFileUtil::StatusCallback callback, + storage::WatcherManager::NotificationCallback notification_callback) : token(token), origin(origin), entry_path(entry_path), recursive(recursive), persistent(persistent), callback(std::move(callback)), - notification_callback(notification_callback) {} + notification_callback(std::move(notification_callback)) {} ~AddWatcherInQueueArgs() {} AddWatcherInQueueArgs(AddWatcherInQueueArgs&&) = default; @@ -461,8 +461,7 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& - notification_callback) { + storage::WatcherManager::NotificationCallback notification_callback) { const size_t token = watcher_queue_.NewToken(); watcher_queue_.Enqueue( token, @@ -470,7 +469,7 @@ base::Unretained(this), // Outlived by the queue. AddWatcherInQueueArgs(token, origin, entry_path, recursive, persistent, std::move(callback), - notification_callback))); + std::move(notification_callback)))); return AbortCallback(); }
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system.h b/chrome/browser/chromeos/file_system_provider/provided_file_system.h index fed6e45..546842f 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system.h
@@ -153,7 +153,7 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& + storage::WatcherManager::NotificationCallback notification_callback) override; void RemoveWatcher(const GURL& origin, const base::FilePath& entry_path,
diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h b/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h index 43e6a51..79e6b4e4 100644 --- a/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h +++ b/chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h
@@ -231,8 +231,7 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& - notification_callback) = 0; + storage::WatcherManager::NotificationCallback notification_callback) = 0; // Requests removing a watcher, which is immediately deleted from the internal // list, hence the operation is not abortable.
diff --git a/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc b/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc index f23f482..aa2966b 100644 --- a/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc +++ b/chrome/browser/chromeos/file_system_provider/throttled_file_system.cc
@@ -154,10 +154,10 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& - notification_callback) { + storage::WatcherManager::NotificationCallback notification_callback) { return file_system_->AddWatcher(origin, entry_path, recursive, persistent, - std::move(callback), notification_callback); + std::move(callback), + std::move(notification_callback)); } void ThrottledFileSystem::RemoveWatcher(
diff --git a/chrome/browser/chromeos/file_system_provider/throttled_file_system.h b/chrome/browser/chromeos/file_system_provider/throttled_file_system.h index 870b87c..e83c377 100644 --- a/chrome/browser/chromeos/file_system_provider/throttled_file_system.h +++ b/chrome/browser/chromeos/file_system_provider/throttled_file_system.h
@@ -104,7 +104,7 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& + storage::WatcherManager::NotificationCallback notification_callback) override; void RemoveWatcher(const GURL& origin, const base::FilePath& entry_path,
diff --git a/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc b/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc index 2329b72..45594fc 100644 --- a/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc
@@ -67,8 +67,8 @@ // FirstRunActor::Delegate overrides. void OnActorInitialized() override { initialized_ = true; - if (!on_initialized_callback_.is_null()) - on_initialized_callback_.Run(); + if (on_initialized_callback_) + std::move(on_initialized_callback_).Run(); controller()->OnActorInitialized(); } @@ -78,8 +78,8 @@ void OnStepShown(const std::string& step_name) override { current_step_name_ = step_name; - if (!on_step_shown_callback_.is_null()) - on_step_shown_callback_.Run(); + if (on_step_shown_callback_) + std::move(on_step_shown_callback_).Run(); controller()->OnStepShown(step_name); } @@ -91,8 +91,8 @@ void OnActorFinalized() override { finalized_ = true; - if (!on_finalized_callback_.is_null()) - on_finalized_callback_.Run(); + if (on_finalized_callback_) + std::move(on_finalized_callback_).Run(); controller()->OnActorFinalized(); } @@ -133,12 +133,11 @@ } } - void WaitUntilCalled(base::Closure* callback) { + void WaitUntilCalled(base::OnceClosure* callback) { scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; *callback = runner->QuitClosure(); runner->Run(); - callback->Reset(); } test::JSChecker& js() { return js_; } @@ -156,9 +155,9 @@ std::string current_step_name_; bool initialized_; bool finalized_; - base::Closure on_initialized_callback_; - base::Closure on_step_shown_callback_; - base::Closure on_finalized_callback_; + base::OnceClosure on_initialized_callback_; + base::OnceClosure on_step_shown_callback_; + base::OnceClosure on_finalized_callback_; test::JSChecker js_; };
diff --git a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.cc b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.cc index 7fb1516..8f5674c 100644 --- a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.cc +++ b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.cc
@@ -36,8 +36,6 @@ namespace { -KerberosCredentialsManager* g_instance = nullptr; - // Account keys for the kerberos.accounts pref. constexpr char kPrincipal[] = "principal"; constexpr char kPassword[] = "password"; @@ -281,9 +279,6 @@ kerberos_files_handler_(std::make_unique<KerberosFilesHandler>( base::BindRepeating(&KerberosCredentialsManager::GetKerberosFiles, base::Unretained(this)))) { - DCHECK(!g_instance); - g_instance = this; - DCHECK(primary_profile_); const user_manager::User* primary_user = chromeos::ProfileHelper::Get()->GetUserByProfile(primary_profile); @@ -355,14 +350,6 @@ KerberosCredentialsManager::~KerberosCredentialsManager() { policy_service_->RemoveObserver(policy::POLICY_DOMAIN_CHROME, this); - DCHECK(g_instance); - g_instance = nullptr; -} - -// static -KerberosCredentialsManager& KerberosCredentialsManager::Get() { - DCHECK(g_instance); - return *g_instance; } // static
diff --git a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h index a0bf0b30..7867ab2 100644 --- a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h +++ b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h
@@ -15,6 +15,7 @@ #include "base/optional.h" #include "chrome/browser/chromeos/authpolicy/kerberos_files_handler.h" #include "chromeos/dbus/kerberos/kerberos_service.pb.h" +#include "components/keyed_service/core/keyed_service.h" #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/policy_service.h" @@ -32,7 +33,8 @@ class KerberosAddAccountRunner; class VariableExpander; -class KerberosCredentialsManager : public policy::PolicyService::Observer { +class KerberosCredentialsManager : public KeyedService, + public policy::PolicyService::Observer { public: using ResultCallback = base::OnceCallback<void(kerberos::ErrorType)>; using ListAccountsCallback = @@ -57,10 +59,6 @@ Profile* primary_profile); ~KerberosCredentialsManager() override; - // Singleton accessor. Available once the primary profile is available. - // DCHECKs if the instance has not been created yet. - static KerberosCredentialsManager& Get(); - // Registers prefs stored in local state. static void RegisterLocalStatePrefs(PrefRegistrySimple* registry);
diff --git a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.cc b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.cc new file mode 100644 index 0000000..10d1dda --- /dev/null +++ b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.cc
@@ -0,0 +1,106 @@ +// Copyright 2019 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. + +#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h" + +#include <memory> +#include <utility> + +#include "base/memory/singleton.h" +#include "chrome/browser/browser_process.h" +#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h" +#include "chrome/browser/chromeos/profiles/profile_helper.h" +#include "chrome/browser/profiles/profile.h" +#include "components/keyed_service/content/browser_context_dependency_manager.h" + +namespace chromeos { + +namespace { + +Profile* GetPrimaryProfileFromContext(content::BrowserContext* context) { + if (!user_manager::UserManager::IsInitialized()) + return nullptr; + // Get original profile, so it gets primary profile faster if context is + // incognito profile. + Profile* profile = Profile::FromBrowserContext(context)->GetOriginalProfile(); + if (!ProfileHelper::IsPrimaryProfile(profile)) { + const auto* primary_user = + user_manager::UserManager::Get()->GetPrimaryUser(); + if (!primary_user) + return nullptr; + // Get primary profile from primary user. Note that it only gets primary + // profile if it is fully created. + profile = chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user); + } + return profile; +} + +} // namespace + +// static +KerberosCredentialsManager* KerberosCredentialsManagerFactory::GetExisting( + content::BrowserContext* context) { + Profile* const primary_profile = GetPrimaryProfileFromContext(context); + if (!primary_profile) + return nullptr; + return static_cast<KerberosCredentialsManager*>( + GetInstance()->GetServiceForBrowserContext(primary_profile, false)); +} + +// static +KerberosCredentialsManager* KerberosCredentialsManagerFactory::Get( + content::BrowserContext* context) { + Profile* const primary_profile = GetPrimaryProfileFromContext(context); + if (!primary_profile) + return nullptr; + return static_cast<KerberosCredentialsManager*>( + GetInstance()->GetServiceForBrowserContext(primary_profile, true)); +} + +// static +KerberosCredentialsManagerFactory* +KerberosCredentialsManagerFactory::GetInstance() { + return base::Singleton<KerberosCredentialsManagerFactory>::get(); +} + +KerberosCredentialsManagerFactory::KerberosCredentialsManagerFactory() + : BrowserContextKeyedServiceFactory( + "KerberosCredentialsManager", + BrowserContextDependencyManager::GetInstance()), + service_instance_created_(false) {} + +KerberosCredentialsManagerFactory::~KerberosCredentialsManagerFactory() = + default; + +bool KerberosCredentialsManagerFactory::ServiceIsCreatedWithBrowserContext() + const { + return true; +} + +KeyedService* KerberosCredentialsManagerFactory::BuildServiceInstanceFor( + content::BrowserContext* context) const { + Profile* const profile = Profile::FromBrowserContext(context); + + // Verify that UserManager is initialized before calling IsPrimaryProfile. + if (!user_manager::UserManager::IsInitialized()) + return nullptr; + + // Verify that we create instance for a primary profile. + if (!ProfileHelper::IsPrimaryProfile(profile)) + return nullptr; + + // Verify that this is not a testing profile. + if (profile->AsTestingProfile()) + return nullptr; + + // Make sure one and only one instance is ever created. + if (service_instance_created_) + return nullptr; + service_instance_created_ = true; + + PrefService* local_state = g_browser_process->local_state(); + return new KerberosCredentialsManager(local_state, profile); +} + +} // namespace chromeos
diff --git a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h new file mode 100644 index 0000000..e5f6767 --- /dev/null +++ b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h
@@ -0,0 +1,75 @@ +// Copyright 2019 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. + +#ifndef CHROME_BROWSER_CHROMEOS_KERBEROS_KERBEROS_CREDENTIALS_MANAGER_FACTORY_H_ +#define CHROME_BROWSER_CHROMEOS_KERBEROS_KERBEROS_CREDENTIALS_MANAGER_FACTORY_H_ + +#include "components/keyed_service/content/browser_context_keyed_service_factory.h" +#include "components/keyed_service/core/keyed_service.h" + +namespace base { +template <typename T> +struct DefaultSingletonTraits; +} // namespace base + +namespace chromeos { + +class KerberosCredentialsManager; + +// Singleton that creates and owns one KerberosCredentialsManager instance +// associated with primary profile. Note that KerberosCredentialsManager holds +// non-owning pointer to primary profile, so its life-time depends on the +// life-time of the primary profile. +class KerberosCredentialsManagerFactory + : public BrowserContextKeyedServiceFactory { + public: + // Get existing service instance associated with the primary profile. + // Note that the interface still expects the context in case primary profile + // creation is not finalized. It returns nullptr if primary profile doesn't + // exist or primary profile has changed. + static KerberosCredentialsManager* GetExisting( + content::BrowserContext* context); + + // Get existing service instance or create a service instance associated with + // the primary profile. + // Note that the interface still expects the context in case primary profile + // creation is not finalized. It returns nullptr if primary profile doesn't + // exist or primary profile has changed. + static KerberosCredentialsManager* Get(content::BrowserContext* context); + + static KerberosCredentialsManagerFactory* GetInstance(); + + private: + friend struct base::DefaultSingletonTraits<KerberosCredentialsManagerFactory>; + + KerberosCredentialsManagerFactory(); + ~KerberosCredentialsManagerFactory() override; + + // Not copyable. + KerberosCredentialsManagerFactory(const KerberosCredentialsManagerFactory&) = + delete; + KerberosCredentialsManagerFactory& operator=( + const KerberosCredentialsManagerFactory&) = delete; + + bool ServiceIsCreatedWithBrowserContext() const override; + + // Returns nullptr in case context is not a primary profile. Otherwise returns + // valid KerberosCredentialsManager. + KeyedService* BuildServiceInstanceFor( + content::BrowserContext* context) const override; + + // This is workaround to make sure we create only one service (singleton) and + // prevent errors when two primary profiles are present (which normally + // shouldn't happen, except in tests). + // Additional reason to keep this workaround for now is that + // KerberosCredentialsManager cannot be restarted at the moment, because it's + // tightly coupled with KerberosClient singleton. + // Note that it is potential risk for multi-threaded initialization (which is + // not supported at the moment). + mutable bool service_instance_created_; +}; + +} // namespace chromeos + +#endif // CHROME_BROWSER_CHROMEOS_KERBEROS_KERBEROS_CREDENTIALS_MANAGER_FACTORY_H_
diff --git a/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory_browsertest.cc b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory_browsertest.cc new file mode 100644 index 0000000..37b97b57 --- /dev/null +++ b/chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory_browsertest.cc
@@ -0,0 +1,74 @@ +// Copyright 2019 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. + +#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h" + +#include <memory> + +#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h" +#include "chrome/browser/chromeos/profiles/profile_helper.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/test/base/in_process_browser_test.h" +#include "chromeos/constants/chromeos_switches.h" + +namespace chromeos { + +class KerberosCredentialsManagerFactoryBrowserTest + : public InProcessBrowserTest { + protected: + void SetUpCommandLine(base::CommandLine* command_line) override { + command_line->AppendSwitch( + chromeos::switches::kIgnoreUserProfileMappingForTests); + } +}; + +IN_PROC_BROWSER_TEST_F(KerberosCredentialsManagerFactoryBrowserTest, + GetServiceForPrimaryProfile) { + Profile* const profile = browser()->profile(); + ASSERT_TRUE(ProfileHelper::IsPrimaryProfile(profile)); + + KerberosCredentialsManager* manager = + KerberosCredentialsManagerFactory::GetExisting(profile); + ASSERT_TRUE(manager); +} + +IN_PROC_BROWSER_TEST_F(KerberosCredentialsManagerFactoryBrowserTest, + GetServiceForIncognitoProfile) { + Profile* const profile = browser()->profile(); + Browser* incognito_browser = CreateIncognitoBrowser(profile); + ASSERT_TRUE(incognito_browser); + + Profile* incognito_profile = incognito_browser->profile(); + ASSERT_NE(incognito_profile, profile); + ASSERT_EQ(incognito_profile->GetOriginalProfile(), profile); + + // Verify, that Get is not creating a new instance for incognito profile. + KerberosCredentialsManager* manager = + KerberosCredentialsManagerFactory::GetExisting(profile); + ASSERT_TRUE(manager); + ASSERT_EQ(KerberosCredentialsManagerFactory::Get(incognito_profile), manager); + + CloseBrowserSynchronously(incognito_browser); +} + +IN_PROC_BROWSER_TEST_F(KerberosCredentialsManagerFactoryBrowserTest, + GetServiceForOtherProfile) { + Profile* const profile = browser()->profile(); + ASSERT_TRUE(ProfileHelper::IsPrimaryProfile(profile)); + + Profile* const other_profile = ProfileHelper::GetSigninProfile(); + ASSERT_NE(other_profile, profile); + ASSERT_NE(other_profile->GetOriginalProfile(), profile); + ASSERT_TRUE(!ProfileHelper::IsPrimaryProfile(other_profile)); + + // Verify, that Get is not creating a new instance for other (non-primary) + // profile. + KerberosCredentialsManager* manager = + KerberosCredentialsManagerFactory::GetExisting(profile); + ASSERT_TRUE(manager); + ASSERT_EQ(KerberosCredentialsManagerFactory::Get(other_profile), manager); +} + +} // namespace chromeos
diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc index 4c04b37b..545b1e0 100644 --- a/chrome/browser/chromeos/login/app_launch_controller.cc +++ b/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -66,7 +66,7 @@ // Parameters for test: bool skip_splash_wait = false; int network_wait_time_in_seconds = 10; -base::Closure* network_timeout_callback = nullptr; +base::OnceClosure* network_timeout_callback = nullptr; AppLaunchController::ReturnBoolCallback* can_configure_network_callback = nullptr; AppLaunchController::ReturnBoolCallback* @@ -226,7 +226,7 @@ // static void AppLaunchController::SetNetworkTimeoutCallbackForTesting( - base::Closure* callback) { + base::OnceClosure* callback) { network_timeout_callback = callback; } @@ -379,8 +379,10 @@ MaybeShowNetworkConfigureUI(); - if (network_timeout_callback) - network_timeout_callback->Run(); + if (network_timeout_callback) { + std::move(*network_timeout_callback).Run(); + network_timeout_callback = nullptr; + } } void AppLaunchController::OnAppWindowCreated() {
diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h index b09f5e4..034a45cb6 100644 --- a/chrome/browser/chromeos/login/app_launch_controller.h +++ b/chrome/browser/chromeos/login/app_launch_controller.h
@@ -66,7 +66,7 @@ // Customize controller for testing purposes. static void SkipSplashWaitForTesting(); - static void SetNetworkTimeoutCallbackForTesting(base::Closure* callback); + static void SetNetworkTimeoutCallbackForTesting(base::OnceClosure* callback); static void SetNetworkWaitForTesting(int wait_time_secs); static void SetCanConfigureNetworkCallbackForTesting( ReturnBoolCallback* callback);
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index a70d40d..7a75bad 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -16,6 +16,7 @@ #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" +#include "base/test/bind_test_util.h" #include "base/threading/thread_restrictions.h" #include "base/threading/thread_task_runner_handle.h" #include "base/timer/timer.h" @@ -472,7 +473,7 @@ runner1 = new content::MessageLoopRunner; subscription1 = chromeos::CrosSettings::Get()->AddSettingsObserver( chromeos::kAccountsPrefDeviceLocalAccountAutoLoginId, - runner1->QuitClosure()); + base::BindLambdaForTesting([&]() { runner1->Quit(); })); } scoped_refptr<content::MessageLoopRunner> runner2; std::unique_ptr<CrosSettings::ObserverSubscription> subscription2; @@ -482,7 +483,7 @@ runner2 = new content::MessageLoopRunner; subscription2 = chromeos::CrosSettings::Get()->AddSettingsObserver( chromeos::kAccountsPrefDeviceLocalAccountAutoLoginDelay, - runner2->QuitClosure()); + base::BindLambdaForTesting([&]() { runner2->Quit(); })); } // Update the policy.
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index 1113cde..1e3a6fa 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -223,25 +223,25 @@ // Helper function for GetConsumerKioskAutoLaunchStatusCallback. void ConsumerKioskAutoLaunchStatusCheck( KioskAppManager::ConsumerKioskAutoLaunchStatus* out_status, - const base::Closure& runner_quit_task, + base::OnceClosure runner_quit_task, KioskAppManager::ConsumerKioskAutoLaunchStatus in_status) { LOG(INFO) << "KioskAppManager::ConsumerKioskModeStatus = " << in_status; *out_status = in_status; - runner_quit_task.Run(); + std::move(runner_quit_task).Run(); } // Helper KioskAppManager::EnableKioskModeCallback implementation. void ConsumerKioskModeAutoStartLockCheck(bool* out_locked, - const base::Closure& runner_quit_task, + base::OnceClosure runner_quit_task, bool in_locked) { LOG(INFO) << "kiosk locked = " << in_locked; *out_locked = in_locked; - runner_quit_task.Run(); + std::move(runner_quit_task).Run(); } // Helper function for WaitForNetworkTimeOut. -void OnNetworkWaitTimedOut(const base::Closure& runner_quit_task) { - runner_quit_task.Run(); +void OnNetworkWaitTimedOut(base::OnceClosure runner_quit_task) { + std::move(runner_quit_task).Run(); } bool IsAppInstalled(const std::string& app_id, const std::string& version) { @@ -684,21 +684,20 @@ scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; - base::Closure callback = - base::Bind(&OnNetworkWaitTimedOut, runner->QuitClosure()); + base::OnceClosure callback = + base::BindOnce(&OnNetworkWaitTimedOut, runner->QuitClosure()); AppLaunchController::SetNetworkTimeoutCallbackForTesting(&callback); runner->Run(); CHECK(GetAppLaunchController()->network_wait_timedout()); - AppLaunchController::SetNetworkTimeoutCallbackForTesting(nullptr); } void EnableConsumerKioskMode() { bool locked = false; scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; - KioskAppManager::Get()->EnableConsumerKioskAutoLaunch(base::Bind( + KioskAppManager::Get()->EnableConsumerKioskAutoLaunch(base::BindOnce( &ConsumerKioskModeAutoStartLockCheck, &locked, runner->QuitClosure())); runner->Run(); EXPECT_TRUE(locked); @@ -709,7 +708,7 @@ static_cast<KioskAppManager::ConsumerKioskAutoLaunchStatus>(-1); scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; - KioskAppManager::Get()->GetConsumerKioskAutoLaunchStatus(base::Bind( + KioskAppManager::Get()->GetConsumerKioskAutoLaunchStatus(base::BindOnce( &ConsumerKioskAutoLaunchStatusCheck, &status, runner->QuitClosure())); runner->Run(); CHECK_NE(status,
diff --git a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc index e533785..11bf78a7f 100644 --- a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc
@@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" +#include "base/test/bind_test_util.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" @@ -75,7 +76,8 @@ new content::MessageLoopRunner); std::unique_ptr<CrosSettings::ObserverSubscription> subscription( chromeos::CrosSettings::Get()->AddSettingsObserver( - cros_setting_name, runner->QuitClosure())); + cros_setting_name, + base::BindLambdaForTesting([&]() { runner->Quit(); }))); RefreshDevicePolicy(); runner->Run();
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_loader.cc b/chrome/browser/chromeos/login/users/avatar/user_image_loader.cc index 81db0cb..ea09a655 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_loader.cc +++ b/chrome/browser/chromeos/login/users/avatar/user_image_loader.cc
@@ -32,17 +32,21 @@ ImageInfo(const base::FilePath& file_path, int pixels_per_side, ImageDecoder::ImageCodec image_codec, - const LoadedCallback& loaded_cb) + LoadedCallback loaded_cb) : file_path(file_path), pixels_per_side(pixels_per_side), image_codec(image_codec), - loaded_cb(loaded_cb) {} + loaded_cb(std::move(loaded_cb)) {} + + ImageInfo(ImageInfo&&) = default; + ImageInfo& operator=(ImageInfo&&) = default; + ~ImageInfo() {} - const base::FilePath file_path; - const int pixels_per_side; - const ImageDecoder::ImageCodec image_codec; - const LoadedCallback loaded_cb; + base::FilePath file_path; + int pixels_per_side; + ImageDecoder::ImageCodec image_codec; + LoadedCallback loaded_cb; }; // Crops |image| to the square format and downsizes the image to @@ -106,10 +110,10 @@ class UserImageRequest : public ImageDecoder::ImageRequest { public: UserImageRequest( - const ImageInfo& image_info, + ImageInfo image_info, const std::string& image_data, scoped_refptr<base::SequencedTaskRunner> background_task_runner) - : image_info_(image_info), + : image_info_(std::move(image_info)), // TODO(crbug.com/593251): Remove the data copy here. image_data_(new base::RefCountedBytes( reinterpret_cast<const unsigned char*>(image_data.data()), @@ -134,7 +138,7 @@ bool image_bytes_regenerated); private: - const ImageInfo image_info_; + ImageInfo image_info_; scoped_refptr<base::RefCountedBytes> image_data_; scoped_refptr<base::SequencedTaskRunner> background_task_runner_; @@ -200,19 +204,20 @@ image_info_.image_codec == ImageDecoder::ROBUST_PNG_CODEC || image_bytes_regenerated) user_image->MarkAsSafe(); - image_info_.loaded_cb.Run(std::move(user_image)); + std::move(image_info_.loaded_cb).Run(std::move(user_image)); delete this; } void UserImageRequest::OnDecodeImageFailed() { - image_info_.loaded_cb.Run(base::WrapUnique(new user_manager::UserImage)); + std::move(image_info_.loaded_cb) + .Run(base::WrapUnique(new user_manager::UserImage)); delete this; } // Starts decoding the image with ImageDecoder for the image |data| if // |data_is_ready| is true. void DecodeImage( - const ImageInfo& image_info, + ImageInfo image_info, scoped_refptr<base::SequencedTaskRunner> background_task_runner, const std::string* data, bool data_is_ready) { @@ -220,15 +225,15 @@ base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce( - image_info.loaded_cb, + std::move(image_info.loaded_cb), base::Passed(base::WrapUnique(new user_manager::UserImage)))); return; } - UserImageRequest* image_request = - new UserImageRequest(image_info, *data, background_task_runner); - ImageDecoder::StartWithOptions(image_request, *data, image_info.image_codec, - false); + ImageDecoder::ImageCodec codec = image_info.image_codec; + UserImageRequest* image_request = new UserImageRequest( + std::move(image_info), *data, background_task_runner); + ImageDecoder::StartWithOptions(image_request, *data, codec, false); } } // namespace @@ -238,14 +243,15 @@ const base::FilePath& file_path, ImageDecoder::ImageCodec image_codec, int pixels_per_side, - const LoadedCallback& loaded_cb) { + LoadedCallback loaded_cb) { std::string* data = new std::string; base::PostTaskAndReplyWithResult( background_task_runner.get(), FROM_HERE, - base::Bind(&base::ReadFileToString, file_path, data), - base::Bind(&DecodeImage, - ImageInfo(file_path, pixels_per_side, image_codec, loaded_cb), - background_task_runner, base::Owned(data))); + base::BindOnce(&base::ReadFileToString, file_path, data), + base::BindOnce(&DecodeImage, + ImageInfo(file_path, pixels_per_side, image_codec, + std::move(loaded_cb)), + background_task_runner, base::Owned(data))); } void StartWithData( @@ -253,10 +259,10 @@ std::unique_ptr<std::string> data, ImageDecoder::ImageCodec image_codec, int pixels_per_side, - const LoadedCallback& loaded_cb) { - DecodeImage( - ImageInfo(base::FilePath(), pixels_per_side, image_codec, loaded_cb), - background_task_runner, data.get(), true /* data_is_ready */); + LoadedCallback loaded_cb) { + DecodeImage(ImageInfo(base::FilePath(), pixels_per_side, image_codec, + std::move(loaded_cb)), + background_task_runner, data.get(), true /* data_is_ready */); } } // namespace user_image_loader
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h index dc36329..b48d3ba 100644 --- a/chrome/browser/chromeos/login/users/avatar/user_image_loader.h +++ b/chrome/browser/chromeos/login/users/avatar/user_image_loader.h
@@ -25,8 +25,8 @@ namespace chromeos { namespace user_image_loader { -typedef base::Callback<void(std::unique_ptr<user_manager::UserImage>)> - LoadedCallback; +using LoadedCallback = + base::OnceCallback<void(std::unique_ptr<user_manager::UserImage>)>; // Loads an image with |image_codec| in the background and calls |loaded_cb| // with the resulting UserImage (which may be empty in case of error). If @@ -41,13 +41,13 @@ const base::FilePath& file_path, ImageDecoder::ImageCodec image_codec, int pixels_per_side, - const LoadedCallback& loaded_cb); + LoadedCallback loaded_cb); void StartWithData( scoped_refptr<base::SequencedTaskRunner> background_task_runner, std::unique_ptr<std::string> data, ImageDecoder::ImageCodec image_codec, int pixels_per_side, - const LoadedCallback& loaded_cb); + LoadedCallback loaded_cb); } // namespace user_image_loader } // namespace chromeos
diff --git a/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc b/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc index c2767462..c98fafc 100644 --- a/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc +++ b/chrome/browser/chromeos/policy/status_collector/device_status_collector.cc
@@ -1448,9 +1448,11 @@ anything_reported = true; } - // Don't write any network state if we aren't in a kiosk or public session. - if (!GetAutoLaunchedKioskSessionInfo() && - !user_manager::UserManager::Get()->IsLoggedInAsPublicAccount()) { + user_manager::UserManager* user_manager = user_manager::UserManager::Get(); + const user_manager::User* const primary_user = user_manager->GetPrimaryUser(); + // Don't write network state for unaffiliated users or when no user is signed + // in. + if (!primary_user || !primary_user->IsAffiliated()) { return anything_reported; }
diff --git a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc index 06d504e..6c7e33f 100644 --- a/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc +++ b/chrome/browser/chromeos/policy/status_collector/device_status_collector_browsertest.cc
@@ -2554,8 +2554,7 @@ shill::kStateOffline, em::NetworkState::OFFLINE, "", "" }; -class DeviceStatusCollectorNetworkInterfacesTest - : public DeviceStatusCollectorTest { +class DeviceStatusCollectorNetworkTest : public DeviceStatusCollectorTest { protected: void SetUp() override { DeviceStatusCollectorTest::SetUp(); @@ -2673,7 +2672,13 @@ DeviceStatusCollectorTest::TearDown(); } - void VerifyNetworkReporting() { + virtual void VerifyReporting() = 0; +}; + +class DeviceStatusCollectorNetworkInterfacesTest + : public DeviceStatusCollectorNetworkTest { + protected: + void VerifyReporting() override { int count = 0; for (const FakeDeviceData& dev : kFakeDevices) { if (dev.expected_type == -1) @@ -2704,8 +2709,71 @@ } EXPECT_EQ(count, device_status_.network_interfaces_size()); + } +}; - // Now make sure network state list is correct. +TEST_F(DeviceStatusCollectorNetworkInterfacesTest, Default) { + // Network interfaces should be reported by default. + GetStatus(); + VerifyReporting(); + + // Network interfaces shouldn't be reported if the policy is off. + scoped_testing_cros_settings_.device_settings()->SetBoolean( + chromeos::kReportDeviceNetworkInterfaces, false); + GetStatus(); + EXPECT_EQ(0, device_status_.network_interfaces_size()); + + // Switch the policy on and verify the interface list is present. + scoped_testing_cros_settings_.device_settings()->SetBoolean( + chromeos::kReportDeviceNetworkInterfaces, true); + GetStatus(); + VerifyReporting(); +} + +TEST_F(DeviceStatusCollectorNetworkInterfacesTest, IfUnaffiliatedUser) { + // Network interfaces should be reported for unaffiliated users. + const AccountId account_id0(AccountId::FromUserEmail("user0@managed.com")); + user_manager_->AddUserWithAffiliationAndType(account_id0, false, + user_manager::USER_TYPE_REGULAR); + GetStatus(); + VerifyReporting(); +} + +TEST_F(DeviceStatusCollectorNetworkInterfacesTest, IfAffiliatedUser) { + // Network interfaces should be reported for affiliated users. + const AccountId account_id0(AccountId::FromUserEmail("user0@managed.com")); + user_manager_->AddUserWithAffiliationAndType(account_id0, true, + user_manager::USER_TYPE_REGULAR); + GetStatus(); + VerifyReporting(); +} + +TEST_F(DeviceStatusCollectorNetworkInterfacesTest, IfPublicSession) { + // Network interfaces should be reported if in public session. + user_manager_->CreatePublicAccountUser( + AccountId::FromUserEmail(kPublicAccountId)); + EXPECT_CALL(*user_manager_, IsLoggedInAsPublicAccount()) + .WillRepeatedly(Return(true)); + + GetStatus(); + VerifyReporting(); +} + +TEST_F(DeviceStatusCollectorNetworkInterfacesTest, IfKioskMode) { + // Network interfaces should be reported if in kiosk mode. + + user_manager_->CreateKioskAppUser(AccountId::FromUserEmail(kKioskAccountId)); + EXPECT_CALL(*user_manager_, IsLoggedInAsKioskApp()) + .WillRepeatedly(Return(true)); + + GetStatus(); + VerifyReporting(); +} + +class DeviceStatusCollectorNetworkStateTest + : public DeviceStatusCollectorNetworkTest { + protected: + void VerifyReporting() override { EXPECT_EQ(base::size(kFakeNetworks), static_cast<size_t>(device_status_.network_states_size())); for (const FakeNetworkState& state : kFakeNetworks) { @@ -2736,51 +2804,69 @@ } }; -TEST_F(DeviceStatusCollectorNetworkInterfacesTest, NoNetworkStateIfNotKiosk) { - // If not in an active kiosk session, there should be network interfaces - // reported, but no network state. +TEST_F(DeviceStatusCollectorNetworkStateTest, Default) { + // Network state shouldn't be reported by default. GetStatus(); - EXPECT_LT(0, device_status_.network_interfaces_size()); EXPECT_EQ(0, device_status_.network_states_size()); -} -TEST_F(DeviceStatusCollectorNetworkInterfacesTest, NetworkInterfaces) { - // Mock that we are in kiosk mode so we report network state. - status_collector_->set_kiosk_account( - std::make_unique<policy::DeviceLocalAccount>( - fake_kiosk_device_local_account_)); + // Mock that the device is in kiosk mode to report network state. + user_manager_->CreateKioskAppUser(AccountId::FromUserEmail(kKioskAccountId)); + EXPECT_CALL(*user_manager_, IsLoggedInAsKioskApp()) + .WillRepeatedly(Return(true)); - // Interfaces should be reported by default. GetStatus(); - EXPECT_LT(0, device_status_.network_interfaces_size()); - EXPECT_LT(0, device_status_.network_states_size()); + VerifyReporting(); - // No interfaces should be reported if the policy is off. + // Network state shouldn't be reported if the policy is off. scoped_testing_cros_settings_.device_settings()->SetBoolean( chromeos::kReportDeviceNetworkInterfaces, false); GetStatus(); - EXPECT_EQ(0, device_status_.network_interfaces_size()); EXPECT_EQ(0, device_status_.network_states_size()); - // Switch the policy on and verify the interface list is present. + // Switch the policy on and verify that network state is reported scoped_testing_cros_settings_.device_settings()->SetBoolean( chromeos::kReportDeviceNetworkInterfaces, true); GetStatus(); - - VerifyNetworkReporting(); + VerifyReporting(); } -TEST_F(DeviceStatusCollectorNetworkInterfacesTest, ReportIfPublicSession) { - // Report netowork state for public accounts. +TEST_F(DeviceStatusCollectorNetworkStateTest, IfUnaffiliatedUser) { + // Network state shouldn't be reported for unaffiliated users. + const AccountId account_id0(AccountId::FromUserEmail("user0@managed.com")); + user_manager_->AddUserWithAffiliationAndType(account_id0, false, + user_manager::USER_TYPE_REGULAR); + GetStatus(); + EXPECT_EQ(0, device_status_.network_states_size()); +} + +TEST_F(DeviceStatusCollectorNetworkStateTest, IfAffiliatedUser) { + // Network state should be reported for affiliated users. + const AccountId account_id0(AccountId::FromUserEmail("user0@managed.com")); + user_manager_->AddUserWithAffiliationAndType(account_id0, true, + user_manager::USER_TYPE_REGULAR); + GetStatus(); + VerifyReporting(); +} + +TEST_F(DeviceStatusCollectorNetworkStateTest, IfPublicSession) { + // Network state should be reported if in public session. user_manager_->CreatePublicAccountUser( AccountId::FromUserEmail(kPublicAccountId)); EXPECT_CALL(*user_manager_, IsLoggedInAsPublicAccount()) .WillRepeatedly(Return(true)); - scoped_testing_cros_settings_.device_settings()->SetBoolean( - chromeos::kReportDeviceNetworkInterfaces, true); GetStatus(); - VerifyNetworkReporting(); + VerifyReporting(); +} + +TEST_F(DeviceStatusCollectorNetworkStateTest, IfKioskMode) { + // Network state should be reported if in kiosk mode. + user_manager_->CreateKioskAppUser(AccountId::FromUserEmail(kKioskAccountId)); + EXPECT_CALL(*user_manager_, IsLoggedInAsKioskApp()) + .WillRepeatedly(Return(true)); + + GetStatus(); + VerifyReporting(); } } // namespace policy
diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc index 59be592..2027bce 100644 --- a/chrome/browser/chromeos/settings/cros_settings.cc +++ b/chrome/browser/chromeos/settings/cros_settings.cc
@@ -287,9 +287,9 @@ std::unique_ptr<CrosSettings::ObserverSubscription> CrosSettings::AddSettingsObserver(const std::string& path, - const base::Closure& callback) { + base::RepeatingClosure callback) { DCHECK(!path.empty()); - DCHECK(!callback.is_null()); + DCHECK(callback); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (!GetProvider(path)) { @@ -309,7 +309,7 @@ registry = observer_iterator->second.get(); } - return registry->Add(callback); + return registry->Add(std::move(callback)); } CrosSettingsProvider* CrosSettings::GetProvider(
diff --git a/chrome/browser/chromeos/settings/cros_settings.h b/chrome/browser/chromeos/settings/cros_settings.h index 20045148..1d09369 100644 --- a/chrome/browser/chromeos/settings/cros_settings.h +++ b/chrome/browser/chromeos/settings/cros_settings.h
@@ -117,7 +117,7 @@ using ObserverSubscription = base::CallbackList<void(void)>::Subscription; std::unique_ptr<ObserverSubscription> AddSettingsObserver( const std::string& path, - const base::Closure& callback) WARN_UNUSED_RESULT; + base::RepeatingClosure callback) WARN_UNUSED_RESULT; // Returns the provider that handles settings with the |path| or prefix. CrosSettingsProvider* GetProvider(const std::string& path) const;
diff --git a/chrome/browser/chromeos/smb_client/smb_file_system.cc b/chrome/browser/chromeos/smb_client/smb_file_system.cc index f1b20ba..d32147a 100644 --- a/chrome/browser/chromeos/smb_client/smb_file_system.cc +++ b/chrome/browser/chromeos/smb_client/smb_file_system.cc
@@ -497,8 +497,7 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& - notification_callback) { + storage::WatcherManager::NotificationCallback notification_callback) { // Watchers are not supported. NOTREACHED(); std::move(callback).Run(base::File::FILE_ERROR_INVALID_OPERATION);
diff --git a/chrome/browser/chromeos/smb_client/smb_file_system.h b/chrome/browser/chromeos/smb_client/smb_file_system.h index 3cd6ccb..47f8339f 100644 --- a/chrome/browser/chromeos/smb_client/smb_file_system.h +++ b/chrome/browser/chromeos/smb_client/smb_file_system.h
@@ -148,8 +148,8 @@ bool recursive, bool persistent, storage::AsyncFileUtil::StatusCallback callback, - const storage::WatcherManager::NotificationCallback& - notification_callback) override; + storage::WatcherManager::NotificationCallback notification_callback) + override; void RemoveWatcher(const GURL& origin, const base::FilePath& entry_path,
diff --git a/chrome/browser/component_updater/crowd_deny_component_installer.cc b/chrome/browser/component_updater/crowd_deny_component_installer.cc new file mode 100644 index 0000000..91e4ac6d --- /dev/null +++ b/chrome/browser/component_updater/crowd_deny_component_installer.cc
@@ -0,0 +1,127 @@ +// Copyright 2019 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. + +#include "chrome/browser/component_updater/crowd_deny_component_installer.h" + +#include <memory> +#include <string> +#include <utility> +#include <vector> + +#include "base/callback.h" +#include "base/files/file_path.h" +#include "base/files/file_util.h" +#include "base/logging.h" +#include "base/memory/ref_counted.h" +#include "base/values.h" +#include "chrome/browser/permissions/crowd_deny_preload_data.h" + +namespace { + +// The SHA-256 hash of the public key (in X.509 format, DER-encoded) used to +// sign the extension. The extension id is: ggkkehgbnfjpeggfpleeakpidbkibbmn. +constexpr uint8_t kCrowdDenyPublicKeySHA256[32] = { + 0x66, 0xaa, 0x47, 0x61, 0xd5, 0x9f, 0x46, 0x65, 0xfb, 0x44, 0x0a, + 0xf8, 0x31, 0xa8, 0x11, 0xcd, 0x5e, 0xea, 0x32, 0xe0, 0x29, 0x8b, + 0x0c, 0x3a, 0xb4, 0xc9, 0x5e, 0x9c, 0xa4, 0x2a, 0x6d, 0x90}; + +constexpr char kCrowdDenyHumanReadableName[] = "Crowd Deny"; +constexpr char kCrowdDenyManifestPreloadDataFormatKey[] = "preload_data_format"; +constexpr int kCrowdDenyManifestPreloadDataCurrentFormat = 1; + +constexpr base::FilePath::CharType kCrowdDenyPreloadDataFilename[] = + FILE_PATH_LITERAL("Preload Data"); + +base::FilePath GetPreloadDataFilePath(const base::FilePath& install_dir) { + return install_dir.Append(kCrowdDenyPreloadDataFilename); +} + +} // namespace + +namespace component_updater { + +bool CrowdDenyComponentInstallerPolicy:: + SupportsGroupPolicyEnabledComponentUpdates() const { + return false; +} + +bool CrowdDenyComponentInstallerPolicy::VerifyInstallation( + const base::DictionaryValue& manifest, + const base::FilePath& install_dir) const { + // Just check that the file is there, detailed verification of the contents is + // delegated to code in //chrome/browser/permissions. + return base::PathExists(GetPreloadDataFilePath(install_dir)); +} + +bool CrowdDenyComponentInstallerPolicy::RequiresNetworkEncryption() const { + return true; +} + +update_client::CrxInstaller::Result +CrowdDenyComponentInstallerPolicy::OnCustomInstall( + const base::DictionaryValue& manifest, + const base::FilePath& install_dir) { + // Nothing custom here. + return update_client::CrxInstaller::Result(0); +} + +void CrowdDenyComponentInstallerPolicy::OnCustomUninstall() { + // Nothing custom here. +} + +void CrowdDenyComponentInstallerPolicy::ComponentReady( + const base::Version& version, + const base::FilePath& install_dir, + std::unique_ptr<base::DictionaryValue> manifest) { + DVLOG(1) << "Crowd Deny component ready, version " << version.GetString() + << " in " << install_dir.value(); + + int format = 0; + if (!manifest->GetInteger(kCrowdDenyManifestPreloadDataFormatKey, &format) || + format != kCrowdDenyManifestPreloadDataCurrentFormat) { + DVLOG(1) << "Crowd Deny component bailing out. Future data version: " + << format; + return; + } + + CrowdDenyPreloadData::GetInstance()->LoadFromDisk( + GetPreloadDataFilePath(install_dir)); +} + +base::FilePath CrowdDenyComponentInstallerPolicy::GetRelativeInstallDir() + const { + return base::FilePath(FILE_PATH_LITERAL("Crowd Deny")); +} + +void CrowdDenyComponentInstallerPolicy::GetHash( + std::vector<uint8_t>* hash) const { + hash->assign( + kCrowdDenyPublicKeySHA256, + kCrowdDenyPublicKeySHA256 + base::size(kCrowdDenyPublicKeySHA256)); +} + +std::string CrowdDenyComponentInstallerPolicy::GetName() const { + return kCrowdDenyHumanReadableName; +} + +std::vector<std::string> CrowdDenyComponentInstallerPolicy::GetMimeTypes() + const { + // Not a plugin. + return std::vector<std::string>(); +} + +update_client::InstallerAttributes +CrowdDenyComponentInstallerPolicy::GetInstallerAttributes() const { + // No special update rules. + return update_client::InstallerAttributes(); +} + +void RegisterCrowdDenyComponent(ComponentUpdateService* cus, + const base::FilePath& user_data_dir) { + auto installer = base::MakeRefCounted<ComponentInstaller>( + std::make_unique<CrowdDenyComponentInstallerPolicy>()); + installer->Register(cus, base::OnceClosure()); +} + +} // namespace component_updater
diff --git a/chrome/browser/component_updater/crowd_deny_component_installer.h b/chrome/browser/component_updater/crowd_deny_component_installer.h new file mode 100644 index 0000000..6b747df --- /dev/null +++ b/chrome/browser/component_updater/crowd_deny_component_installer.h
@@ -0,0 +1,55 @@ +// Copyright 2019 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. + +#ifndef CHROME_BROWSER_COMPONENT_UPDATER_CROWD_DENY_COMPONENT_INSTALLER_H_ +#define CHROME_BROWSER_COMPONENT_UPDATER_CROWD_DENY_COMPONENT_INSTALLER_H_ + +#include "base/macros.h" +#include "components/component_updater/component_installer.h" + +namespace base { +class FilePath; +} // namespace base + +namespace component_updater { + +class ComponentUpdateService; + +class CrowdDenyComponentInstallerPolicy : public ComponentInstallerPolicy { + public: + CrowdDenyComponentInstallerPolicy() {} + ~CrowdDenyComponentInstallerPolicy() override {} + + private: + static base::FilePath GetInstalledPath(const base::FilePath& base); + + // ComponentInstallerPolicy: + bool SupportsGroupPolicyEnabledComponentUpdates() const override; + bool VerifyInstallation(const base::DictionaryValue& manifest, + const base::FilePath& install_dir) const override; + bool RequiresNetworkEncryption() const override; + update_client::CrxInstaller::Result OnCustomInstall( + const base::DictionaryValue& manifest, + const base::FilePath& install_dir) override; + void OnCustomUninstall() override; + void ComponentReady(const base::Version& version, + const base::FilePath& install_dir, + std::unique_ptr<base::DictionaryValue> manifest) override; + base::FilePath GetRelativeInstallDir() const override; + void GetHash(std::vector<uint8_t>* hash) const override; + std::string GetName() const override; + std::vector<std::string> GetMimeTypes() const override; + update_client::InstallerAttributes GetInstallerAttributes() const override; + + DISALLOW_COPY_AND_ASSIGN(CrowdDenyComponentInstallerPolicy); +}; + +// Call once during startup to make the component update service aware of the +// Crowd Deny component. +void RegisterCrowdDenyComponent(ComponentUpdateService* cus, + const base::FilePath& user_data_dir); + +} // namespace component_updater + +#endif // CHROME_BROWSER_COMPONENT_UPDATER_CROWD_DENY_COMPONENT_INSTALLER_H_
diff --git a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc index e487f574..aecce8b 100644 --- a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc +++ b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
@@ -479,18 +479,18 @@ class DevToolsAndroidBridgeWarmUp : public DevToolsAndroidBridge::DeviceCountListener { public: - DevToolsAndroidBridgeWarmUp(base::Closure closure, + DevToolsAndroidBridgeWarmUp(base::OnceClosure closure, DevToolsAndroidBridge* adb_bridge) - : closure_(closure), adb_bridge_(adb_bridge) {} + : closure_(std::move(closure)), adb_bridge_(adb_bridge) {} ~DevToolsAndroidBridgeWarmUp() override = default; void DeviceCountChanged(int count) override { adb_bridge_->RemoveDeviceCountListener(this); - closure_.Run(); + std::move(closure_).Run(); } private: - base::Closure closure_; + base::OnceClosure closure_; DevToolsAndroidBridge* adb_bridge_; }; @@ -592,10 +592,8 @@ class MockListListener : public DevToolsAndroidBridge::DeviceListListener { public: MockListListener(DevToolsAndroidBridge* adb_bridge, - const base::Closure& callback) - : adb_bridge_(adb_bridge), - callback_(callback) { - } + base::OnceClosure callback) + : adb_bridge_(adb_bridge), callback_(std::move(callback)) {} ~MockListListener() override = default; void DeviceListChanged( @@ -605,14 +603,14 @@ ASSERT_EQ(kDeviceModel, device->model()); ASSERT_EQ(kDeviceSerial, device->serial()); adb_bridge_->RemoveDeviceListListener(this); - callback_.Run(); + std::move(callback_).Run(); break; } } } DevToolsAndroidBridge* adb_bridge_; - base::Closure callback_; + base::OnceClosure callback_; }; class MockCountListener : public DevToolsAndroidBridge::DeviceCountListener {
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index b52a10b..dc5e645 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -2154,9 +2154,9 @@ std::string GetSource() override { return source_; } void StartDataRequest(const GURL& url, const content::WebContents::Getter& wc_getter, - const GotDataCallback& callback) override { + GotDataCallback callback) override { std::string data(content_); - callback.Run(base::RefCountedString::TakeString(&data)); + std::move(callback).Run(base::RefCountedString::TakeString(&data)); } std::string GetMimeType(const std::string& path) override { return "text/html";
diff --git a/chrome/browser/enterprise_reporting/report_generator.cc b/chrome/browser/enterprise_reporting/report_generator.cc index 1d9bf0e2..9244c08 100644 --- a/chrome/browser/enterprise_reporting/report_generator.cc +++ b/chrome/browser/enterprise_reporting/report_generator.cc
@@ -74,7 +74,8 @@ void ReportGenerator::OnBrowserReportReady( std::unique_ptr<em::BrowserReport> browser_report) { basic_request_.set_allocated_browser_report(browser_report.release()); - Requests requests = report_request_queue_generator_.Generate(basic_request_); + ReportRequests requests = + report_request_queue_generator_.Generate(basic_request_); std::move(callback_).Run(std::move(requests)); }
diff --git a/chrome/browser/enterprise_reporting/report_generator.h b/chrome/browser/enterprise_reporting/report_generator.h index d99f82d..7f8533d 100644 --- a/chrome/browser/enterprise_reporting/report_generator.h +++ b/chrome/browser/enterprise_reporting/report_generator.h
@@ -12,6 +12,7 @@ #include "base/macros.h" #include "chrome/browser/enterprise_reporting/browser_report_generator.h" +#include "chrome/browser/enterprise_reporting/report_request_definition.h" #include "chrome/browser/enterprise_reporting/report_request_queue_generator.h" #include "components/policy/proto/device_management_backend.pb.h" @@ -21,13 +22,9 @@ class ReportGenerator { public: -#if defined(OS_CHROMEOS) - using Request = em::ChromeOsUserReportRequest; -#else - using Request = em::ChromeDesktopReportRequest; -#endif - using Requests = std::queue<std::unique_ptr<Request>>; - using ReportCallback = base::OnceCallback<void(Requests)>; + using ReportRequest = definition::ReportRequest; + using ReportRequests = std::queue<std::unique_ptr<ReportRequest>>; + using ReportCallback = base::OnceCallback<void(ReportRequests)>; ReportGenerator(); virtual ~ReportGenerator(); @@ -61,7 +58,7 @@ BrowserReportGenerator browser_report_generator_; ReportCallback callback_; // Basic information that is shared among requests. - Request basic_request_; + ReportRequest basic_request_; base::WeakPtrFactory<ReportGenerator> weak_ptr_factory_{this};
diff --git a/chrome/browser/enterprise_reporting/report_generator_unittest.cc b/chrome/browser/enterprise_reporting/report_generator_unittest.cc index f3f32c0..7f01fed 100644 --- a/chrome/browser/enterprise_reporting/report_generator_unittest.cc +++ b/chrome/browser/enterprise_reporting/report_generator_unittest.cc
@@ -147,7 +147,7 @@ base::RunLoop run_loop; std::vector<std::unique_ptr<em::ChromeDesktopReportRequest>> rets; generator_.Generate(base::BindLambdaForTesting( - [&run_loop, &rets](ReportGenerator::Requests requests) { + [&run_loop, &rets](ReportGenerator::ReportRequests requests) { while (!requests.empty()) { rets.push_back(std::move(requests.front())); requests.pop();
diff --git a/chrome/browser/enterprise_reporting/report_request_definition.h b/chrome/browser/enterprise_reporting/report_request_definition.h new file mode 100644 index 0000000..4c9e5677 --- /dev/null +++ b/chrome/browser/enterprise_reporting/report_request_definition.h
@@ -0,0 +1,29 @@ +// Copyright 2019 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. + +#ifndef CHROME_BROWSER_ENTERPRISE_REPORTING_REPORT_REQUEST_DEFINITION_H_ +#define CHROME_BROWSER_ENTERPRISE_REPORTING_REPORT_REQUEST_DEFINITION_H_ + +#include "build/build_config.h" +#include "components/policy/proto/device_management_backend.pb.h" + +namespace enterprise_reporting { + +namespace definition { + +// Both ChromeOsUserReportRequest and ChromeDesktopReportRequest are used to +// upload usage data to DM Server. By the reference to this macro, most classes +// in enterprise_reporting namespace can share the same logic for various +// operation systems. +#if defined(OS_CHROMEOS) +using ReportRequest = enterprise_management::ChromeOsUserReportRequest; +#else +using ReportRequest = enterprise_management::ChromeDesktopReportRequest; +#endif + +} // namespace definition + +} // namespace enterprise_reporting + +#endif // CHROME_BROWSER_ENTERPRISE_REPORTING_REPORT_REQUEST_DEFINITION_H_
diff --git a/chrome/browser/enterprise_reporting/report_request_queue_generator.h b/chrome/browser/enterprise_reporting/report_request_queue_generator.h index 8e003ce4..5ea733d 100644 --- a/chrome/browser/enterprise_reporting/report_request_queue_generator.h +++ b/chrome/browser/enterprise_reporting/report_request_queue_generator.h
@@ -12,6 +12,7 @@ #include "base/macros.h" #include "build/build_config.h" #include "chrome/browser/enterprise_reporting/profile_report_generator.h" +#include "chrome/browser/enterprise_reporting/report_request_definition.h" #include "components/policy/proto/device_management_backend.pb.h" namespace em = enterprise_management; @@ -21,15 +22,8 @@ // Generate a report request queue that contains full profile information. The // request number in the queue is decided by the maximum report size setting. class ReportRequestQueueGenerator { -#if defined(OS_CHROMEOS) - using ReportRequest = em::ChromeOsUserReportRequest; -#else - using ReportRequest = em::ChromeDesktopReportRequest; -#endif - + using ReportRequest = definition::ReportRequest; using ReportRequests = std::queue<std::unique_ptr<ReportRequest>>; - using BrowserReportGetter = - base::RepeatingCallback<em::BrowserReport*(ReportRequest*)>; public: explicit ReportRequestQueueGenerator();
diff --git a/chrome/browser/enterprise_reporting/report_request_queue_generator_unittest.cc b/chrome/browser/enterprise_reporting/report_request_queue_generator_unittest.cc index 5d4808e..b5a82f5 100644 --- a/chrome/browser/enterprise_reporting/report_request_queue_generator_unittest.cc +++ b/chrome/browser/enterprise_reporting/report_request_queue_generator_unittest.cc
@@ -12,6 +12,7 @@ #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h" #include "chrome/browser/enterprise_reporting/browser_report_generator.h" +#include "chrome/browser/enterprise_reporting/report_request_definition.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" @@ -36,11 +37,7 @@ class ReportRequestQueueGeneratorTest : public ::testing::Test { public: -#if defined(OS_CHROMEOS) - using Request = em::ChromeOsUserReportRequest; -#else - using Request = em::ChromeDesktopReportRequest; -#endif + using ReportRequest = definition::ReportRequest; ReportRequestQueueGeneratorTest() : profile_manager_(TestingBrowserProcess::GetGlobal()) {} @@ -97,8 +94,8 @@ .Build()); } - std::unique_ptr<Request> GenerateBasicRequest() { - auto request = std::make_unique<Request>(); + std::unique_ptr<ReportRequest> GenerateBasicRequest() { + auto request = std::make_unique<ReportRequest>(); base::RunLoop run_loop; browser_report_generator_.Generate(base::BindLambdaForTesting( @@ -111,12 +108,12 @@ return request; } - std::vector<std::unique_ptr<Request>> GenerateRequests( - const Request& request) { + std::vector<std::unique_ptr<ReportRequest>> GenerateRequests( + const ReportRequest& request) { histogram_tester_ = std::make_unique<base::HistogramTester>(); - std::queue<std::unique_ptr<Request>> requests = + std::queue<std::unique_ptr<ReportRequest>> requests = report_request_queue_generator_.Generate(request); - std::vector<std::unique_ptr<Request>> result; + std::vector<std::unique_ptr<ReportRequest>> result; while (!requests.empty()) { result.push_back(std::move(requests.front())); requests.pop(); @@ -160,7 +157,8 @@ EXPECT_TRUE(mutable_active_profile_names.empty()); } - void VerifyMetrics(const std::vector<std::unique_ptr<Request>>& requests) { + void VerifyMetrics( + const std::vector<std::unique_ptr<ReportRequest>>& requests) { histogram_tester_->ExpectUniqueSample( "Enterprise.CloudReportingRequestCount", requests.size(), 1); histogram_tester_->ExpectUniqueSample(
diff --git a/chrome/browser/enterprise_reporting/report_scheduler.cc b/chrome/browser/enterprise_reporting/report_scheduler.cc index cd6d88c..b4b88d56 100644 --- a/chrome/browser/enterprise_reporting/report_scheduler.cc +++ b/chrome/browser/enterprise_reporting/report_scheduler.cc
@@ -135,7 +135,8 @@ &ReportScheduler::OnReportGenerated, base::Unretained(this))); } -void ReportScheduler::OnReportGenerated(ReportGenerator::Requests requests) { +void ReportScheduler::OnReportGenerated( + ReportGenerator::ReportRequests requests) { if (requests.empty()) { SYSLOG(ERROR) << "No cloud report can be generated. Likely the report is too large.";
diff --git a/chrome/browser/enterprise_reporting/report_scheduler.h b/chrome/browser/enterprise_reporting/report_scheduler.h index a70e185..6988806 100644 --- a/chrome/browser/enterprise_reporting/report_scheduler.h +++ b/chrome/browser/enterprise_reporting/report_scheduler.h
@@ -53,7 +53,7 @@ void GenerateAndUploadReport(); // Callback once report is generated. - void OnReportGenerated(ReportGenerator::Requests requests); + void OnReportGenerated(ReportGenerator::ReportRequests requests); // Callback once report upload request is finished. void OnReportUploaded(ReportUploader::ReportStatus status);
diff --git a/chrome/browser/enterprise_reporting/report_scheduler_unittest.cc b/chrome/browser/enterprise_reporting/report_scheduler_unittest.cc index 18db53a..97f6646 100644 --- a/chrome/browser/enterprise_reporting/report_scheduler_unittest.cc +++ b/chrome/browser/enterprise_reporting/report_scheduler_unittest.cc
@@ -77,9 +77,9 @@ }; ACTION_P(ScheduleGeneratorCallback, request_number) { - ReportGenerator::Requests requests; + ReportGenerator::ReportRequests requests; for (int i = 0; i < request_number; i++) - requests.push(std::make_unique<ReportGenerator::Request>()); + requests.push(std::make_unique<ReportGenerator::ReportRequest>()); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::BindOnce(std::move(arg0), std::move(requests))); } @@ -94,12 +94,12 @@ public: MockReportUploader() : ReportUploader(nullptr, 0) {} ~MockReportUploader() override = default; - void SetRequestAndUpload(Requests requests, + void SetRequestAndUpload(ReportRequests requests, ReportCallback callback) override { OnSetRequestAndUpload(requests, callback); } MOCK_METHOD2(OnSetRequestAndUpload, - void(Requests& requests, ReportCallback& callback)); + void(ReportRequests& requests, ReportCallback& callback)); private: DISALLOW_COPY_AND_ASSIGN(MockReportUploader); @@ -166,10 +166,10 @@ } } - ReportGenerator::Requests CreateRequests(int number) { - ReportGenerator::Requests requests; + ReportGenerator::ReportRequests CreateRequests(int number) { + ReportGenerator::ReportRequests requests; for (int i = 0; i < number; i++) - requests.push(std::make_unique<ReportGenerator::Request>()); + requests.push(std::make_unique<ReportGenerator::ReportRequest>()); return requests; }
diff --git a/chrome/browser/enterprise_reporting/report_uploader.cc b/chrome/browser/enterprise_reporting/report_uploader.cc index 1ecccf8..439a04e 100644 --- a/chrome/browser/enterprise_reporting/report_uploader.cc +++ b/chrome/browser/enterprise_reporting/report_uploader.cc
@@ -39,7 +39,7 @@ maximum_number_of_retries_(maximum_number_of_retries) {} ReportUploader::~ReportUploader() = default; -void ReportUploader::SetRequestAndUpload(Requests requests, +void ReportUploader::SetRequestAndUpload(ReportRequests requests, ReportCallback callback) { requests_ = std::move(requests); callback_ = std::move(callback); @@ -47,7 +47,7 @@ } void ReportUploader::Upload() { - auto request = std::make_unique<Request>(*requests_.front()); + auto request = std::make_unique<ReportRequest>(*requests_.front()); auto callback = base::BindRepeating(&ReportUploader::OnRequestFinished, weak_ptr_factory_.GetWeakPtr());
diff --git a/chrome/browser/enterprise_reporting/report_uploader.h b/chrome/browser/enterprise_reporting/report_uploader.h index e035e1b..1fbea01 100644 --- a/chrome/browser/enterprise_reporting/report_uploader.h +++ b/chrome/browser/enterprise_reporting/report_uploader.h
@@ -11,20 +11,13 @@ #include "base/callback.h" #include "base/macros.h" #include "base/timer/timer.h" +#include "chrome/browser/enterprise_reporting/report_request_definition.h" #include "net/base/backoff_entry.h" namespace base { class OneShotTimer; } // namespace base -namespace enterprise_management { -#if defined(OS_CHROMEOS) -class ChromeOsUserReportRequest; -#else -class ChromeDesktopReportRequest; -#endif -} // namespace enterprise_management - namespace policy { class CloudPolicyClient; } // namespace policy @@ -52,13 +45,8 @@ // invalid dm token. }; -#if defined(OS_CHROMEOS) - using Request = em::ChromeOsUserReportRequest; -#else - using Request = em::ChromeDesktopReportRequest; -#endif - - using Requests = std::queue<std::unique_ptr<Request>>; + using ReportRequest = definition::ReportRequest; + using ReportRequests = std::queue<std::unique_ptr<ReportRequest>>; // A callback to notify the upload result. using ReportCallback = base::OnceCallback<void(ReportStatus status)>; @@ -68,7 +56,8 @@ // Sets a list of requests and upload it. Request will be uploaded one after // another. - virtual void SetRequestAndUpload(Requests requests, ReportCallback callback); + virtual void SetRequestAndUpload(ReportRequests requests, + ReportCallback callback); private: // Uploads the first request in the queue. @@ -90,7 +79,7 @@ policy::CloudPolicyClient* client_; ReportCallback callback_; - Requests requests_; + ReportRequests requests_; net::BackoffEntry backoff_entry_; base::OneShotTimer backoff_request_timer_;
diff --git a/chrome/browser/enterprise_reporting/report_uploader_unittest.cc b/chrome/browser/enterprise_reporting/report_uploader_unittest.cc index 27435a8..b229bab 100644 --- a/chrome/browser/enterprise_reporting/report_uploader_unittest.cc +++ b/chrome/browser/enterprise_reporting/report_uploader_unittest.cc
@@ -48,9 +48,9 @@ ReportUploader::ReportStatus expected_status) { DCHECK_LE(number_of_request, 2) << "Please update kBrowserVersionNames above."; - ReportUploader::Requests requests; + ReportUploader::ReportRequests requests; for (int i = 0; i < number_of_request; i++) { - auto request = std::make_unique<ReportUploader::Request>(); + auto request = std::make_unique<ReportUploader::ReportRequest>(); request->mutable_browser_report()->set_browser_version( kBrowserVersionNames[i]); requests.push(std::move(request)); @@ -228,23 +228,23 @@ { InSequence s; // First report - EXPECT_CALL( - client_, - UploadReportProxy(Property(&ReportUploader::Request::browser_report, - Property(&em::BrowserReport::browser_version, - Eq(kBrowserVersionNames[0]))), - _)) + EXPECT_CALL(client_, + UploadReportProxy( + Property(&ReportUploader::ReportRequest::browser_report, + Property(&em::BrowserReport::browser_version, + Eq(kBrowserVersionNames[0]))), + _)) .Times(3) .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false))) .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false))) .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(true))); // Second report - EXPECT_CALL( - client_, - UploadReportProxy(Property(&ReportUploader::Request::browser_report, - Property(&em::BrowserReport::browser_version, - Eq(kBrowserVersionNames[1]))), - _)) + EXPECT_CALL(client_, + UploadReportProxy( + Property(&ReportUploader::ReportRequest::browser_report, + Property(&em::BrowserReport::browser_version, + Eq(kBrowserVersionNames[1]))), + _)) .Times(2) .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false))) .WillOnce(WithArgs<1>(policy::ScheduleStatusCallback(false)));
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc index 0f254d0..aaf2cc3 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_apitest.cc
@@ -8,6 +8,8 @@ #include "base/scoped_observer.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" +#include "chrome/browser/background/background_mode_manager.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.h" #include "chrome/browser/extensions/api/messaging/native_messaging_test_util.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -88,6 +90,7 @@ kSupportsNativeInitiatedConnectionsHostName); command_line.AppendSwitchASCII(switches::kNativeMessagingConnectId, connect_id); + command_line.AppendSwitch(switches::kNoStartupWindow); return command_line; } @@ -120,10 +123,16 @@ ResultCatcher catcher; + EXPECT_FALSE( + g_browser_process->background_mode_manager()->IsBackgroundModeActive()); + StartupBrowserCreator::ProcessCommandLineAlreadyRunning( CreateNativeMessagingConnectCommandLine("test-connect-id"), {}, profile()->GetPath()); + EXPECT_TRUE( + g_browser_process->background_mode_manager()->IsBackgroundModeActive()); + if (!catcher.GetNextResult()) { FAIL() << catcher.message(); } @@ -156,6 +165,7 @@ extension->id()); command_line.AppendSwitchASCII(switches::kNativeMessagingConnectHost, ScopedTestNativeMessagingHost::kHostName); + command_line.AppendSwitch(switches::kNoStartupWindow); StartupBrowserCreator::ProcessCommandLineAlreadyRunning(command_line, {}, profile()->GetPath()); @@ -310,6 +320,75 @@ test_host_.temp_dir().AppendASCII("invalid_connect_id.txt"))); } +constexpr char kExtensionId[] = "knldjmfmopnpolahpmmgbagdohdnhkik"; + +class NativeMessagingLaunchBackgroundModeApiTest + : public NativeMessagingLaunchApiTest { + public: + NativeMessagingLaunchBackgroundModeApiTest() { + ProcessManager::SetEventPageIdleTimeForTesting(1); + ProcessManager::SetEventPageSuspendingTimeForTesting(1); + test_host_.RegisterTestHost(true); + } + + NativeMessagingLaunchBackgroundModeApiTest( + const NativeMessagingLaunchBackgroundModeApiTest&) = delete; + NativeMessagingLaunchBackgroundModeApiTest& operator=( + const NativeMessagingLaunchBackgroundModeApiTest&) = delete; + + protected: + void SetUpCommandLine(base::CommandLine* command_line) override { + NativeMessagingLaunchApiTest::SetUpCommandLine(command_line); + + if (base::StringPiece( + ::testing::UnitTest::GetInstance()->current_test_info()->name()) + .starts_with("PRE")) { + return; + } + set_exit_when_last_browser_closes(false); + command_line->AppendSwitchASCII(switches::kNativeMessagingConnectExtension, + kExtensionId); + command_line->AppendSwitchASCII( + switches::kNativeMessagingConnectHost, + ScopedTestNativeMessagingHost:: + kSupportsNativeInitiatedConnectionsHostName); + command_line->AppendSwitchASCII(switches::kNativeMessagingConnectId, + "test-connect-id"); + command_line->AppendSwitch(switches::kNoStartupWindow); + } + + void SetUpOnMainThread() override { + NativeMessagingLaunchApiTest::SetUpOnMainThread(); + + catcher_ = std::make_unique<ResultCatcher>(); + } + + std::unique_ptr<ResultCatcher> catcher_; +}; + +IN_PROC_BROWSER_TEST_F(NativeMessagingLaunchBackgroundModeApiTest, + PRE_Success) { + auto* extension = + LoadExtension(test_data_dir_.AppendASCII("native_messaging_launch")); + EXPECT_EQ(kExtensionId, extension->id()); +} + +IN_PROC_BROWSER_TEST_F(NativeMessagingLaunchBackgroundModeApiTest, Success) { + EXPECT_TRUE( + g_browser_process->background_mode_manager()->IsBackgroundModeActive()); + + if (!catcher_->GetNextResult()) { + FAIL() << catcher_->message(); + } + size_t tabs = 0; + for (auto* browser : *BrowserList::GetInstance()) { + tabs += browser->tab_strip_model()->count(); + } + EXPECT_EQ(0u, tabs); + + ASSERT_NO_FATAL_FAILURE(TestKeepAliveStateObserver().WaitForNoKeepAlive()); +} + #endif // !defined(OS_CHROMEOS) } // namespace
diff --git a/chrome/browser/extensions/forced_extensions/installation_reporter.cc b/chrome/browser/extensions/forced_extensions/installation_reporter.cc index 39b4853..19eeb8ec 100644 --- a/chrome/browser/extensions/forced_extensions/installation_reporter.cc +++ b/chrome/browser/extensions/forced_extensions/installation_reporter.cc
@@ -10,12 +10,6 @@ #include "base/no_destructor.h" #include "chrome/browser/extensions/forced_extensions/installation_reporter_factory.h" -namespace { - -extensions::InstallationReporter::TestObserver* g_test_observer = nullptr; - -} // namespace - namespace extensions { InstallationReporter::InstallationData::InstallationData() = default; @@ -49,7 +43,7 @@ return str.str(); } -InstallationReporter::TestObserver::~TestObserver() = default; +InstallationReporter::Observer::~Observer() = default; InstallationReporter::InstallationReporter( const content::BrowserContext* context) @@ -67,8 +61,8 @@ Stage stage) { InstallationData& data = installation_data_map_[id]; data.install_stage = stage; - if (g_test_observer) { - g_test_observer->OnExtensionDataChanged(id, browser_context_, data); + for (auto& observer : observers_) { + observer.OnExtensionDataChangedForTesting(id, browser_context_, data); } } @@ -77,8 +71,8 @@ ExtensionDownloaderDelegate::Stage stage) { InstallationData& data = installation_data_map_[id]; data.downloading_stage = stage; - if (g_test_observer) { - g_test_observer->OnExtensionDataChanged(id, browser_context_, data); + for (auto& observer : observers_) { + observer.OnExtensionDataChangedForTesting(id, browser_context_, data); } } @@ -89,8 +83,8 @@ ExtensionDownloaderDelegate::CacheStatus::CACHE_UNKNOWN); InstallationData& data = installation_data_map_[id]; data.downloading_cache_status = cache_status; - if (g_test_observer) { - g_test_observer->OnExtensionDataChanged(id, browser_context_, data); + for (auto& observer : observers_) { + observer.OnExtensionDataChangedForTesting(id, browser_context_, data); } } @@ -99,8 +93,9 @@ DCHECK_NE(reason, FailureReason::UNKNOWN); InstallationData& data = installation_data_map_[id]; data.failure_reason = reason; - if (g_test_observer) { - g_test_observer->OnExtensionDataChanged(id, browser_context_, data); + for (auto& observer : observers_) { + observer.OnExtensionInstallationFailed(id, reason); + observer.OnExtensionDataChangedForTesting(id, browser_context_, data); } } @@ -115,8 +110,9 @@ InstallationData& data = installation_data_map_[id]; data.failure_reason = reason; data.install_error_detail = crx_install_error; - if (g_test_observer) { - g_test_observer->OnExtensionDataChanged(id, browser_context_, data); + for (auto& observer : observers_) { + observer.OnExtensionInstallationFailed(id, reason); + observer.OnExtensionDataChangedForTesting(id, browser_context_, data); } } @@ -130,9 +126,12 @@ installation_data_map_.clear(); } -// static -void InstallationReporter::SetTestObserver(TestObserver* observer) { - g_test_observer = observer; +void InstallationReporter::AddObserver(Observer* observer) { + observers_.AddObserver(observer); +} + +void InstallationReporter::RemoveObserver(Observer* observer) { + observers_.RemoveObserver(observer); } } // namespace extensions
diff --git a/chrome/browser/extensions/forced_extensions/installation_reporter.h b/chrome/browser/extensions/forced_extensions/installation_reporter.h index 524a1eb..92ef473 100644 --- a/chrome/browser/extensions/forced_extensions/installation_reporter.h +++ b/chrome/browser/extensions/forced_extensions/installation_reporter.h
@@ -9,6 +9,8 @@ #include <utility> #include "base/macros.h" +#include "base/observer_list.h" +#include "base/observer_list_types.h" #include "base/optional.h" #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/install/crx_install_error.h" @@ -181,12 +183,19 @@ base::Optional<extensions::CrxInstallErrorDetail> install_error_detail; }; - class TestObserver { + class Observer : public base::CheckedObserver { public: - virtual ~TestObserver(); - virtual void OnExtensionDataChanged(const ExtensionId& id, - const content::BrowserContext* context, - const InstallationData& data) = 0; + ~Observer() override; + + virtual void OnExtensionInstallationFailed(const ExtensionId& id, + FailureReason reason) {} + + // Called when any change happens. For production please use more specific + // methods (create one if necessary). + virtual void OnExtensionDataChangedForTesting( + const ExtensionId& id, + const content::BrowserContext* context, + const InstallationData& data) {} }; explicit InstallationReporter(const content::BrowserContext* context); @@ -216,7 +225,8 @@ // Clears all collected failures and stages. void Clear(); - static void SetTestObserver(TestObserver* observer); + void AddObserver(Observer* observer); + void RemoveObserver(Observer* observer); private: const content::BrowserContext* browser_context_; @@ -224,6 +234,8 @@ std::map<ExtensionId, InstallationReporter::InstallationData> installation_data_map_; + base::ObserverList<Observer> observers_; + DISALLOW_COPY_AND_ASSIGN(InstallationReporter); };
diff --git a/chrome/browser/extensions/forced_extensions/installation_tracker.cc b/chrome/browser/extensions/forced_extensions/installation_tracker.cc index 538fe8d..8b101b3f 100644 --- a/chrome/browser/extensions/forced_extensions/installation_tracker.cc +++ b/chrome/browser/extensions/forced_extensions/installation_tracker.cc
@@ -38,10 +38,9 @@ base::BindRepeating(&InstallationTracker::OnForcedExtensionsPrefChanged, base::Unretained(this))); - timer_->Start( - FROM_HERE, kInstallationTimeout, - base::BindRepeating(&InstallationTracker::ReportResults, - base::Unretained(this), false /* succeeded */)); + timer_->Start(FROM_HERE, kInstallationTimeout, + base::BindRepeating(&InstallationTracker::ReportResults, + base::Unretained(this))); // Try to load list now. OnForcedExtensionsPrefChanged(); @@ -64,11 +63,12 @@ for (const auto& extension_id : extensions_to_remove) { forced_extensions_.erase(extension_id); pending_forced_extensions_.erase(extension_id); + failed_forced_extensions_.erase(extension_id); } // Report if all remaining extensions were removed from policy. if (loaded_ && pending_forced_extensions_.empty()) - ReportResults(true /* succeeded */); + ReportResults(); // Load forced extensions list only once. if (value->empty() || loaded_) { @@ -79,11 +79,14 @@ for (const auto& entry : *value) { forced_extensions_.insert(entry.first); - if (!registry_->enabled_extensions().Contains(entry.first)) + if (!registry_->enabled_extensions().Contains(entry.first)) { pending_forced_extensions_.insert(entry.first); + // Think of the extension as of failed one, unless we'll receive disproof. + failed_forced_extensions_.insert(entry.first); + } } if (pending_forced_extensions_.empty()) - ReportResults(true /* succeeded */); + ReportResults(); } void InstallationTracker::OnShutdown(ExtensionRegistry*) { @@ -95,19 +98,29 @@ void InstallationTracker::OnExtensionLoaded( content::BrowserContext* browser_context, const Extension* extension) { + failed_forced_extensions_.erase(extension->id()); if (pending_forced_extensions_.erase(extension->id()) && pending_forced_extensions_.empty()) { - ReportResults(true /* succeeded */); + ReportResults(); } } -void InstallationTracker::ReportResults(bool succeeded) { +void InstallationTracker::OnExtensionInstallationFailed( + const ExtensionId& extension_id, + InstallationReporter::FailureReason reason) { + if (pending_forced_extensions_.erase(extension_id) && + pending_forced_extensions_.empty()) { + ReportResults(); + } +} + +void InstallationTracker::ReportResults() { DCHECK(!reported_); // Report only if there was non-empty list of force-installed extensions. if (!forced_extensions_.empty()) { UMA_HISTOGRAM_COUNTS_100("Extensions.ForceInstalledTotalCandidateCount", forced_extensions_.size()); - if (succeeded) { + if (failed_forced_extensions_.empty()) { UMA_HISTOGRAM_LONG_TIMES("Extensions.ForceInstalledLoadTime", base::Time::Now() - start_time_); // TODO(burunduk): Remove VLOGs after resolving crbug/917700 and @@ -116,11 +129,11 @@ } else { InstallationReporter* installation_reporter = InstallationReporter::Get(profile_); - size_t enabled_missing_count = pending_forced_extensions_.size(); + size_t enabled_missing_count = failed_forced_extensions_.size(); auto installed_extensions = registry_->GenerateInstalledExtensionsSet(); for (const auto& entry : *installed_extensions) - pending_forced_extensions_.erase(entry->id()); - size_t installed_missing_count = pending_forced_extensions_.size(); + failed_forced_extensions_.erase(entry->id()); + size_t installed_missing_count = failed_forced_extensions_.size(); UMA_HISTOGRAM_COUNTS_100("Extensions.ForceInstalledTimedOutCount", enabled_missing_count); @@ -129,7 +142,7 @@ installed_missing_count); VLOG(2) << "Failed to install " << installed_missing_count << " forced extensions."; - for (const auto& extension_id : pending_forced_extensions_) { + for (const auto& extension_id : failed_forced_extensions_) { InstallationReporter::InstallationData installation = installation_reporter->Get(extension_id); UMA_HISTOGRAM_ENUMERATION(
diff --git a/chrome/browser/extensions/forced_extensions/installation_tracker.h b/chrome/browser/extensions/forced_extensions/installation_tracker.h index 346eae1..07515d4 100644 --- a/chrome/browser/extensions/forced_extensions/installation_tracker.h +++ b/chrome/browser/extensions/forced_extensions/installation_tracker.h
@@ -11,6 +11,7 @@ #include "base/scoped_observer.h" #include "base/time/time.h" #include "base/timer/timer.h" +#include "chrome/browser/extensions/forced_extensions/installation_reporter.h" #include "components/prefs/pref_change_registrar.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_observer.h" @@ -28,7 +29,8 @@ // Used to track installation of force-installed extensions for the profile // and report stats to UMA. // ExtensionService owns this class and outlives it. -class InstallationTracker : public ExtensionRegistryObserver { +class InstallationTracker : public ExtensionRegistryObserver, + public InstallationReporter::Observer { public: InstallationTracker(ExtensionRegistry* registry, Profile* profile, @@ -43,6 +45,11 @@ void OnShutdown(ExtensionRegistry*) override; + // InstallationReporter::Observer overrides: + void OnExtensionInstallationFailed( + const ExtensionId& extension_id, + InstallationReporter::FailureReason reason) override; + private: // Loads list of force-installed extensions if available. void OnForcedExtensionsPrefChanged(); @@ -50,7 +57,7 @@ // If |succeeded| report time elapsed for extensions load, // otherwise amount of not yet loaded extensions and reasons // why they were not installed. - void ReportResults(bool succeeded); + void ReportResults(); // Unowned, but guaranteed to outlive this object. ExtensionRegistry* registry_; @@ -65,9 +72,12 @@ // Set of all extensions requested to be force installed. std::set<std::string> forced_extensions_; - // Set of not yet loaded force installed extensions. + // Set of extension, which are neither yet loaded not yet failed permanently. std::set<std::string> pending_forced_extensions_; + // Set of extensions, which are not loaded (both not loaded yet and failed). + std::set<std::string> failed_forced_extensions_; + // Tracks whether non-empty forcelist policy was received at least once. bool loaded_ = false;
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 5e8041f9..96d5a7c 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -188,7 +188,6 @@ new content::MessageLoopRunner; quit_closure_ = runner->QuitClosure(); runner->Run(); - quit_closure_.Reset(); } private: @@ -196,7 +195,7 @@ const content::NotificationSource& source, const content::NotificationDetails& details) override { if (!quit_closure_.is_null()) - quit_closure_.Run(); + std::move(quit_closure_).Run(); for (size_t i = 0; i < base::size(kNotificationsObserved); ++i) { if (kNotificationsObserved[i] == type) { count_[i]++; @@ -213,7 +212,7 @@ content::NotificationRegistrar registrar_; size_t count_[base::size(kNotificationsObserved)]; std::set<std::string> updated_; - base::Closure quit_closure_; + base::OnceClosure quit_closure_; DISALLOW_COPY_AND_ASSIGN(NotificationsObserver); };
diff --git a/chrome/browser/image_decoder_browsertest.cc b/chrome/browser/image_decoder_browsertest.cc index 8f898c1..c19ef28 100644 --- a/chrome/browser/image_decoder_browsertest.cc +++ b/chrome/browser/image_decoder_browsertest.cc
@@ -61,15 +61,14 @@ class TestImageRequest : public ImageDecoder::ImageRequest { public: - explicit TestImageRequest(const base::Closure& quit_closure) + explicit TestImageRequest(base::OnceClosure quit_closure) : decode_succeeded_(false), - quit_closure_(quit_closure), - quit_called_(false) { - } + quit_closure_(std::move(quit_closure)), + quit_called_(false) {} ~TestImageRequest() override { if (!quit_called_) { - quit_closure_.Run(); + std::move(quit_closure_).Run(); } } @@ -88,12 +87,12 @@ void Quit() { EXPECT_FALSE(quit_called_); quit_called_ = true; - quit_closure_.Run(); + std::move(quit_closure_).Run(); } bool decode_succeeded_; - base::Closure quit_closure_; + base::OnceClosure quit_closure_; bool quit_called_; DISALLOW_COPY_AND_ASSIGN(TestImageRequest);
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc index 737d430e..8d57658 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -201,6 +201,7 @@ profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())), password_manager_(this), password_feature_manager_( + profile_->GetPrefs(), ProfileSyncServiceFactory::GetForProfile(profile_)), httpauth_manager_(this), #if defined(SYNC_PASSWORD_REUSE_DETECTION_ENABLED)
diff --git a/chrome/browser/permissions/crowd_deny.proto b/chrome/browser/permissions/crowd_deny.proto new file mode 100644 index 0000000..0985ad17 --- /dev/null +++ b/chrome/browser/permissions/crowd_deny.proto
@@ -0,0 +1,36 @@ +// Copyright 2019 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. + +syntax = "proto2"; + +option optimize_for = LITE_RUNTIME; + +package chrome_browser_crowd_deny; + +// Information, about a specific site, relevant for making permission decisions. +message SiteReputation { + // The domain of the site this records describes. + optional string domain = 1; + + // The quality of the experience users have with notifications on a site. + enum NotificationUserExperienceQuality { + UNKNOWN = 0; + ACCEPTABLE = 1; + UNSOLICITED_PROMPTS = 2; + } + + // The quality of the experience users have with notifications on this site. + optional NotificationUserExperienceQuality notification_ux_quality = 2; +} + +// Information, about popular sites, relevant for making permission decisions. +// +// The preloaded list contains reputation data for popular sites, and is +// distributed to Chrome clients ahead of time through the component updater as +// part of the `crowd_deny_crx` component extension. The CRX package contains a +// single file with a single instance of this message in the binary wire format. +message PreloadData { + // Site reputation information for popular sites. Unsorted. + repeated SiteReputation site_reputations = 1; +}
diff --git a/chrome/browser/permissions/crowd_deny_preload_data.cc b/chrome/browser/permissions/crowd_deny_preload_data.cc new file mode 100644 index 0000000..8729b22 --- /dev/null +++ b/chrome/browser/permissions/crowd_deny_preload_data.cc
@@ -0,0 +1,84 @@ +// Copyright 2019 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. + +#include "chrome/browser/permissions/crowd_deny_preload_data.h" + +#include <utility> + +#include "base/bind.h" +#include "base/bind_helpers.h" +#include "base/files/file_util.h" +#include "base/location.h" +#include "base/no_destructor.h" +#include "base/sequenced_task_runner.h" +#include "base/task/post_task.h" +#include "base/task_runner_util.h" +#include "url/gurl.h" +#include "url/origin.h" +#include "url/url_constants.h" + +namespace { + +using DomainToReputationMap = CrowdDenyPreloadData::DomainToReputationMap; + +// Attempts to load the preload data from |proto_path|, parse it as a serialized +// chrome_browser_crowd_deny::PreloadData message, and index it by domain. +// Returns an empty map is anything goes wrong. +DomainToReputationMap LoadAndParseAndIndexPreloadDataFromDisk( + const base::FilePath& proto_path) { + std::string binary_proto; + if (!base::ReadFileToString(proto_path, &binary_proto)) + return {}; + + CrowdDenyPreloadData::PreloadData preload_data; + if (!preload_data.ParseFromString(binary_proto)) + return {}; + + std::vector<DomainToReputationMap::value_type> domain_reputation_pairs; + domain_reputation_pairs.reserve(preload_data.site_reputations_size()); + for (const auto& site_reputation : preload_data.site_reputations()) { + domain_reputation_pairs.emplace_back(site_reputation.domain(), + site_reputation); + } + return DomainToReputationMap(std::move(domain_reputation_pairs)); +} + +} // namespace + +CrowdDenyPreloadData::CrowdDenyPreloadData() { + loading_task_runner_ = base::CreateSequencedTaskRunner( + {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_VISIBLE}); +} + +CrowdDenyPreloadData::~CrowdDenyPreloadData() = default; + +// static +CrowdDenyPreloadData* CrowdDenyPreloadData::GetInstance() { + static base::NoDestructor<CrowdDenyPreloadData> instance; + return instance.get(); +} + +const CrowdDenyPreloadData::SiteReputation* +CrowdDenyPreloadData::GetReputationDataForSite( + const url::Origin& origin) const { + if (origin.scheme() != url::kHttpsScheme) + return nullptr; + + // For now, do not allow subdomain matches. + const auto it = domain_to_reputation_map_.find(origin.host()); + if (it == domain_to_reputation_map_.end()) + return nullptr; + return &it->second; +} + +void CrowdDenyPreloadData::LoadFromDisk(const base::FilePath& proto_path) { + // On failure, LoadAndParseAndIndexPreloadDataFromDisk will return an empty + // map. Replace the in-memory state with that regardless, so that the stale + // old data will no longer be used. + base::PostTaskAndReplyWithResult( + loading_task_runner_.get(), FROM_HERE, + base::BindOnce(&LoadAndParseAndIndexPreloadDataFromDisk, proto_path), + base::BindOnce(&CrowdDenyPreloadData::set_site_reputations, + base::Unretained(this))); +}
diff --git a/chrome/browser/permissions/crowd_deny_preload_data.h b/chrome/browser/permissions/crowd_deny_preload_data.h new file mode 100644 index 0000000..aed131f9 --- /dev/null +++ b/chrome/browser/permissions/crowd_deny_preload_data.h
@@ -0,0 +1,68 @@ +// Copyright 2019 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. + +#ifndef CHROME_BROWSER_PERMISSIONS_CROWD_DENY_PRELOAD_DATA_H_ +#define CHROME_BROWSER_PERMISSIONS_CROWD_DENY_PRELOAD_DATA_H_ + +#include <memory> +#include <utility> + +#include "base/containers/flat_map.h" +#include "base/macros.h" +#include "base/memory/ref_counted.h" +#include "chrome/browser/permissions/crowd_deny.pb.h" + +namespace base { +class SequencedTaskRunner; +} + +namespace url { +class Origin; +} + +namespace base { +class FilePath; +} + +// Stores information relevant for making permission decision on popular sites. +// +// The preloaded list contains reputation data for popular sites, and is +// distributed to Chrome clients ahead of time through the component updater. +// The purpose is to reduce the frequency of on-demand pings to Safe Browsing. +class CrowdDenyPreloadData { + public: + using SiteReputation = chrome_browser_crowd_deny::SiteReputation; + using DomainToReputationMap = base::flat_map<std::string, SiteReputation>; + using PreloadData = chrome_browser_crowd_deny::PreloadData; + + CrowdDenyPreloadData(); + ~CrowdDenyPreloadData(); + + static CrowdDenyPreloadData* GetInstance(); + + // Returns preloaded site reputation data for |origin| if available, or + // nullptr otherwise. + // + // Because there is no way to establish the identity of insecure origins, + // reputation data is only ever provided if |origin| has HTTPS scheme. The + // port of |origin| is ignored. + const SiteReputation* GetReputationDataForSite( + const url::Origin& origin) const; + + // Parses a single instance of chrome_browser_crowd_deny::PreloadData message + // in binary wire format from the file at |preload_data_path|. + void LoadFromDisk(const base::FilePath& preload_data_path); + + private: + void set_site_reputations(DomainToReputationMap map) { + domain_to_reputation_map_ = std::move(map); + } + + DomainToReputationMap domain_to_reputation_map_; + scoped_refptr<base::SequencedTaskRunner> loading_task_runner_; + + DISALLOW_COPY_AND_ASSIGN(CrowdDenyPreloadData); +}; + +#endif // CHROME_BROWSER_PERMISSIONS_CROWD_DENY_PRELOAD_DATA_H_
diff --git a/chrome/browser/permissions/crowd_deny_preload_data_unittest.cc b/chrome/browser/permissions/crowd_deny_preload_data_unittest.cc new file mode 100644 index 0000000..6d4276e --- /dev/null +++ b/chrome/browser/permissions/crowd_deny_preload_data_unittest.cc
@@ -0,0 +1,323 @@ +// Copyright 2019 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. + +#include "chrome/browser/permissions/crowd_deny_preload_data.h" + +#include "base/files/file_util.h" +#include "base/files/scoped_temp_dir.h" +#include "base/numerics/safe_conversions.h" +#include "base/strings/string_piece.h" +#include "base/test/task_environment.h" +#include "chrome/browser/permissions/crowd_deny.pb.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" +#include "url/origin.h" + +namespace { + +constexpr char kTestDomainAlpha[] = "alpha.com"; +constexpr char kTestDomainBeta[] = "beta.com"; +constexpr char kTestDomainGamma[] = "gamma.com"; +constexpr char kTestDomainDelta[] = "delta.com"; +constexpr char kTestDomainEpsilon[] = "epsilon.com"; + +constexpr char kTestOriginAlpha[] = "https://alpha.com"; +constexpr char kTestOriginBeta[] = "https://beta.com"; +constexpr char kTestOriginGamma[] = "https://gamma.com"; +constexpr char kTestOriginDelta[] = "https://delta.com"; +constexpr char kTestOriginEpsilon[] = "https://epsilon.com"; + +constexpr const char* kAllTestingOrigins[] = { + kTestOriginAlpha, kTestOriginBeta, kTestOriginGamma, kTestOriginDelta, + kTestOriginEpsilon}; + +} // namespace + +class CrowdDenyPreloadDataTest : public testing::Test { + public: + using SiteReputation = chrome_browser_crowd_deny::SiteReputation; + + CrowdDenyPreloadDataTest() {} + ~CrowdDenyPreloadDataTest() override = default; + + protected: + void SetUp() override { ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); } + + base::test::TaskEnvironment* task_environment() { return &task_environment_; } + + base::FilePath GetPathInTempDir( + base::FilePath::StringPieceType filename) const { + return scoped_temp_dir_.GetPath().Append(filename); + } + + void SerializeTestRawData(base::StringPiece raw_data, base::FilePath path) { + const int bytes_to_write = base::checked_cast<int>(raw_data.size()); + ASSERT_EQ(bytes_to_write, + base::WriteFile(path, raw_data.data(), bytes_to_write)); + } + + void SerializeTestPreloadData( + chrome_browser_crowd_deny::PreloadData preload_data, + base::FilePath path) { + std::string binary_preload_data; + ASSERT_TRUE(preload_data.SerializeToString(&binary_preload_data)); + ASSERT_NO_FATAL_FAILURE(SerializeTestRawData(binary_preload_data, path)); + } + + void LoadTestDataAndWait(base::FilePath path) { + CrowdDenyPreloadData::GetInstance()->LoadFromDisk(path); + task_environment()->RunUntilIdle(); + } + + void SerializeAndLoadTestData( + chrome_browser_crowd_deny::PreloadData test_data) { + const base::FilePath temp_path = + GetPathInTempDir(FILE_PATH_LITERAL("Preload Data")); + ASSERT_NO_FATAL_FAILURE( + SerializeTestPreloadData(std::move(test_data), temp_path)); + LoadTestDataAndWait(temp_path); + } + + void SerializeAndLoadCannedTestData() { + chrome_browser_crowd_deny::PreloadData test_data; + + auto* alpha_site_reputation = test_data.add_site_reputations(); + alpha_site_reputation->set_domain(kTestDomainAlpha); + alpha_site_reputation->set_notification_ux_quality(SiteReputation::UNKNOWN); + + auto* beta_site_reputation = test_data.add_site_reputations(); + beta_site_reputation->set_domain(kTestDomainBeta); + beta_site_reputation->set_notification_ux_quality( + SiteReputation::ACCEPTABLE); + + auto* gamma_site_reputation = test_data.add_site_reputations(); + gamma_site_reputation->set_domain(kTestDomainGamma); + gamma_site_reputation->set_notification_ux_quality( + SiteReputation::UNSOLICITED_PROMPTS); + + auto* delta_site_reputation = test_data.add_site_reputations(); + delta_site_reputation->set_domain(kTestDomainDelta); + // No |notification_ux_quality| field. + + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadTestData(std::move(test_data))); + } + + void ExpectEmptyPreloadData() { + for (const char* origin_string : kAllTestingOrigins) { + SCOPED_TRACE(origin_string); + EXPECT_FALSE( + CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(origin_string)))); + } + } + + private: + base::test::TaskEnvironment task_environment_; + base::ScopedTempDir scoped_temp_dir_; + + DISALLOW_COPY_AND_ASSIGN(CrowdDenyPreloadDataTest); +}; + +TEST_F(CrowdDenyPreloadDataTest, NoData) { + ExpectEmptyPreloadData(); +} + +TEST_F(CrowdDenyPreloadDataTest, MissingFile) { + LoadTestDataAndWait(GetPathInTempDir(FILE_PATH_LITERAL("NonExistentFile"))); + ExpectEmptyPreloadData(); +} + +TEST_F(CrowdDenyPreloadDataTest, EmptyData) { + const base::FilePath empty_file_path = + GetPathInTempDir(FILE_PATH_LITERAL("EmptyFile")); + SerializeTestRawData(base::StringPiece(), empty_file_path); + LoadTestDataAndWait(empty_file_path); + ExpectEmptyPreloadData(); +} + +TEST_F(CrowdDenyPreloadDataTest, BadData) { + const base::FilePath bad_data_path = + GetPathInTempDir(FILE_PATH_LITERAL("BadFile")); + SerializeTestRawData("This is not a proto.", bad_data_path); + LoadTestDataAndWait(bad_data_path); + ExpectEmptyPreloadData(); +} + +TEST_F(CrowdDenyPreloadDataTest, NotificationUserExperienceQuality) { + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + + const auto* data = + CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginAlpha))); + ASSERT_TRUE(data); + EXPECT_EQ(kTestDomainAlpha, data->domain()); + EXPECT_EQ(SiteReputation::UNKNOWN, data->notification_ux_quality()); + + data = CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginBeta))); + ASSERT_TRUE(data); + EXPECT_EQ(kTestDomainBeta, data->domain()); + EXPECT_EQ(SiteReputation::ACCEPTABLE, data->notification_ux_quality()); + + data = CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginGamma))); + ASSERT_TRUE(data); + EXPECT_EQ(kTestDomainGamma, data->domain()); + EXPECT_EQ(SiteReputation::UNSOLICITED_PROMPTS, + data->notification_ux_quality()); + + data = CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginDelta))); + ASSERT_TRUE(data); + EXPECT_EQ(kTestDomainDelta, data->domain()); + EXPECT_EQ(SiteReputation::UNKNOWN, data->notification_ux_quality()); + + data = CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginEpsilon))); + EXPECT_FALSE(data); +} + +TEST_F(CrowdDenyPreloadDataTest, GetReputationReturnsNullForNonHttpsOrigins) { + const char* kNonHttpsOrigins[] = { + "http://alpha.com", + "wss://alpha.com", + "ftp://alpha.com", + "file:///alpha.com", + }; + + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + EXPECT_TRUE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginAlpha)))); + + for (const char* non_https_origin : kNonHttpsOrigins) { + SCOPED_TRACE(non_https_origin); + EXPECT_FALSE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(non_https_origin)))); + } +} + +TEST_F(CrowdDenyPreloadDataTest, GetReputationIgnoresPort) { + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + + EXPECT_TRUE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL("https://alpha.com:443")))); + EXPECT_TRUE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL("https://alpha.com:1234")))); +} + +TEST_F(CrowdDenyPreloadDataTest, Update) { + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + + // Prepare and load an updated payload version, which updates the entry for + // `delta.com`, adds an entry for `epsilon.com`, and removes all others. + chrome_browser_crowd_deny::PreloadData test_data_v2; + + auto* delta_site_reputation = test_data_v2.add_site_reputations(); + delta_site_reputation->set_domain(kTestDomainDelta); + delta_site_reputation->set_notification_ux_quality( + SiteReputation::UNSOLICITED_PROMPTS); + + auto* epsilon_site_reputation = test_data_v2.add_site_reputations(); + epsilon_site_reputation->set_domain(kTestDomainEpsilon); + epsilon_site_reputation->set_notification_ux_quality( + SiteReputation::ACCEPTABLE); + + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadTestData(std::move(test_data_v2))); + + // Check that the updated preload data is visible. + EXPECT_FALSE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginAlpha)))); + EXPECT_FALSE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginBeta)))); + EXPECT_FALSE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginGamma)))); + + const auto* data = + CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginDelta))); + ASSERT_TRUE(data); + EXPECT_EQ(kTestDomainDelta, data->domain()); + EXPECT_EQ(SiteReputation::UNSOLICITED_PROMPTS, + data->notification_ux_quality()); + + data = CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginEpsilon))); + ASSERT_TRUE(data); + EXPECT_EQ(kTestDomainEpsilon, data->domain()); + EXPECT_EQ(SiteReputation::ACCEPTABLE, data->notification_ux_quality()); +} + +TEST_F(CrowdDenyPreloadDataTest, UpdateToMissingFileWipesInMemoryState) { + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + + LoadTestDataAndWait(GetPathInTempDir(FILE_PATH_LITERAL("NonExistentFile"))); + ExpectEmptyPreloadData(); +} + +TEST_F(CrowdDenyPreloadDataTest, UpdateToEmptyFileWipesInMemoryState) { + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + + const base::FilePath empty_file_path = + GetPathInTempDir(FILE_PATH_LITERAL("EmptyFile")); + SerializeTestRawData(base::StringPiece(), empty_file_path); + LoadTestDataAndWait(empty_file_path); + ExpectEmptyPreloadData(); +} + +TEST_F(CrowdDenyPreloadDataTest, UpdateToBadFileWipesInMemoryState) { + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + + const base::FilePath bad_data_path = + GetPathInTempDir(FILE_PATH_LITERAL("BadFile")); + SerializeTestRawData("This is not a proto.", bad_data_path); + LoadTestDataAndWait(bad_data_path); + ExpectEmptyPreloadData(); +} + +// During start-up congestion, it is possible that a new version of the +// component becomes available while the old version is pending being loaded. +// Ensure that when things settle down, the last version loaded will prevail, +// and nothing explodes on the way. +TEST_F(CrowdDenyPreloadDataTest, LastOneSurvivesFromUpdatesInQuickSuccession) { + ASSERT_NO_FATAL_FAILURE(SerializeAndLoadCannedTestData()); + + // Prepare and load two updated versions, each twice, in a quick success. + chrome_browser_crowd_deny::PreloadData test_data_v2; + auto* delta_site_reputation = test_data_v2.add_site_reputations(); + delta_site_reputation->set_domain(kTestDomainDelta); + + chrome_browser_crowd_deny::PreloadData test_data_v3; + auto* epsilon_site_reputation = test_data_v3.add_site_reputations(); + epsilon_site_reputation->set_domain(kTestDomainEpsilon); + epsilon_site_reputation->set_notification_ux_quality( + SiteReputation::ACCEPTABLE); + + const base::FilePath data_path_v2 = + GetPathInTempDir(FILE_PATH_LITERAL("DataV2")); + const base::FilePath data_path_v3 = + GetPathInTempDir(FILE_PATH_LITERAL("DataV3")); + SerializeTestPreloadData(std::move(test_data_v2), data_path_v2); + SerializeTestPreloadData(std::move(test_data_v3), data_path_v3); + + // Trigger three loads without pumping the message loop. + // + // TODO(crbug.com/1028642): Think about making this test stronger. Even if the + // ordering were random, given the generous retry policy in continuous build, + // the test would still pass most of the time. + CrowdDenyPreloadData::GetInstance()->LoadFromDisk(data_path_v2); + CrowdDenyPreloadData::GetInstance()->LoadFromDisk(data_path_v3); + task_environment()->RunUntilIdle(); + + // Expect the new version to have become visible. + const auto* data = + CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginEpsilon))); + ASSERT_TRUE(data); + EXPECT_EQ(kTestDomainEpsilon, data->domain()); + EXPECT_EQ(SiteReputation::ACCEPTABLE, data->notification_ux_quality()); + + EXPECT_FALSE(CrowdDenyPreloadData::GetInstance()->GetReputationDataForSite( + url::Origin::Create(GURL(kTestOriginDelta)))); +}
diff --git a/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc b/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc index e56a2f5..de84cab 100644 --- a/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc +++ b/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc
@@ -48,12 +48,16 @@ void CheckOrigin(const url::Origin& origin) { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + + // Start the timer before the call to CheckApiBlacklistUrl(), as it may + // call back into OnCheckApiBlacklistUrlResult() synchronously. + timeout_.Start(FROM_HERE, kSafeBrowsingCheckTimeout, this, + &SafeBrowsingClient::OnTimeout); + if (!database_manager_->IsSupported() || database_manager_->CheckApiBlacklistUrl(origin.GetURL(), this)) { + timeout_.AbandonAndStop(); SendResultToHandler(Verdict::kAcceptable); - } else { - timeout_.Start(FROM_HERE, kSafeBrowsingCheckTimeout, this, - &SafeBrowsingClient::OnTimeout); } } @@ -102,15 +106,18 @@ const url::Origin& origin, VerdictCallback callback) : callback_(std::move(callback)) { - client_.reset(new SafeBrowsingClient(database_manager, - weak_factory_.GetWeakPtr(), - base::SequencedTaskRunnerHandle::Get())); + client_ = std::make_unique<SafeBrowsingClient>( + database_manager, weak_factory_.GetWeakPtr(), + base::SequencedTaskRunnerHandle::Get()); base::PostTask(FROM_HERE, {content::BrowserThread::IO}, base::BindOnce(&SafeBrowsingClient::CheckOrigin, base::Unretained(client_.get()), origin)); } -CrowdDenySafeBrowsingRequest::~CrowdDenySafeBrowsingRequest() = default; +CrowdDenySafeBrowsingRequest::~CrowdDenySafeBrowsingRequest() { + content::BrowserThread::DeleteSoon(content::BrowserThread::IO, FROM_HERE, + client_.release()); +} void CrowdDenySafeBrowsingRequest::OnReceivedResult(Verdict verdict) { DCHECK(callback_);
diff --git a/chrome/browser/permissions/crowd_deny_safe_browsing_request.h b/chrome/browser/permissions/crowd_deny_safe_browsing_request.h index b68fb58..02b5c7f 100644 --- a/chrome/browser/permissions/crowd_deny_safe_browsing_request.h +++ b/chrome/browser/permissions/crowd_deny_safe_browsing_request.h
@@ -57,9 +57,8 @@ void OnReceivedResult(Verdict verdict); // The client interfacing with Safe Browsing. Created on |this| thread, but - // used on the IO thread for the rest of its life. - std::unique_ptr<SafeBrowsingClient, content::BrowserThread::DeleteOnIOThread> - client_; + // used on the IO thread for the rest of its life and destroyed there. + std::unique_ptr<SafeBrowsingClient> client_; VerdictCallback callback_; base::WeakPtrFactory<CrowdDenySafeBrowsingRequest> weak_factory_{this};
diff --git a/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc b/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc new file mode 100644 index 0000000..bf9a8a22 --- /dev/null +++ b/chrome/browser/permissions/crowd_deny_safe_browsing_request_unittest.cc
@@ -0,0 +1,235 @@ +// Copyright 2017 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. + +#include "chrome/browser/permissions/crowd_deny_safe_browsing_request.h" + +#include "base/logging.h" +#include "base/macros.h" +#include "base/memory/scoped_refptr.h" +#include "base/task/post_task.h" +#include "base/test/mock_callback.h" +#include "components/safe_browsing/db/database_manager.h" +#include "components/safe_browsing/db/test_database_manager.h" +#include "content/public/test/browser_task_environment.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "url/gurl.h" +#include "url/origin.h" + +namespace { + +constexpr char kTestOriginFoo[] = "https://foo.com"; +constexpr char kTestOriginBar[] = "https://bar.com"; + +class FakeSafeBrowsingDatabaseManager + : public safe_browsing::TestSafeBrowsingDatabaseManager { + public: + FakeSafeBrowsingDatabaseManager() = default; + + void SetSimulatedMetadataForUrl( + const GURL& url, + const safe_browsing::ThreatMetadata& metadata) { + url_to_simulated_threat_metadata_.emplace(url, metadata); + } + + void RemoveAllBlacklistedUrls() { url_to_simulated_threat_metadata_.clear(); } + + void set_simulate_timeout(bool simulate_timeout) { + simulate_timeout_ = simulate_timeout; + } + + void set_simulate_synchronous_result(bool simulate_synchronous_result) { + simulate_synchronous_result_ = simulate_synchronous_result; + } + + protected: + ~FakeSafeBrowsingDatabaseManager() override { + EXPECT_THAT(pending_clients_, testing::IsEmpty()); + } + + safe_browsing::ThreatMetadata GetSimulatedMetadataOrSafe(const GURL& url) { + auto it = url_to_simulated_threat_metadata_.find(url); + return it != url_to_simulated_threat_metadata_.end() + ? it->second + : safe_browsing::ThreatMetadata(); + } + + // safe_browsing::TestSafeBrowsingDatabaseManager: + bool CheckApiBlacklistUrl(const GURL& url, Client* client) override { + if (simulate_synchronous_result_) + return true; + + if (simulate_timeout_) { + EXPECT_THAT(pending_clients_, testing::Not(testing::Contains(client))); + pending_clients_.insert(client); + } else { + auto result = GetSimulatedMetadataOrSafe(url); + client->OnCheckApiBlacklistUrlResult(url, std::move(result)); + } + return false; + } + + bool CancelApiCheck(Client* client) override { + EXPECT_THAT(pending_clients_, testing::Contains(client)); + pending_clients_.erase(client); + return true; + } + + bool IsSupported() const override { return true; } + bool ChecksAreAlwaysAsync() const override { return false; } + bool CanCheckResourceType( + content::ResourceType /* resource_type */) const override { + NOTREACHED(); + return true; + } + + safe_browsing::ThreatSource GetThreatSource() const override { + NOTREACHED(); + return safe_browsing::ThreatSource::LOCAL_PVER4; + } + + bool CheckExtensionIDs(const std::set<std::string>& extension_ids, + Client* client) override { + NOTREACHED(); + return true; + } + + private: + void OnCheckUrlForSubresourceFilterComplete(Client* client, const GURL& url); + + std::set<Client*> pending_clients_; + std::map<GURL, safe_browsing::ThreatMetadata> + url_to_simulated_threat_metadata_; + bool simulate_timeout_ = false; + bool simulate_synchronous_result_ = false; + + base::WeakPtrFactory<FakeSafeBrowsingDatabaseManager> weak_factory_{this}; + + DISALLOW_COPY_AND_ASSIGN(FakeSafeBrowsingDatabaseManager); +}; + +} // namespace + +class CrowdDenySafeBrowsingRequestTest : public testing::Test { + public: + using Verdict = CrowdDenySafeBrowsingRequest::Verdict; + + CrowdDenySafeBrowsingRequestTest() + : fake_database_manager_( + base::MakeRefCounted<FakeSafeBrowsingDatabaseManager>()) {} + ~CrowdDenySafeBrowsingRequestTest() override = default; + + protected: + content::BrowserTaskEnvironment* task_environment() { + return &task_environment_; + } + + FakeSafeBrowsingDatabaseManager* fake_database_manager() { + return fake_database_manager_.get(); + } + + void StartRequestForOriginAndExpectVerdict(const url::Origin& origin, + Verdict expected_verdict) { + base::MockOnceCallback<void(Verdict)> mock_callback_receiver; + CrowdDenySafeBrowsingRequest request(fake_database_manager(), origin, + mock_callback_receiver.Get()); + EXPECT_CALL(mock_callback_receiver, Run(expected_verdict)); + task_environment()->RunUntilIdle(); + } + + private: + content::BrowserTaskEnvironment task_environment_{ + base::test::TaskEnvironment::TimeSource::MOCK_TIME}; + + scoped_refptr<FakeSafeBrowsingDatabaseManager> fake_database_manager_; + + DISALLOW_COPY_AND_ASSIGN(CrowdDenySafeBrowsingRequestTest); +}; + +TEST_F(CrowdDenySafeBrowsingRequestTest, Acceptable_SynchronousCompletion) { + fake_database_manager()->set_simulate_synchronous_result(true); + StartRequestForOriginAndExpectVerdict( + url::Origin::Create(GURL(kTestOriginFoo)), Verdict::kAcceptable); +} + +TEST_F(CrowdDenySafeBrowsingRequestTest, Acceptable_UnavailableMetaData) { + StartRequestForOriginAndExpectVerdict( + url::Origin::Create(GURL(kTestOriginFoo)), Verdict::kAcceptable); +} + +TEST_F(CrowdDenySafeBrowsingRequestTest, Acceptable_UnknownAPIName) { + const GURL kTestURL(kTestOriginFoo); + + safe_browsing::ThreatMetadata test_metadata; + test_metadata.api_permissions.emplace(""); + test_metadata.api_permissions.emplace("Stuff"); + test_metadata.api_permissions.emplace("NOTIFICATION"); // Singular. + test_metadata.api_permissions.emplace("notifications"); // Lowercase. + fake_database_manager()->SetSimulatedMetadataForUrl(kTestURL, test_metadata); + + StartRequestForOriginAndExpectVerdict(url::Origin::Create(kTestURL), + Verdict::kAcceptable); +} + +TEST_F(CrowdDenySafeBrowsingRequestTest, Spammy) { + const GURL kTestURL(kTestOriginFoo); + + safe_browsing::ThreatMetadata test_metadata; + test_metadata.api_permissions.emplace("BANANAS"); + test_metadata.api_permissions.emplace("NOTIFICATIONS"); + test_metadata.api_permissions.emplace("ORANGES"); + fake_database_manager()->SetSimulatedMetadataForUrl(kTestURL, test_metadata); + + StartRequestForOriginAndExpectVerdict( + url::Origin::Create(kTestURL), + Verdict::kKnownToShowUnsolicitedNotificationPermissionRequests); + StartRequestForOriginAndExpectVerdict( + url::Origin::Create(GURL(kTestOriginBar)), Verdict::kAcceptable); +} + +TEST_F(CrowdDenySafeBrowsingRequestTest, Timeout) { + fake_database_manager()->set_simulate_timeout(true); + + base::MockOnceCallback<void(Verdict)> mock_callback_receiver; + CrowdDenySafeBrowsingRequest request( + fake_database_manager(), url::Origin::Create(GURL(kTestOriginFoo)), + mock_callback_receiver.Get()); + + // Verify the request doesn't time out unreasonably fast. + EXPECT_CALL(mock_callback_receiver, Run(testing::_)).Times(0); + task_environment()->FastForwardBy(base::TimeDelta::FromMilliseconds(100)); + testing::Mock::VerifyAndClearExpectations(&mock_callback_receiver); + + // But that it eventually does. + EXPECT_CALL(mock_callback_receiver, Run(Verdict::kAcceptable)); + task_environment()->FastForwardUntilNoTasksRemain(); +} + +TEST_F(CrowdDenySafeBrowsingRequestTest, AbandonedImmediately) { + fake_database_manager()->set_simulate_synchronous_result(true); + + base::MockOnceCallback<void(Verdict)> mock_callback_receiver; + EXPECT_CALL(mock_callback_receiver, Run(testing::_)).Times(0); + + { + CrowdDenySafeBrowsingRequest request( + fake_database_manager(), url::Origin::Create(GURL(kTestOriginFoo)), + mock_callback_receiver.Get()); + } + + task_environment()->RunUntilIdle(); +} + +TEST_F(CrowdDenySafeBrowsingRequestTest, AbandonedWhileCheckPending) { + fake_database_manager()->set_simulate_timeout(true); + + base::MockOnceCallback<void(Verdict)> mock_callback_receiver; + EXPECT_CALL(mock_callback_receiver, Run(testing::_)).Times(0); + + CrowdDenySafeBrowsingRequest request( + fake_database_manager(), url::Origin::Create(GURL(kTestOriginFoo)), + mock_callback_receiver.Get()); + + task_environment()->FastForwardBy(base::TimeDelta::FromMilliseconds(100)); +}
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc index 25f7368..e0b19ef 100644 --- a/chrome/browser/permissions/permission_context_base.cc +++ b/chrome/browser/permissions/permission_context_base.cc
@@ -32,7 +32,9 @@ #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/prefs/pref_service.h" #include "components/variations/variations_associated_data.h" +#include "content/public/browser/back_forward_cache.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/global_routing_id.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" @@ -190,6 +192,15 @@ return; } + // Make sure we do not show a UI for cached documents + if (content::BackForwardCache::EvictIfCached( + content::GlobalFrameRoutingId(id.render_process_id(), + id.render_frame_id()), + "PermissionContextBase::RequestPermission")) { + std::move(callback).Run(result.content_setting); + return; + } + // We are going to show a prompt now. PermissionUmaUtil::PermissionRequested(content_settings_type_, requesting_origin);
diff --git a/chrome/browser/policy/browser_dm_token_storage_unittest.cc b/chrome/browser/policy/browser_dm_token_storage_unittest.cc index c86b5534..59efde0 100644 --- a/chrome/browser/policy/browser_dm_token_storage_unittest.cc +++ b/chrome/browser/policy/browser_dm_token_storage_unittest.cc
@@ -56,21 +56,12 @@ struct StoreAndRetrieveTestParams { public: StoreAndRetrieveTestParams(const std::string& dm_token_to_store, - const std::string& expected_retrieved_dm_token, - bool expect_valid, - bool expect_invalid, - bool expect_empty) + const DMToken& expected_retrieved_dm_token) : dm_token_to_store(dm_token_to_store), - expected_retrieved_dm_token(expected_retrieved_dm_token), - expect_valid(expect_valid), - expect_invalid(expect_invalid), - expect_empty(expect_empty) {} + expected_retrieved_dm_token(expected_retrieved_dm_token) {} std::string dm_token_to_store; - std::string expected_retrieved_dm_token; - bool expect_valid; - bool expect_invalid; - bool expect_empty; + const DMToken expected_retrieved_dm_token; }; class BrowserDMTokenStorageStoreAndRetrieveTest @@ -82,6 +73,7 @@ kEnrollmentToken1, GetParam().dm_token_to_store, false) {} + DMToken GetExpectedToken() { return GetParam().expected_retrieved_dm_token; } }; } // namespace @@ -90,10 +82,15 @@ BrowserDMTokenStorageStoreAndRetrieveTest, BrowserDMTokenStorageStoreAndRetrieveTest, testing::Values( - StoreAndRetrieveTestParams(kDMToken1, kDMToken1, true, false, false), - StoreAndRetrieveTestParams(kDMToken2, kDMToken2, true, false, false), - StoreAndRetrieveTestParams("INVALID_DM_TOKEN", "", false, true, false), - StoreAndRetrieveTestParams("", "", false, false, true))); + StoreAndRetrieveTestParams( + kDMToken1, + DMToken::CreateValidTokenForTesting(kDMToken1)), + StoreAndRetrieveTestParams( + kDMToken2, + DMToken::CreateValidTokenForTesting(kDMToken2)), + StoreAndRetrieveTestParams("INVALID_DM_TOKEN", + DMToken::CreateInvalidTokenForTesting()), + StoreAndRetrieveTestParams("", DMToken::CreateEmptyTokenForTesting()))); TEST_F(BrowserDMTokenStorageTest, RetrieveClientId) { EXPECT_EQ(kClientId1, storage_.RetrieveClientId()); @@ -115,17 +112,21 @@ TEST_P(BrowserDMTokenStorageStoreAndRetrieveTest, StoreDMToken) { storage_.SetDMToken(GetParam().dm_token_to_store); DMToken dm_token = storage_.RetrieveDMToken(); - if (GetParam().expect_valid) { - EXPECT_EQ(GetParam().expected_retrieved_dm_token, dm_token.value()); + if (GetExpectedToken().is_valid()) { + EXPECT_EQ(GetExpectedToken().value(), dm_token.value()); } - EXPECT_EQ(GetParam().expect_valid, dm_token.is_valid()); - EXPECT_EQ(GetParam().expect_invalid, dm_token.is_invalid()); - EXPECT_EQ(GetParam().expect_empty, dm_token.is_empty()); + EXPECT_EQ(GetExpectedToken().is_valid(), dm_token.is_valid()); + EXPECT_EQ(GetExpectedToken().is_invalid(), dm_token.is_invalid()); + EXPECT_EQ(GetExpectedToken().is_empty(), dm_token.is_empty()); // The DM token should be cached in memory and not read from the system again. storage_.SetDMToken("not_saved"); - if (GetParam().expect_valid) { - EXPECT_EQ(GetParam().expected_retrieved_dm_token, dm_token.value()); + dm_token = storage_.RetrieveDMToken(); + EXPECT_EQ(GetExpectedToken().is_valid(), dm_token.is_valid()); + EXPECT_EQ(GetExpectedToken().is_invalid(), dm_token.is_invalid()); + EXPECT_EQ(GetExpectedToken().is_empty(), dm_token.is_empty()); + if (GetExpectedToken().is_valid()) { + EXPECT_EQ(GetExpectedToken().value(), dm_token.value()); } } @@ -153,12 +154,12 @@ TEST_P(BrowserDMTokenStorageStoreAndRetrieveTest, RetrieveDMToken) { DMToken dm_token = storage_.RetrieveDMToken(); - if (GetParam().expect_valid) { - EXPECT_EQ(GetParam().expected_retrieved_dm_token, dm_token.value()); + if (GetExpectedToken().is_valid()) { + EXPECT_EQ(GetExpectedToken().value(), dm_token.value()); } - EXPECT_EQ(GetParam().expect_valid, dm_token.is_valid()); - EXPECT_EQ(GetParam().expect_invalid, dm_token.is_invalid()); - EXPECT_EQ(GetParam().expect_empty, dm_token.is_empty()); + EXPECT_EQ(GetExpectedToken().is_valid(), dm_token.is_valid()); + EXPECT_EQ(GetExpectedToken().is_invalid(), dm_token.is_invalid()); + EXPECT_EQ(GetExpectedToken().is_empty(), dm_token.is_empty()); } TEST_F(BrowserDMTokenStorageTest, ShouldDisplayErrorMessageOnFailure) {
diff --git a/chrome/browser/policy/extension_policy_browsertest.cc b/chrome/browser/policy/extension_policy_browsertest.cc index 7df3ad1..d95d7b2 100644 --- a/chrome/browser/policy/extension_policy_browsertest.cc +++ b/chrome/browser/policy/extension_policy_browsertest.cc
@@ -632,7 +632,7 @@ }; class MockedInstallationReporterObserver - : public extensions::InstallationReporter::TestObserver { + : public extensions::InstallationReporter::Observer { public: explicit MockedInstallationReporterObserver( const content::BrowserContext* context) @@ -642,7 +642,7 @@ MOCK_METHOD1(ExtensionStageChanged, void(extensions::InstallationReporter::Stage)); - void OnExtensionDataChanged( + void OnExtensionDataChangedForTesting( const extensions::ExtensionId& id, const content::BrowserContext* context, const extensions::InstallationReporter::InstallationData& data) override { @@ -727,10 +727,13 @@ reporter_observer, ExtensionStageChanged(extensions::InstallationReporter::Stage::COMPLETE)) .InSequence(sequence); - extensions::InstallationReporter::SetTestObserver(&reporter_observer); + + extensions::InstallationReporter* installation_reporter = + extensions::InstallationReporter::Get(browser()->profile()); + installation_reporter->AddObserver(&reporter_observer); UpdateProviderPolicy(policies); observer.WaitForExtensionWillBeInstalled(); - extensions::InstallationReporter::SetTestObserver(nullptr); + installation_reporter->RemoveObserver(&reporter_observer); // Note: Cannot check that the notification details match the expected // exception, since the details object has already been freed prior to // the completion of observer.WaitForExtensionWillBeInstalled().
diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc index 5db2d80f..083e9e88 100644 --- a/chrome/browser/push_messaging/push_messaging_browsertest.cc +++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -2228,7 +2228,7 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; push_service()->SetContentSettingChangedCallbackForTesting( - message_loop_runner->QuitClosure()); + base::BarrierClosure(1, message_loop_runner->QuitClosure())); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->ClearSettingsForOneType(ContentSettingsType::NOTIFICATIONS); @@ -2263,7 +2263,7 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; push_service()->SetContentSettingChangedCallbackForTesting( - message_loop_runner->QuitClosure()); + base::BarrierClosure(1, message_loop_runner->QuitClosure())); GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) @@ -2301,7 +2301,7 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; push_service()->SetContentSettingChangedCallbackForTesting( - message_loop_runner->QuitClosure()); + base::BarrierClosure(1, message_loop_runner->QuitClosure())); GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) @@ -2339,7 +2339,7 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; push_service()->SetContentSettingChangedCallbackForTesting( - message_loop_runner->QuitClosure()); + base::BarrierClosure(1, message_loop_runner->QuitClosure())); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) ->ClearSettingsForOneType(ContentSettingsType::NOTIFICATIONS); @@ -2374,7 +2374,7 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; push_service()->SetContentSettingChangedCallbackForTesting( - message_loop_runner->QuitClosure()); + base::BarrierClosure(1, message_loop_runner->QuitClosure())); GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile()) @@ -2412,7 +2412,7 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; push_service()->SetContentSettingChangedCallbackForTesting( - message_loop_runner->QuitClosure()); + base::BarrierClosure(1, message_loop_runner->QuitClosure())); GURL origin = https_server()->GetURL("/").GetOrigin(); HostContentSettingsMapFactory::GetForProfile(GetBrowser()->profile())
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc index 42cc603..b97c0e7 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
@@ -726,31 +726,33 @@ int64_t service_worker_registration_id, const std::string& sender_id, const std::string& subscription_id, - const SubscriptionInfoCallback& callback) { + SubscriptionInfoCallback callback) { PushMessagingAppIdentifier app_identifier = PushMessagingAppIdentifier::FindByServiceWorker( profile_, origin, service_worker_registration_id); if (app_identifier.is_null()) { - callback.Run(false /* is_valid */, GURL::EmptyGURL() /*endpoint*/, - std::vector<uint8_t>() /* p256dh */, - std::vector<uint8_t>() /* auth */); + std::move(callback).Run( + false /* is_valid */, GURL::EmptyGURL() /*endpoint*/, + std::vector<uint8_t>() /* p256dh */, std::vector<uint8_t>() /* auth */); return; } const GURL endpoint = CreateEndpoint(subscription_id); const std::string& app_id = app_identifier.app_id(); - base::Callback<void(bool)> validate_cb = base::Bind( - &PushMessagingServiceImpl::DidValidateSubscription, - weak_factory_.GetWeakPtr(), app_id, sender_id, endpoint, callback); + base::OnceCallback<void(bool)> validate_cb = + base::BindOnce(&PushMessagingServiceImpl::DidValidateSubscription, + weak_factory_.GetWeakPtr(), app_id, sender_id, endpoint, + std::move(callback)); if (PushMessagingAppIdentifier::UseInstanceID(app_id)) { GetInstanceIDDriver()->GetInstanceID(app_id)->ValidateToken( NormalizeSenderInfo(sender_id), kGCMScope, subscription_id, - validate_cb); + std::move(validate_cb)); } else { GetGCMDriver()->ValidateRegistration( - app_id, {NormalizeSenderInfo(sender_id)}, subscription_id, validate_cb); + app_id, {NormalizeSenderInfo(sender_id)}, subscription_id, + std::move(validate_cb)); } } @@ -758,31 +760,32 @@ const std::string& app_id, const std::string& sender_id, const GURL& endpoint, - const SubscriptionInfoCallback& callback, + SubscriptionInfoCallback callback, bool is_valid) { if (!is_valid) { - callback.Run(false /* is_valid */, GURL::EmptyGURL() /* endpoint */, - std::vector<uint8_t>() /* p256dh */, - std::vector<uint8_t>() /* auth */); + std::move(callback).Run( + false /* is_valid */, GURL::EmptyGURL() /* endpoint */, + std::vector<uint8_t>() /* p256dh */, std::vector<uint8_t>() /* auth */); return; } GetEncryptionInfoForAppId( app_id, sender_id, base::BindOnce(&PushMessagingServiceImpl::DidGetEncryptionInfo, - weak_factory_.GetWeakPtr(), endpoint, callback)); + weak_factory_.GetWeakPtr(), endpoint, + std::move(callback))); } void PushMessagingServiceImpl::DidGetEncryptionInfo( const GURL& endpoint, - const SubscriptionInfoCallback& callback, + SubscriptionInfoCallback callback, std::string p256dh, std::string auth_secret) const { // I/O errors might prevent the GCM Driver from retrieving a key-pair. bool is_valid = !p256dh.empty(); - callback.Run(is_valid, endpoint, - std::vector<uint8_t>(p256dh.begin(), p256dh.end()), - std::vector<uint8_t>(auth_secret.begin(), auth_secret.end())); + std::move(callback).Run( + is_valid, endpoint, std::vector<uint8_t>(p256dh.begin(), p256dh.end()), + std::vector<uint8_t>(auth_secret.begin(), auth_secret.end())); } // Unsubscribe methods ---------------------------------------------------------
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h index d84b5b3..514abf5 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.h +++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -105,7 +105,7 @@ int64_t service_worker_registration_id, const std::string& sender_id, const std::string& subscription_id, - const SubscriptionInfoCallback& callback) override; + SubscriptionInfoCallback callback) override; void Unsubscribe(blink::mojom::PushUnregistrationReason reason, const GURL& requesting_origin, int64_t service_worker_registration_id, @@ -199,11 +199,11 @@ void DidValidateSubscription(const std::string& app_id, const std::string& sender_id, const GURL& endpoint, - const SubscriptionInfoCallback& callback, + SubscriptionInfoCallback callback, bool is_valid); void DidGetEncryptionInfo(const GURL& endpoint, - const SubscriptionInfoCallback& callback, + SubscriptionInfoCallback callback, std::string p256dh, std::string auth_secret) const;
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 4472936..e4dee7a 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -60,11 +60,11 @@ #include "chrome/browser/send_tab_to_self/send_tab_to_self_desktop_util.h" #include "chrome/browser/send_tab_to_self/send_tab_to_self_util.h" #include "chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h" +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "chrome/browser/sharing/click_to_call/click_to_call_utils.h" #include "chrome/browser/sharing/features.h" #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_context_menu_observer.h" #include "chrome/browser/sharing/shared_clipboard/shared_clipboard_utils.h" -#include "chrome/browser/sharing/sharing_metrics.h" #include "chrome/browser/spellchecker/spellcheck_service.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "chrome/browser/translate/translate_service.h"
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn index 6c1dede..02c1ab7f 100644 --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn
@@ -463,6 +463,7 @@ "$root_gen_dir/chrome/usb_internals_resources.pak", "$root_gen_dir/chrome/webrtc_logs_resources.pak", "$root_gen_dir/components/sync_driver_resources.pak", + "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak", ] deps = [ @@ -471,6 +472,7 @@ "//chrome/browser/resources/omnibox:resources", "//chrome/browser/resources/usb_internals:resources", "//components/sync/driver:resources", + "//content/browser/resources/media:media_internals_resources", "//content/browser/webrtc/resources", ] }
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 33c143d..fc14793 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -200,11 +200,8 @@ EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI)); report_ = serialized; - EXPECT_FALSE(threat_details_done_callback_.is_null()); - if (!threat_details_done_callback_.is_null()) { - threat_details_done_callback_.Run(); - threat_details_done_callback_ = base::Closure(); - } + ASSERT_TRUE(threat_details_done_callback_); + std::move(threat_details_done_callback_).Run(); threat_details_done_ = true; } @@ -217,10 +214,10 @@ bool hit_report_sent() { return hit_report_sent_; } - void set_threat_details_done_callback(const base::Closure& callback) { + void set_threat_details_done_callback(base::OnceClosure callback) { EXPECT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI)); - EXPECT_TRUE(threat_details_done_callback_.is_null()); - threat_details_done_callback_ = callback; + EXPECT_FALSE(threat_details_done_callback_); + threat_details_done_callback_ = std::move(callback); } std::string GetReport() { @@ -233,7 +230,7 @@ private: std::string report_; - base::Closure threat_details_done_callback_; + base::OnceClosure threat_details_done_callback_; bool threat_details_done_; bool hit_report_sent_; @@ -607,10 +604,10 @@ return InterstitialPage::GetInterstitialPage(contents) != nullptr; } - void SetReportSentCallback(const base::Closure& callback) { + void SetReportSentCallback(base::OnceClosure callback) { static_cast<FakeSafeBrowsingUIManager*>( factory_.test_safe_browsing_service()->ui_manager().get()) - ->set_threat_details_done_callback(callback); + ->set_threat_details_done_callback(std::move(callback)); } std::string GetReportSent() {
diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index 620f789..33ebff2ba2 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc
@@ -329,10 +329,9 @@ return data_string; } -void ServeBackgroundImageData( - const content::URLDataSource::GotDataCallback& callback, - std::string data_string) { - callback.Run(base::RefCountedString::TakeString(&data_string)); +void ServeBackgroundImageData(content::URLDataSource::GotDataCallback callback, + std::string data_string) { + std::move(callback).Run(base::RefCountedString::TakeString(&data_string)); } std::string GetLocalNtpPath() { @@ -665,8 +664,8 @@ // Get the cached logo. void GetCachedLogo(LogoService* service, - const content::URLDataSource::GotDataCallback& callback) { - StartGetLogo(service, callback, /*from_cache=*/true); + content::URLDataSource::GotDataCallback callback) { + StartGetLogo(service, std::move(callback), /*from_cache=*/true); } // Get the fresh logo corresponding to a previous request for a cached logo. @@ -679,13 +678,13 @@ // request, or perhaps one newer. void GetFreshLogo(LogoService* service, int requested_version, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { bool from_cache = (requested_version <= version_finished_); - StartGetLogo(service, callback, from_cache); + StartGetLogo(service, std::move(callback), from_cache); } private: - void OnLogoAvailable(const content::URLDataSource::GotDataCallback& callback, + void OnLogoAvailable(content::URLDataSource::GotDataCallback callback, LogoCallbackReason type, const base::Optional<EncodedLogo>& logo) { scoped_refptr<base::RefCountedString> response; @@ -714,21 +713,19 @@ base::JSONWriter::Write(*ddl, &js); js = "var ddl = " + js + ";"; response = base::RefCountedString::TakeString(&js); - callback.Run(response); + std::move(callback).Run(response); } - void OnCachedLogoAvailable( - const content::URLDataSource::GotDataCallback& callback, - LogoCallbackReason type, - const base::Optional<EncodedLogo>& logo) { - OnLogoAvailable(callback, type, logo); + void OnCachedLogoAvailable(content::URLDataSource::GotDataCallback callback, + LogoCallbackReason type, + const base::Optional<EncodedLogo>& logo) { + OnLogoAvailable(std::move(callback), type, logo); } - void OnFreshLogoAvailable( - const content::URLDataSource::GotDataCallback& callback, - LogoCallbackReason type, - const base::Optional<EncodedLogo>& logo) { - OnLogoAvailable(callback, type, logo); + void OnFreshLogoAvailable(content::URLDataSource::GotDataCallback callback, + LogoCallbackReason type, + const base::Optional<EncodedLogo>& logo) { + OnLogoAvailable(std::move(callback), type, logo); OnRequestCompleted(type, logo); } @@ -738,21 +735,21 @@ } void StartGetLogo(LogoService* service, - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, bool from_cache) { EncodedLogoCallback cached, fresh; LogoCallbacks callbacks; if (from_cache) { callbacks.on_cached_encoded_logo_available = base::BindOnce(&DesktopLogoObserver::OnCachedLogoAvailable, - weak_ptr_factory_.GetWeakPtr(), callback); + weak_ptr_factory_.GetWeakPtr(), std::move(callback)); callbacks.on_fresh_encoded_logo_available = base::BindOnce(&DesktopLogoObserver::OnRequestCompleted, weak_ptr_factory_.GetWeakPtr()); } else { callbacks.on_fresh_encoded_logo_available = base::BindOnce(&DesktopLogoObserver::OnFreshLogoAvailable, - weak_ptr_factory_.GetWeakPtr(), callback); + weak_ptr_factory_.GetWeakPtr(), std::move(callback)); } if (!observing()) { ++version_started_; @@ -826,7 +823,7 @@ void LocalNtpSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. @@ -834,12 +831,13 @@ std::string stripped_path = StripParameters(path); if (stripped_path == kConfigDataFilename) { std::string config_data_js = search_config_provider_->config_data_js(); - callback.Run(base::RefCountedString::TakeString(&config_data_js)); + std::move(callback).Run( + base::RefCountedString::TakeString(&config_data_js)); return; } if (stripped_path == kThemeCSSFilename) { std::string theme_css = GetThemeCSS(profile_); - callback.Run(base::RefCountedString::TakeString(&theme_css)); + std::move(callback).Run(base::RefCountedString::TakeString(&theme_css)); return; } @@ -849,24 +847,24 @@ {base::ThreadPool(), base::TaskPriority::USER_VISIBLE, base::MayBlock()}, base::BindOnce(&ReadBackgroundImageData, profile_->GetPath()), - base::BindOnce(&ServeBackgroundImageData, callback)); + base::BindOnce(&ServeBackgroundImageData, std::move(callback))); return; } if (stripped_path == kNtpBackgroundCollectionScriptFilename) { if (!ntp_background_service_) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } ntp_background_collections_requests_.emplace_back(base::TimeTicks::Now(), - callback); + std::move(callback)); ntp_background_service_->FetchCollectionInfo(); return; } if (stripped_path == kNtpBackgroundImageScriptFilename) { if (!ntp_background_service_) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } std::string collection_id_param; @@ -874,28 +872,28 @@ if (net::GetValueForKeyInQuery(path_url, "collection_id", &collection_id_param)) { ntp_background_image_info_requests_.emplace_back(base::TimeTicks::Now(), - callback); + std::move(callback)); ntp_background_service_->FetchCollectionImageInfo(collection_id_param); } else { - callback.Run(nullptr); + std::move(callback).Run(nullptr); } return; } if (stripped_path == kOneGoogleBarScriptFilename) { if (!one_google_bar_service_) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); } else { - ServeOneGoogleBarWhenAvailable(callback); + ServeOneGoogleBarWhenAvailable(std::move(callback)); } return; } if (stripped_path == kPromoScriptFilename) { if (!promo_service_) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); } else { - ServePromoWhenAvailable(callback); + ServePromoWhenAvailable(std::move(callback)); } return; } @@ -904,7 +902,7 @@ // refresh the data until the old data is used. if (stripped_path == kSearchSuggestionsScriptFilename) { if (!search_suggest_service_) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } @@ -914,11 +912,12 @@ if (one_google_bar_service_->language_code() != kEnUSLanguageCode) { std::string no_suggestions = "var searchSuggestions = {suggestionsHtml: ''}"; - callback.Run(base::RefCountedString::TakeString(&no_suggestions)); + std::move(callback).Run( + base::RefCountedString::TakeString(&no_suggestions)); return; } - ServeSearchSuggestionsIfAvailable(callback); + ServeSearchSuggestionsIfAvailable(std::move(callback)); pending_search_suggest_request_ = base::TimeTicks::Now(); search_suggest_service_->Refresh(); @@ -927,7 +926,7 @@ if (stripped_path == kDoodleScriptFilename) { if (!logo_service_) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } @@ -936,9 +935,9 @@ GURL url = GURL(chrome::kChromeSearchLocalNtpUrl).Resolve(path); if (net::GetValueForKeyInQuery(url, "v", &version_string) && base::StringToInt(version_string, &version)) { - logo_observer_->GetFreshLogo(logo_service_, version, callback); + logo_observer_->GetFreshLogo(logo_service_, version, std::move(callback)); } else { - logo_observer_->GetCachedLogo(logo_service_, callback); + logo_observer_->GetCachedLogo(logo_service_, std::move(callback)); } return; } @@ -1049,7 +1048,7 @@ ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); base::StringPiece html = bundle.GetRawDataResource(IDR_LOCAL_NTP_HTML); std::string replaced = ui::ReplaceTemplateExpressions(html, replacements); - callback.Run(base::RefCountedString::TakeString(&replaced)); + std::move(callback).Run(base::RefCountedString::TakeString(&replaced)); return; } @@ -1064,11 +1063,11 @@ scoped_refptr<base::RefCountedMemory> response( ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( kResources[i].identifier, scale_factor)); - callback.Run(response.get()); + std::move(callback).Run(response.get()); return; } } - callback.Run(nullptr); + std::move(callback).Run(nullptr); } std::string LocalNtpSource::GetMimeType(const std::string& path) { @@ -1149,8 +1148,8 @@ result = base::RefCountedString::TakeString(&js); base::TimeTicks now = base::TimeTicks::Now(); - for (const auto& request : ntp_background_collections_requests_) { - request.callback.Run(result); + for (auto& request : ntp_background_collections_requests_) { + std::move(request.callback).Run(result); base::TimeDelta delta = now - request.start_time; UMA_HISTOGRAM_MEDIUM_TIMES( "NewTabPage.BackgroundService.Collections.RequestLatency", delta); @@ -1187,8 +1186,8 @@ result = base::RefCountedString::TakeString(&js); base::TimeTicks now = base::TimeTicks::Now(); - for (const auto& request : ntp_background_image_info_requests_) { - request.callback.Run(result); + for (auto& request : ntp_background_image_info_requests_) { + std::move(request.callback).Run(result); base::TimeDelta delta = now - request.start_time; UMA_HISTOGRAM_MEDIUM_TIMES( "NewTabPage.BackgroundService.Images.RequestLatency", delta); @@ -1292,7 +1291,7 @@ } void LocalNtpSource::ServeSearchSuggestionsIfAvailable( - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { base::Optional<SearchSuggestData> data = search_suggest_service_->search_suggest_data(); @@ -1305,7 +1304,7 @@ base::JSONWriter::Write(*ConvertSearchSuggestDataToDict(data), &js); js = "var searchSuggestions = " + js + ";"; result = base::RefCountedString::TakeString(&js); - callback.Run(result); + std::move(callback).Run(result); } void LocalNtpSource::ServeOneGoogleBar( @@ -1331,22 +1330,22 @@ UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.OneGoogleBar.RequestLatency.Failure", delta); } - for (const auto& callback : one_google_bar_callbacks_) { - callback.Run(result); + for (auto& callback : one_google_bar_callbacks_) { + std::move(callback).Run(result); } pending_one_google_bar_request_ = base::nullopt; one_google_bar_callbacks_.clear(); } void LocalNtpSource::ServeOneGoogleBarWhenAvailable( - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { base::Optional<OneGoogleBarData> data = one_google_bar_service_->one_google_bar_data(); if (!pending_one_google_bar_request_.has_value()) { - callback.Run(GetOGBString(data)); + std::move(callback).Run(GetOGBString(data)); } else { - one_google_bar_callbacks_.emplace_back(callback); + one_google_bar_callbacks_.push_back(std::move(callback)); } } @@ -1376,21 +1375,21 @@ UMA_HISTOGRAM_MEDIUM_TIMES("NewTabPage.Promos.RequestLatency2.Failure", delta); } - for (const auto& callback : promo_callbacks_) { - callback.Run(result); + for (auto& callback : promo_callbacks_) { + std::move(callback).Run(result); } pending_promo_request_ = base::nullopt; promo_callbacks_.clear(); } void LocalNtpSource::ServePromoWhenAvailable( - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { base::Optional<PromoData> data = promo_service_->promo_data(); if (!pending_promo_request_.has_value()) { - callback.Run(GetPromoString(data)); + std::move(callback).Run(GetPromoString(data)); } else { - promo_callbacks_.emplace_back(callback); + promo_callbacks_.push_back(std::move(callback)); } } @@ -1407,10 +1406,12 @@ LocalNtpSource::NtpBackgroundRequest::NtpBackgroundRequest( base::TimeTicks start_time, - const content::URLDataSource::GotDataCallback& callback) - : start_time(start_time), callback(callback) {} + content::URLDataSource::GotDataCallback callback) + : start_time(start_time), callback(std::move(callback)) {} LocalNtpSource::NtpBackgroundRequest::NtpBackgroundRequest( - const NtpBackgroundRequest&) = default; + NtpBackgroundRequest&&) = default; +LocalNtpSource::NtpBackgroundRequest& LocalNtpSource::NtpBackgroundRequest:: +operator=(NtpBackgroundRequest&&) = default; LocalNtpSource::NtpBackgroundRequest::~NtpBackgroundRequest() = default;
diff --git a/chrome/browser/search/local_ntp_source.h b/chrome/browser/search/local_ntp_source.h index 765e28a..0d299a5 100644 --- a/chrome/browser/search/local_ntp_source.h +++ b/chrome/browser/search/local_ntp_source.h
@@ -59,10 +59,10 @@ class DesktopLogoObserver; struct NtpBackgroundRequest { - NtpBackgroundRequest( - base::TimeTicks start_time, - const content::URLDataSource::GotDataCallback& callback); - NtpBackgroundRequest(const NtpBackgroundRequest&); + NtpBackgroundRequest(base::TimeTicks start_time, + content::URLDataSource::GotDataCallback callback); + NtpBackgroundRequest(NtpBackgroundRequest&&); + NtpBackgroundRequest& operator=(NtpBackgroundRequest&&); ~NtpBackgroundRequest(); base::TimeTicks start_time; @@ -74,7 +74,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; bool AllowCaching() override; bool ShouldServiceRequest(const GURL& url, @@ -110,7 +110,7 @@ // is returned immediately, otherwise it is returned when it becomes available // in ServeOneGoogleBar. void ServeOneGoogleBarWhenAvailable( - const content::URLDataSource::GotDataCallback& callback); + content::URLDataSource::GotDataCallback callback); // Called when the promo data is available and serves |data| to any pending // requests from the NTP. @@ -119,12 +119,12 @@ // is returned immediately, otherwise it is returned when it becomes // available in ServePromo. void ServePromoWhenAvailable( - const content::URLDataSource::GotDataCallback& callback); + content::URLDataSource::GotDataCallback callback); // If suggestion data is available return it immediately, otherwise no search // suggestions will be shown on this NTP load. void ServeSearchSuggestionsIfAvailable( - const content::URLDataSource::GotDataCallback& callback); + content::URLDataSource::GotDataCallback callback); // Start requests for the promo and OGB. void InitiatePromoAndOGBRequests();
diff --git a/chrome/browser/search/most_visited_iframe_source.cc b/chrome/browser/search/most_visited_iframe_source.cc index 4d4314e..45792f5 100644 --- a/chrome/browser/search/most_visited_iframe_source.cc +++ b/chrome/browser/search/most_visited_iframe_source.cc
@@ -63,54 +63,55 @@ void MostVisitedIframeSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. const std::string path(url.path()); if (path == kSingleHTMLPath) { - SendResource(IDR_MOST_VISITED_SINGLE_HTML, callback); + SendResource(IDR_MOST_VISITED_SINGLE_HTML, std::move(callback)); } else if (path == kSingleCSSPath) { - SendResource(IDR_MOST_VISITED_SINGLE_CSS, callback); + SendResource(IDR_MOST_VISITED_SINGLE_CSS, std::move(callback)); } else if (path == kSingleJSPath) { - SendJSWithOrigin(IDR_MOST_VISITED_SINGLE_JS, wc_getter, callback); + SendJSWithOrigin(IDR_MOST_VISITED_SINGLE_JS, wc_getter, + std::move(callback)); } else if (path == kTitleHTMLPath) { - SendResource(IDR_MOST_VISITED_TITLE_HTML, callback); + SendResource(IDR_MOST_VISITED_TITLE_HTML, std::move(callback)); } else if (path == kTitleCSSPath) { - SendResource(IDR_MOST_VISITED_TITLE_CSS, callback); + SendResource(IDR_MOST_VISITED_TITLE_CSS, std::move(callback)); } else if (path == kTitleJSPath) { - SendResource(IDR_MOST_VISITED_TITLE_JS, callback); + SendResource(IDR_MOST_VISITED_TITLE_JS, std::move(callback)); } else if (path == kUtilJSPath) { - SendJSWithOrigin(IDR_MOST_VISITED_UTIL_JS, wc_getter, callback); + SendJSWithOrigin(IDR_MOST_VISITED_UTIL_JS, wc_getter, std::move(callback)); } else if (path == kCommonCSSPath) { - SendResource(IDR_MOST_VISITED_IFRAME_CSS, callback); + SendResource(IDR_MOST_VISITED_IFRAME_CSS, std::move(callback)); } else if (path == kDontShowPngPath) { - SendResource(IDR_MOST_VISITED_DONT_SHOW_PNG, callback); + SendResource(IDR_MOST_VISITED_DONT_SHOW_PNG, std::move(callback)); } else if (path == kDontShow2XPngPath) { - SendResource(IDR_MOST_VISITED_DONT_SHOW_2X_PNG, callback); + SendResource(IDR_MOST_VISITED_DONT_SHOW_2X_PNG, std::move(callback)); } else if (path == kEditHTMLPath) { - SendResource(IDR_CUSTOM_LINKS_EDIT_HTML, callback); + SendResource(IDR_CUSTOM_LINKS_EDIT_HTML, std::move(callback)); } else if (path == kEditCSSPath) { - SendResource(IDR_CUSTOM_LINKS_EDIT_CSS, callback); + SendResource(IDR_CUSTOM_LINKS_EDIT_CSS, std::move(callback)); } else if (path == kEditJSPath) { - SendJSWithOrigin(IDR_CUSTOM_LINKS_EDIT_JS, wc_getter, callback); + SendJSWithOrigin(IDR_CUSTOM_LINKS_EDIT_JS, wc_getter, std::move(callback)); } else if (path == kAddSvgPath) { - SendResource(IDR_CUSTOM_LINKS_ADD_SVG, callback); + SendResource(IDR_CUSTOM_LINKS_ADD_SVG, std::move(callback)); } else if (path == kAddWhiteSvgPath) { - SendResource(IDR_CUSTOM_LINKS_ADD_WHITE_SVG, callback); + SendResource(IDR_CUSTOM_LINKS_ADD_WHITE_SVG, std::move(callback)); } else if (path == kEditMenuSvgPath) { - SendResource(IDR_CUSTOM_LINKS_EDIT_MENU_SVG, callback); + SendResource(IDR_CUSTOM_LINKS_EDIT_MENU_SVG, std::move(callback)); } else if (path == kLocalNTPCommonCSSPath) { - SendResource(IDR_LOCAL_NTP_COMMON_CSS, callback); + SendResource(IDR_LOCAL_NTP_COMMON_CSS, std::move(callback)); } else if (path == kAnimationsCSSPath) { - SendResource(IDR_LOCAL_NTP_ANIMATIONS_CSS, callback); + SendResource(IDR_LOCAL_NTP_ANIMATIONS_CSS, std::move(callback)); } else if (path == kAnimationsJSPath) { - SendResource(IDR_LOCAL_NTP_ANIMATIONS_JS, callback); + SendResource(IDR_LOCAL_NTP_ANIMATIONS_JS, std::move(callback)); } else if (path == kLocalNTPUtilsJSPath) { - SendResource(IDR_LOCAL_NTP_UTILS_JS, callback); + SendResource(IDR_LOCAL_NTP_UTILS_JS, std::move(callback)); } else if (path == kAssertJsPath) { - SendResource(IDR_WEBUI_JS_ASSERT, callback); + SendResource(IDR_WEBUI_JS_ASSERT, std::move(callback)); } else { - callback.Run(nullptr); + std::move(callback).Run(nullptr); } } @@ -163,18 +164,19 @@ void MostVisitedIframeSource::SendResource( int resource_id, - const content::URLDataSource::GotDataCallback& callback) { - callback.Run(ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes( - resource_id)); + content::URLDataSource::GotDataCallback callback) { + std::move(callback).Run( + ui::ResourceBundle::GetSharedInstance().LoadDataResourceBytes( + resource_id)); } void MostVisitedIframeSource::SendJSWithOrigin( int resource_id, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { std::string origin; if (!GetOrigin(wc_getter, &origin)) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } @@ -182,7 +184,7 @@ ui::ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id); std::string response(template_js.as_string()); base::ReplaceFirstSubstringAfterOffset(&response, 0, "{{ORIGIN}}", origin); - callback.Run(base::RefCountedString::TakeString(&response)); + std::move(callback).Run(base::RefCountedString::TakeString(&response)); } bool MostVisitedIframeSource::GetOrigin(
diff --git a/chrome/browser/search/most_visited_iframe_source.h b/chrome/browser/search/most_visited_iframe_source.h index 6f97034..c0ecdacf 100644 --- a/chrome/browser/search/most_visited_iframe_source.h +++ b/chrome/browser/search/most_visited_iframe_source.h
@@ -25,7 +25,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path_and_query) override; bool AllowCaching() override; bool ShouldDenyXFrameOptions() override; @@ -39,13 +39,12 @@ // Sends unmodified resource bytes. void SendResource(int resource_id, - const content::URLDataSource::GotDataCallback& callback); + content::URLDataSource::GotDataCallback callback); // Sends Javascript with an expected postMessage origin interpolated. - void SendJSWithOrigin( - int resource_id, - const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback); + void SendJSWithOrigin(int resource_id, + const content::WebContents::Getter& wc_getter, + content::URLDataSource::GotDataCallback callback); // This is exposed for testing and should not be overridden. // Sets |origin| to the URL of the WebContents identified by |wc_getter|.
diff --git a/chrome/browser/search/most_visited_iframe_source_unittest.cc b/chrome/browser/search/most_visited_iframe_source_unittest.cc index 1b13b8d..f126ba0 100644 --- a/chrome/browser/search/most_visited_iframe_source_unittest.cc +++ b/chrome/browser/search/most_visited_iframe_source_unittest.cc
@@ -48,7 +48,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override {} + content::URLDataSource::GotDataCallback callback) override {} // RenderFrameHost is hard to mock in concert with everything else, so stub // this method out for testing. @@ -85,12 +85,16 @@ } void SendResource(int resource_id) { - source()->SendResource(resource_id, callback_); + source()->SendResource( + resource_id, base::BindOnce(&MostVisitedIframeSourceTest::SaveResponse, + base::Unretained(this))); } void SendJSWithOrigin(int resource_id) { - source()->SendJSWithOrigin(resource_id, content::WebContents::Getter(), - callback_); + source()->SendJSWithOrigin( + resource_id, content::WebContents::Getter(), + base::BindOnce(&MostVisitedIframeSourceTest::SaveResponse, + base::Unretained(this))); } bool ShouldService(const std::string& path, int process_id) { @@ -101,8 +105,6 @@ private: void SetUp() override { source_ = std::make_unique<TestMostVisitedIframeSource>(); - callback_ = base::Bind(&MostVisitedIframeSourceTest::SaveResponse, - base::Unretained(this)); instant_io_context_ = new InstantIOContext; InstantIOContext::SetUserDataOnIO(&resource_context_, instant_io_context_); source_->set_origin(kInstantOrigin); @@ -122,7 +124,6 @@ net::TestURLRequestContext test_url_request_context_; content::MockResourceContext resource_context_; std::unique_ptr<TestMostVisitedIframeSource> source_; - content::URLDataSource::GotDataCallback callback_; scoped_refptr<InstantIOContext> instant_io_context_; scoped_refptr<base::RefCountedMemory> response_; };
diff --git a/chrome/browser/search/ntp_icon_source.cc b/chrome/browser/search/ntp_icon_source.cc index e3aa430..00cc241 100644 --- a/chrome/browser/search/ntp_icon_source.cc +++ b/chrome/browser/search/ntp_icon_source.cc
@@ -226,17 +226,20 @@ } // namespace struct NtpIconSource::NtpIconRequest { - NtpIconRequest(const content::URLDataSource::GotDataCallback& cb, + NtpIconRequest(content::URLDataSource::GotDataCallback cb, const GURL& path, int icon_size_in_pixels, float scale, bool show_fallback_monogram) - : callback(cb), + : callback(std::move(cb)), path(path), icon_size_in_pixels(icon_size_in_pixels), device_scale_factor(scale), show_fallback_monogram(show_fallback_monogram) {} - NtpIconRequest(const NtpIconRequest& other) = default; + + NtpIconRequest(NtpIconRequest&& other) = default; + NtpIconRequest& operator=(NtpIconRequest&& other) = default; + ~NtpIconRequest() {} content::URLDataSource::GotDataCallback callback; @@ -262,7 +265,7 @@ void NtpIconSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { favicon::FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(profile_, ServiceAccessType::EXPLICIT_ACCESS); @@ -273,7 +276,7 @@ if (parsed.url.is_valid()) { int icon_size_in_pixels = std::ceil(parsed.size_in_dip * parsed.device_scale_factor); - NtpIconRequest request(callback, parsed.url, icon_size_in_pixels, + NtpIconRequest request(std::move(callback), parsed.url, icon_size_in_pixels, parsed.device_scale_factor, parsed.show_fallback_monogram); @@ -295,10 +298,10 @@ gfx::ImageSkiaOperations::CreateResizedImage( image.AsImageSkia(), skia::ImageOperations::RESIZE_BEST, target_size); - ReturnRenderedIconForRequest(request, + ReturnRenderedIconForRequest(std::move(request), gfx::Image(resized_image).AsBitmap()); } else { - ReturnRenderedIconForRequest(request, image.AsBitmap()); + ReturnRenderedIconForRequest(std::move(request), image.AsBitmap()); } return; } @@ -311,11 +314,11 @@ favicon_service->GetRawFaviconForPageURL( parsed.url, {favicon_base::IconType::kFavicon}, icon_size_in_pixels, fallback_to_host, - base::Bind(&NtpIconSource::OnLocalFaviconAvailable, - weak_ptr_factory_.GetWeakPtr(), request), + base::BindOnce(&NtpIconSource::OnLocalFaviconAvailable, + weak_ptr_factory_.GetWeakPtr(), std::move(request)), &cancelable_task_tracker_); } else { - callback.Run(nullptr); + std::move(callback).Run(nullptr); } } @@ -338,7 +341,7 @@ } void NtpIconSource::OnLocalFaviconAvailable( - const NtpIconRequest& request, + NtpIconRequest request, const favicon_base::FaviconRawBitmapResult& bitmap_result) { if (bitmap_result.is_valid()) { // A local favicon was found. Decode it to an SkBitmap so it can eventually @@ -348,12 +351,12 @@ gfx::PNGCodec::Decode(bitmap_result.bitmap_data.get()->front(), bitmap_result.bitmap_data.get()->size(), &bitmap); DCHECK(result); - ReturnRenderedIconForRequest(request, bitmap); + ReturnRenderedIconForRequest(std::move(request), bitmap); } else { // Since a local favicon was not found, attempt to fetch a server icon if // the url is known to the server (this last check is important to avoid // leaking private history to the server). - RequestServerFavicon(request); + RequestServerFavicon(std::move(request)); } } @@ -374,14 +377,14 @@ return position != profile.suggestions().end(); } -void NtpIconSource::RequestServerFavicon(const NtpIconRequest& request) { +void NtpIconSource::RequestServerFavicon(NtpIconRequest request) { // Only fetch a server icon if the page url is known to the server. This check // is important to avoid leaking private history to the server. const GURL server_favicon_url = GURL(base::StringPrintf(kServerFaviconURL, request.path.spec().c_str())); if (!server_favicon_url.is_valid() || !IsRequestedUrlInServerSuggestions(request.path)) { - ReturnRenderedIconForRequest(request, SkBitmap()); + ReturnRenderedIconForRequest(std::move(request), SkBitmap()); return; } @@ -412,13 +415,13 @@ gfx::Size(request.icon_size_in_pixels, request.icon_size_in_pixels)); image_fetcher_->FetchImage( server_favicon_url, - base::Bind(&NtpIconSource::OnServerFaviconAvailable, - weak_ptr_factory_.GetWeakPtr(), request), + base::BindOnce(&NtpIconSource::OnServerFaviconAvailable, + weak_ptr_factory_.GetWeakPtr(), std::move(request)), std::move(params)); } void NtpIconSource::OnServerFaviconAvailable( - const NtpIconRequest& request, + NtpIconRequest request, const gfx::Image& fetched_image, const image_fetcher::RequestMetadata& metadata) { // If a server icon was not found, |fetched_bitmap| will be empty and a @@ -432,10 +435,10 @@ request.icon_size_in_pixels, request.icon_size_in_pixels); } - ReturnRenderedIconForRequest(request, fetched_bitmap); + ReturnRenderedIconForRequest(std::move(request), fetched_bitmap); } -void NtpIconSource::ReturnRenderedIconForRequest(const NtpIconRequest& request, +void NtpIconSource::ReturnRenderedIconForRequest(NtpIconRequest request, const SkBitmap& favicon) { // Only use even pixel sizes to avoid issues when centering the fallback // monogram. @@ -478,5 +481,6 @@ std::vector<unsigned char> bitmap_data; bool result = gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, false, &bitmap_data); DCHECK(result); - request.callback.Run(base::RefCountedBytes::TakeVector(&bitmap_data)); + std::move(request.callback) + .Run(base::RefCountedBytes::TakeVector(&bitmap_data)); }
diff --git a/chrome/browser/search/ntp_icon_source.h b/chrome/browser/search/ntp_icon_source.h index 314b757..ee59f15 100644 --- a/chrome/browser/search/ntp_icon_source.h +++ b/chrome/browser/search/ntp_icon_source.h
@@ -39,7 +39,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; bool ShouldServiceRequest(const GURL& url, content::ResourceContext* resource_context, @@ -48,19 +48,19 @@ private: struct NtpIconRequest; void OnLocalFaviconAvailable( - const NtpIconRequest& request, + NtpIconRequest request, const favicon_base::FaviconRawBitmapResult& bitmap_result); // Returns whether |url| is in the set of server suggestions. bool IsRequestedUrlInServerSuggestions(const GURL& url); - void RequestServerFavicon(const NtpIconRequest& request); - void OnServerFaviconAvailable(const NtpIconRequest& request, + void RequestServerFavicon(NtpIconRequest request); + void OnServerFaviconAvailable(NtpIconRequest request, const gfx::Image& fetched_image, const image_fetcher::RequestMetadata& metadata); // Will call |request.callback| with the rendered icon. |bitmap| can be empty, // in which case the returned icon is a fallback circle with a letter drawn // into it. - void ReturnRenderedIconForRequest(const NtpIconRequest& request, + void ReturnRenderedIconForRequest(NtpIconRequest request, const SkBitmap& bitmap); base::CancelableTaskTracker cancelable_task_tracker_;
diff --git a/chrome/browser/search/suggestions/suggestions_ui.cc b/chrome/browser/search/suggestions/suggestions_ui.cc index 524599df..f459d4e 100644 --- a/chrome/browser/search/suggestions/suggestions_ui.cc +++ b/chrome/browser/search/suggestions/suggestions_ui.cc
@@ -29,7 +29,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; private: @@ -52,9 +52,9 @@ void SuggestionsSourceWrapper::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { suggestions_source_.StartDataRequest( - content::URLDataSource::URLToRequestPath(url), callback); + content::URLDataSource::URLToRequestPath(url), std::move(callback)); } std::string SuggestionsSourceWrapper::GetMimeType(const std::string& path) {
diff --git a/chrome/browser/search_engines/template_url_scraper_browsertest.cc b/chrome/browser/search_engines/template_url_scraper_browsertest.cc index 34816e350..dfb37e3 100644 --- a/chrome/browser/search_engines/template_url_scraper_browsertest.cc +++ b/chrome/browser/search_engines/template_url_scraper_browsertest.cc
@@ -11,6 +11,7 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/test/bind_test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" @@ -44,7 +45,8 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; std::unique_ptr<TemplateURLService::Subscription> subscription = - model_->RegisterOnLoadedCallback(message_loop_runner->QuitClosure()); + model_->RegisterOnLoadedCallback( + base::BindLambdaForTesting([&]() { message_loop_runner->Quit(); })); model_->Load(); message_loop_runner->Run(); }
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc index 3cdaa0aa..6b27e97 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc +++ b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc
@@ -9,10 +9,10 @@ #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h" #include "chrome/browser/sharing/click_to_call/feature.h" #include "chrome/browser/sharing/sharing_constants.h" -#include "chrome/browser/sharing/sharing_metrics.h" #include "chrome/grit/generated_resources.h" #include "components/sync_device_info/device_info.h" #include "components/vector_icons/vector_icons.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h index bab6ee5..504006d8 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h +++ b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h
@@ -12,7 +12,7 @@ #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/optional.h" -#include "chrome/browser/sharing/sharing_metrics.h" +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "components/renderer_context_menu/render_view_context_menu_observer.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_metrics.cc b/chrome/browser/sharing/click_to_call/click_to_call_metrics.cc new file mode 100644 index 0000000..5fbdfd4 --- /dev/null +++ b/chrome/browser/sharing/click_to_call/click_to_call_metrics.cc
@@ -0,0 +1,118 @@ +// Copyright 2019 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. + +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" + +#include <algorithm> +#include <cctype> + +#include "base/metrics/histogram_functions.h" +#include "base/strings/strcat.h" +#include "base/time/time.h" +#include "components/ukm/content/source_url_recorder.h" +#include "content/public/browser/web_contents.h" +#include "services/metrics/public/cpp/ukm_builders.h" +#include "services/metrics/public/cpp/ukm_recorder.h" +#include "services/metrics/public/cpp/ukm_source_id.h" + +namespace { + +// The returned values must match the values of the SharingClickToCallEntryPoint +// suffixes defined in histograms.xml. +const char* ClickToCallEntryPointToSuffix( + SharingClickToCallEntryPoint entry_point) { + switch (entry_point) { + case SharingClickToCallEntryPoint::kLeftClickLink: + return "LeftClickLink"; + case SharingClickToCallEntryPoint::kRightClickLink: + return "RightClickLink"; + case SharingClickToCallEntryPoint::kRightClickSelection: + return "RightClickSelection"; + } +} + +// The returned values must match the values of the PhoneNumberRegexVariant +// suffixes defined in histograms.xml. +const char* PhoneNumberRegexVariantToSuffix(PhoneNumberRegexVariant variant) { + switch (variant) { + case PhoneNumberRegexVariant::kSimple: + return "Simple"; + case PhoneNumberRegexVariant::kLowConfidenceModified: + return "LowConfidenceModified"; + } +} + +// The returned values must match the values of the +// SharingClickToCallSendToDevice suffixes defined in histograms.xml. +const char* SendToDeviceToSuffix(bool send_to_device) { + return send_to_device ? "Sending" : "Showing"; +} + +} // namespace + +ScopedUmaHistogramMicrosecondsTimer::ScopedUmaHistogramMicrosecondsTimer( + PhoneNumberRegexVariant variant) + : variant_(variant) {} + +ScopedUmaHistogramMicrosecondsTimer::~ScopedUmaHistogramMicrosecondsTimer() { + constexpr char kPrefix[] = + "Sharing.ClickToCallContextMenuPhoneNumberParsingDelay"; + constexpr base::TimeDelta kMinTime = base::TimeDelta::FromMicroseconds(1); + constexpr base::TimeDelta kMaxTime = base::TimeDelta::FromSeconds(1); + constexpr int kBuckets = 50; + + base::TimeDelta elapsed = timer_.Elapsed(); + // Default bucket for all variants. + base::UmaHistogramCustomMicrosecondsTimes(kPrefix, elapsed, kMinTime, + kMaxTime, kBuckets); + base::UmaHistogramCustomMicrosecondsTimes( + base::StrCat({kPrefix, ".", PhoneNumberRegexVariantToSuffix(variant_)}), + elapsed, kMinTime, kMaxTime, kBuckets); +} + +void LogClickToCallHelpTextClicked(SharingDialogType type) { + base::UmaHistogramEnumeration("Sharing.ClickToCallHelpTextClicked", type); +} + +void LogClickToCallUKM(content::WebContents* web_contents, + SharingClickToCallEntryPoint entry_point, + bool has_devices, + bool has_apps, + SharingClickToCallSelection selection) { + ukm::UkmRecorder* ukm_recorder = ukm::UkmRecorder::Get(); + if (!ukm_recorder) + return; + + ukm::SourceId source_id = + ukm::GetSourceIdForWebContentsDocument(web_contents); + if (source_id == ukm::kInvalidSourceId) + return; + + ukm::builders::Sharing_ClickToCall(source_id) + .SetEntryPoint(static_cast<int64_t>(entry_point)) + .SetHasDevices(has_devices) + .SetHasApps(has_apps) + .SetSelection(static_cast<int64_t>(selection)) + .Record(ukm_recorder); +} + +void LogClickToCallPhoneNumberSize(const std::string& number, + SharingClickToCallEntryPoint entry_point, + bool send_to_device) { + int length = number.size(); + int digits = std::count_if(number.begin(), number.end(), + [](char c) { return std::isdigit(c); }); + + std::string suffix = + base::StrCat({ClickToCallEntryPointToSuffix(entry_point), ".", + SendToDeviceToSuffix(send_to_device)}); + + base::UmaHistogramCounts100("Sharing.ClickToCallPhoneNumberLength", length); + base::UmaHistogramCounts100( + base::StrCat({"Sharing.ClickToCallPhoneNumberLength.", suffix}), length); + + base::UmaHistogramCounts100("Sharing.ClickToCallPhoneNumberDigits", digits); + base::UmaHistogramCounts100( + base::StrCat({"Sharing.ClickToCallPhoneNumberDigits.", suffix}), digits); +}
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_metrics.h b/chrome/browser/sharing/click_to_call/click_to_call_metrics.h new file mode 100644 index 0000000..0968516 --- /dev/null +++ b/chrome/browser/sharing/click_to_call/click_to_call_metrics.h
@@ -0,0 +1,73 @@ +// Copyright 2019 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. + +#ifndef CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_METRICS_H_ +#define CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_METRICS_H_ + +#include <string> + +#include "base/timer/elapsed_timer.h" +#include "chrome/browser/sharing/click_to_call/phone_number_regex.h" +#include "chrome/browser/sharing/sharing_metrics.h" + +namespace content { +class WebContents; +} // namespace content + +// Entry point of a Click to Call journey. +// These values are logged to UKM. Entries should not be renumbered and numeric +// values should never be reused. Please keep in sync with +// "SharingClickToCallEntryPoint" in src/tools/metrics/histograms/enums.xml. +enum class SharingClickToCallEntryPoint { + kLeftClickLink = 0, + kRightClickLink = 1, + kRightClickSelection = 2, + kMaxValue = kRightClickSelection, +}; + +// Selection at the end of a Click to Call journey. +// These values are logged to UKM. Entries should not be renumbered and numeric +// values should never be reused. Please keep in sync with +// "SharingClickToCallSelection" in src/tools/metrics/histograms/enums.xml. +enum class SharingClickToCallSelection { + kNone = 0, + kDevice = 1, + kApp = 2, + kMaxValue = kApp, +}; + +// TODO(himanshujaju): Make it generic and move to base/metrics/histogram_base.h +// Used to Log delay in parsing phone number in highlighted text to UMA. +class ScopedUmaHistogramMicrosecondsTimer { + public: + explicit ScopedUmaHistogramMicrosecondsTimer(PhoneNumberRegexVariant variant); + ScopedUmaHistogramMicrosecondsTimer( + const ScopedUmaHistogramMicrosecondsTimer&) = delete; + ScopedUmaHistogramMicrosecondsTimer& operator=( + const ScopedUmaHistogramMicrosecondsTimer&) = delete; + ~ScopedUmaHistogramMicrosecondsTimer(); + + private: + const PhoneNumberRegexVariant variant_; + const base::ElapsedTimer timer_; +}; + +// Logs the dialog type when a user clicks on the help text in the Click to Call +// dialog. +void LogClickToCallHelpTextClicked(SharingDialogType type); + +// Records a Click to Call selection to UKM. This is logged after a completed +// action like selecting an app or a device to send the phone number to. +void LogClickToCallUKM(content::WebContents* web_contents, + SharingClickToCallEntryPoint entry_point, + bool has_devices, + bool has_apps, + SharingClickToCallSelection selection); + +// Logs the raw phone number length and the number of digits in it. +void LogClickToCallPhoneNumberSize(const std::string& number, + SharingClickToCallEntryPoint entry_point, + bool send_to_device); + +#endif // CHROME_BROWSER_SHARING_CLICK_TO_CALL_CLICK_TO_CALL_METRICS_H_
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h index dd21b6d..d4b32d7 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h +++ b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h
@@ -12,7 +12,7 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" #include "base/optional.h" -#include "chrome/browser/sharing/sharing_metrics.h" +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "chrome/browser/sharing/sharing_service.h" #include "chrome/browser/sharing/sharing_ui_controller.h" #include "chrome/browser/ui/page_action/page_action_icon_type.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_utils.cc b/chrome/browser/sharing/click_to_call/click_to_call_utils.cc index 77705ec..dee54933 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_utils.cc +++ b/chrome/browser/sharing/click_to_call/click_to_call_utils.cc
@@ -11,9 +11,9 @@ #include "base/time/time.h" #include "base/timer/elapsed_timer.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "chrome/browser/sharing/click_to_call/feature.h" #include "chrome/browser/sharing/click_to_call/phone_number_regex.h" -#include "chrome/browser/sharing/sharing_metrics.h" #include "chrome/browser/sharing/sharing_service.h" #include "chrome/browser/sharing/sharing_service_factory.h" #include "chrome/common/pref_names.h" @@ -74,6 +74,11 @@ if (!IsClickToCallEnabled(browser_context)) return base::nullopt; + if (base::FeatureList::IsEnabled(kClickToCallDetectionV2)) { + return ExtractPhoneNumber(selection_text, + PhoneNumberRegexVariant::kLowConfidenceModified); + } + return ExtractPhoneNumber(selection_text, PhoneNumberRegexVariant::kSimple); }
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc b/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc index 02ca13a..c4b1a73 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc +++ b/chrome/browser/sharing/click_to_call/click_to_call_utils_unittest.cc
@@ -127,7 +127,8 @@ TEST_F(ClickToCallUtilsTest, SelectionText_ValidPhoneNumberRegex_OfferForSelection) { - scoped_feature_list_.InitAndEnableFeature(kClickToCallUI); + scoped_feature_list_.InitWithFeatures({kClickToCallUI}, + {kClickToCallDetectionV2}); // Stores a mapping of selected text to expected phone number parsed. std::map<std::string, std::string> expectations; @@ -151,6 +152,10 @@ expectations.emplace("9 8 7 6 5 4 3 2 1 0", "9 8 7 6 5 4 3 2 1 0"); // Non breaking spaces around number. expectations.emplace("\u00A09876543210\u00A0", "9876543210"); + // Example for a credit card + expectations.emplace("4111 1111 1111 1111", "4111 1111 1111 1111"); + // Chrome version string + expectations.emplace("78.0.3904.108", "78.0.3904.108"); for (auto& expectation : expectations) { base::Optional<std::string> phone_number = @@ -162,27 +167,71 @@ TEST_F(ClickToCallUtilsTest, SelectionText_InvalidPhoneNumberRegex_DoNotOfferForSelection) { - scoped_feature_list_.InitAndEnableFeature(kClickToCallUI); + scoped_feature_list_.InitWithFeatures({kClickToCallUI}, + {kClickToCallDetectionV2}); std::vector<std::string> invalid_selection_texts; // Does not contain any number. - invalid_selection_texts.emplace_back("Call me maybe"); + invalid_selection_texts.push_back("Call me maybe"); // We only parse smaller text sizes to avoid performance impact on Chromium. - invalid_selection_texts.emplace_back( + invalid_selection_texts.push_back( "This is a huge text. It also contains a phone number 9876543210"); // Although this is a valid number, its not caught by the regex. - invalid_selection_texts.emplace_back("+44 1800-FLOWERS"); + invalid_selection_texts.push_back("+44 1800-FLOWERS"); // Number does not start as new word. - invalid_selection_texts.emplace_back("No space9876543210"); + invalid_selection_texts.push_back("No space9876543210"); // Minimum length for regex match not satisfied. - invalid_selection_texts.emplace_back("Small number 98765"); + invalid_selection_texts.push_back("Small number 98765"); // Number does not start as new word. - invalid_selection_texts.emplace_back("Buy for $9876543210"); + invalid_selection_texts.push_back("Buy for $9876543210"); // More than two spaces in between. - invalid_selection_texts.emplace_back( - "9 8 7 6 5 4 3 2 1 0"); + invalid_selection_texts.push_back("9 8 7 6 5 4 3 2 1 0"); // Space dash space formatting. - invalid_selection_texts.emplace_back("999 - 999 - 9999"); + invalid_selection_texts.push_back("999 - 999 - 9999"); + + for (auto& text : invalid_selection_texts) + ExpectClickToCallDisabledForSelectionText(text); +} + +TEST_F(ClickToCallUtilsTest, SelectionText_LowConfidenceModifiedRegex_Matches) { + scoped_feature_list_.InitWithFeatures( + {kClickToCallUI, kClickToCallDetectionV2}, {}); + + // Stores a mapping of selected text to expected phone number parsed. + std::map<std::string, std::string> expectations = { + {"+91 77997 12345", "+91 77997 12345"}, + {"(+0091) 040 12345678", "(+0091) 040 12345678"}, + {"+1 800 444 4444", "+1 800 444 4444"}, + {"754-1234", "754-1234"}, + {"+55-955-1234-1234 (landline)", "+55-955-1234-1234"}, + {"+44(0)20-1234 1234", "+44(0)20-1234 1234"}, + {"07700123123", "07700123123"}, + {"Call +49 231 1234567 now!", "+49 231 1234567"}, + {"tel:+49-89-636-12345", "+49-89-636-12345"}, + {"Number (021) 12345678", "(021) 12345678"}, + {"(private) +90 312 123 12 12", "+90 312 123 12 12"}, + {"+34 913 12 12 12", "+34 913 12 12 12"}, + {"(000)\u00A00000000", "(000)\u00A00000000"}, + }; + + for (auto& expectation : expectations) { + base::Optional<std::string> phone_number = + ExtractPhoneNumberForClickToCall(&profile_, expectation.first); + EXPECT_EQ(expectation.second, phone_number.value_or("")); + } +} + +TEST_F(ClickToCallUtilsTest, SelectionText_LowConfidenceModifiedRegex_NoMatch) { + scoped_feature_list_.InitWithFeatures( + {kClickToCallUI, kClickToCallDetectionV2}, {}); + std::vector<std::string> invalid_selection_texts = { + // Example for a credit card + "4111 1111 1111 1111", + // Chrome version string + "78.0.3904.108", + // Too many spaces + "9 8 7 6 5 4 3 2 1 0", + }; for (auto& text : invalid_selection_texts) ExpectClickToCallDisabledForSelectionText(text);
diff --git a/chrome/browser/sharing/click_to_call/phone_number_regex.cc b/chrome/browser/sharing/click_to_call/phone_number_regex.cc index 2d09087..4ba21dc7 100644 --- a/chrome/browser/sharing/click_to_call/phone_number_regex.cc +++ b/chrome/browser/sharing/click_to_call/phone_number_regex.cc
@@ -12,6 +12,7 @@ #include "base/task/post_task.h" #include "base/time/time.h" #include "chrome/browser/sharing/click_to_call/feature.h" +#include "third_party/re2/src/re2/re2.h" namespace { @@ -23,11 +24,117 @@ const char kPhoneNumberRegexPatternSimple[] = R"((?:^|\p{Z})((?:\(?\+[0-9]+\)?)?(?:[.\p{Z}\-(]?[0-9][\p{Z}\-)]?){8,}))"; +// Regex based on the low confidence pattern used in TextClassifier on Android. +// The original low confidence regex has been modified to support some more +// patterns that are common in our user base. +// https://developer.android.com/reference/android/view/textclassifier/TextClassifier +// https://android.googlesource.com/platform/external/libtextclassifier/+/refs/heads/master/models/ +const char kPhoneNumberRegexPatternLowConfidenceModified[] = + R"((?:^|[^\/+.\d\p{Pd}:\p{Z})]|(?:^|[^\/+.\d\p{Pd})])[:\p{Z})])(?:^|(?sm:\)" + R"(b)|[\p{Z}:.])((?:(?:(?:\(\d{4}\)[\p{Pd}\p{Z}]\d{2}(?:\p{Pd}\d{2}){2}[\p)" + R"({Pd}\p{Z}]|\+[\p{Pd}\p{Z}]\d(?:\d{2}[\p{Pd}\p{Z}]\(\d{2}\)[\p{Pd}\p{Z}])" + R"(\d|[\p{Pd}\p{Z}]\(\d{4}\)[\p{Pd}\p{Z}])|\d{3}[\p{Pd}\p{Z}]\(\d{2}\)[\p{)" + R"(Pd}\p{Z}]\d)(?:\d{2}\p{Pd}){2}|(?:\d{2}(?:[\p{Pd}\p{Z}](?:\d{2}(?:[\p{P)" + R"(d}\p{Z}]\d{2}(?:[\p{Pd}\p{Z}]\d{4}[\p{Pd}\p{Z}]|\d{2}\p{Pd}|\d\p{Pd}\d))" + R"(|\d{2}\p{Pd}?\d)|\(\d{2}\)[\p{Pd}\p{Z}]\d)\d{2}[\p{Pd}\p{Z}]|(?:\p{Pd}()" + R"(?:\d{2}[\p{Pd}\p{Z}]){2}\d{4}\p{Pd}|\d\p{Pd}\d|\d{2}[\p{Pd}\p{Z}]|\d[\p)" + R"({Pd}\p{Z}])\d{2}[\p{Pd}\p{Z}])|\+[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}]\(\d{2})" + R"(\)[\p{Pd}\p{Z}]\d{3}[\p{Pd}\p{Z}])\d{2}[\p{Pd}\p{Z}]|\+(?:\d(?:\d(?:[\p)" + R"({Pd}\p{Z}](?:\(\d(?:(?:\)(?:[\p{Pd}\p{Z}]\d{4}\p{Pd}\d{2,3}|\d{4}\p{Pd})" + R"(\d{3})|(?:\)(?:[\p{Pd}\p{Z}]\d{3}\p{Pd}\d|\d[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p)" + R"({Z}]|\d{3}\p{Pd}\d)|\d{3}\)[\p{Pd}\p{Z}]\d)\d{2})[\p{Pd}\p{Z}]\d{2}[\p{)" + R"(Pd}\p{Z}]|\d(?:\d(?:\d\)[\p{Pd}\p{Z}]\d{2}(?:\p{Pd}\d{2}\p{Pd}|\d{2})|\)" + R"()[\p{Pd}\p{Z}]\d{5})|\)[\p{Pd}\p{Z}]\d{3}(?:[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p)" + R"({Z}]|\p{Pd}\d{2}\p{Pd})))|\d{3}(?:[\p{Pd}\p{Z}]\d{5}|\d\p{Pd}\d{3}[\p{P)" + R"(d}\p{Z}]|\d{2}[\p{Pd}\p{Z}]\d{3}))|(?:\d[\p{Pd}\p{Z}]\(\d{2}\)[\p{Pd}\p)" + R"({Z}]\d{3}[\p{Pd}\p{Z}]|[\p{Pd}\p{Z}]\d(?:[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z})" + R"(]|\d{2}(?:\d\p{Pd}?|[\p{Pd}\p{Z}]))\d{2}[\p{Pd}\p{Z}])\d{2}[\p{Pd}\p{Z})" + R"(]|\d(?:(?:[\p{Pd}\p{Z}]\(\d{2}\)[\p{Pd}\p{Z}]\d{3}|\d{4,5})\p{Pd}\d{2}\)" + R"(p{Pd}|[\p{Pd}\p{Z}]\(\d{3}\)[\p{Pd}\p{Z}]\d{3}[\p{Pd}\p{Z}]?\d{2}|\d{8})" + R"([\p{Pd}\p{Z}]\p{Pd}[\p{Pd}\p{Z}]))|(?:\d(?:[\p{Pd}\p{Z}](?:\(\d(?:\d(?:)" + R"(\d\)[\p{Pd}\p{Z}]\d{3}(?:\d\p{Pd}|[\p{Pd}\p{Z}])|\)(?:[\p{Pd}\p{Z}]\d{4)" + R"(}(?:\d?\p{Pd}|[\p{Pd}\p{Z}])|\d{4}\p{Pd}))|(?:\)\d(?:\d\p{Pd}\d{2}|\d[\)" + R"(p{Pd}\p{Z}]\d|\d{2}[\p{Pd}\p{Z}]|[\p{Pd}\p{Z}]\d{2})|\d{2}\)\d)\d{2})|\)" + R"(d{2}(?:[\p{Pd}\p{Z}]\d{4}[\p{Pd}\p{Z}]|\p{Pd}\d{4}))|(?:\(\d\)\d{2}\p{P)" + R"(d}\d{4}|\d[\p{Pd}\p{Z}]\d{4,5})[\p{Pd}\p{Z}]|\p{Pd}\d{2}\p{Pd}\d{3}\p{P)" + R"(d}\d)|(?:\d\p{Pd}\d{3}\p{Pd}\d|[\p{Pd}\p{Z}]\d{3}\p{Pd})\d{3}\p{Pd}|(?:)" + R"(\d\.|[\p{Pd}\p{Z}])\d{3}\.\d{3}\.|[\p{Pd}\p{Z}](?:\d{3}[\p{Pd}\p{Z}]){2)" + R"(}|\.\d{3}(?:\.\d{3}\.|\p{Pd}\d{3}\p{Pd}))\d{2}|[\p{Pd}\p{Z}]\(\d{3}(?:\)" + R"()(?:[\p{Pd}\p{Z}]\d{3}(?:\p{Pd}\d{2}\p{Pd}|[\p{Pd}\p{Z}]?\d{2})|\d{3}\p)" + R"({Pd}?\d{2})|\d(?:(?:\d\)[\p{Pd}\p{Z}]|\)[\p{Pd}\p{Z}]\d)\d\p{Pd}\d{2}\p)" + R"({Pd}|\)[\p{Pd}\p{Z}]\d{3}\p{Pd}?\d)))|[\p{Pd}\p{Z}]\d(?:[\p{Pd}\p{Z}]\()" + R"(\d{3}\)[\p{Pd}\p{Z}]\d{3}(?:[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}]|\d{2})|\d[\)" + R"(p{Pd}\p{Z}]\(\d{3}\)[\p{Pd}\p{Z}]\d{5}))|(?:\((?:(?:\+\d{2}(?:\d{2}\)[\)" + R"(p{Pd}\p{Z}]\d{3}[\p{Pd}\p{Z}]|\)[\p{Pd}\p{Z}]\d{2}\p{Pd}?)\d|\d\)[\p{Pd)" + R"(}\p{Z}]\(\d{3}\)[\p{Pd}\p{Z}])\d{3}|\d{2}(?:\)(?:[\p{Pd}\p{Z}](?:\(\d{4)" + R"(}\)[\p{Pd}\p{Z}]\d{3}|\d{3}(?:\p{Pd}\d{3}\p{Pd}|\d{2}\p{Pd}|\d\p{Pd}|\d)" + R"([\p{Pd}\p{Z}]))|\d{4}\p{Pd})|\d(?:\)(?:[\p{Pd}\p{Z}]\d{3}(?:[\p{Pd}\p{Z)" + R"(}]\d{3}[\p{Pd}\p{Z}]|\p{Pd}\d{3}\p{Pd}|\d\p{Pd})|\d{3}\p{Pd})|\d\)[\p{P)" + R"(d}\p{Z}]\d{3}\p{Pd}))|\+\d\)[\p{Pd}\p{Z}]\d{3}(?:\.\d{3}\.|\p{Pd}\d{3}\)" + R"(p{Pd}))|\+[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}]\(\d{2}(?:\)[\p{Pd}\p{Z}]\d{4})" + R"(\p{Pd}|\d\)[\p{Pd}\p{Z}]\d{3}[\p{Pd}\p{Z}])|(?:\((?:\+\d)?\d\)|\d)[\p{P)" + R"(d}\p{Z}](?:\d{3}\p{Pd}){2}|\d(?:\d(?:(?:\d[\p{Pd}\p{Z}]\(\d{3}\)[\p{Pd})" + R"(\p{Z}]\d|\d{2}\/|\p{Pd}\d{2})\d{2}|\d(?:[\p{Pd}\p{Z}]\d{4}[\p{Pd}\p{Z}])" + R"(|\d[\p{Pd}\p{Z}]\d{3}[\p{Pd}\p{Z}]|\.\d{3}\.|\d{2}\p{Pd}\d{2}|\d{3}\p{P)" + R"(d})|[\p{Pd}\p{Z}]\d{4}[\p{Pd}\p{Z}])|\.\d{3}\.\d{3}\.))\d{2}|\((?:\+\d{)" + R"(2}\)(?:\d{2}\.){4}|\d{2}(?:\d{2}\)[\p{Pd}\p{Z}]\d{3}(?:[\p{Pd}\p{Z}](?:)" + R"(\d{2}[\p{Pd}\p{Z}]){2}|\d{2})|\)[\p{Pd}\p{Z}](?:\(\d{2}(?:\)[\p{Pd}\p{Z)" + R"(}]\d|\d\)[\p{Pd}\p{Z}])\d{3}\p{Pd}?\d{2}|\d{3}(?:(?:\p{Pd}\d{2}){2}[\p{)" + R"(Pd}\p{Z}]\d|[\p{Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z}]){2}|\d{3}))))|\d(?:\d(?:)" + R"(\d(?:[\p{Pd}\p{Z}]\d{4}\p{Pd}(?:\d{3}[\p{Pd}\p{Z}]){2}|\d\p{Pd}\d{3}[\p)" + R"({Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z}]){2}|\d{3}[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z})" + R"(]|\p{Pd}\d{5}|(?:\d{2}[\p{Pd}\p{Z}]){2}|\d{6}|\p{Pd}\d{2}\p{Pd})|[\p{Pd)" + R"(}\p{Z}](?:\(\d{2}(?:\d\)[\p{Pd}\p{Z}]|\)[\p{Pd}\p{Z}]\d)\d{3}[\p{Pd}\p{)" + R"(Z}]?\d{2}|(?:\d{2}[\p{Pd}\p{Z}]){3})|\.(?:\d{2}\.){3})|\p{Pd}\d{3}\p{Pd)" + R"(}\d{5})|(?:\+[\d\p{Pd}\p{Z}]\d[\p{Pd}\p{Z}]\(\d{3}\)[\p{Pd}\p{Z}]|\d[\p)" + R"({Pd}\p{Z}]\(\d{3}\)[\p{Pd}\p{Z}]|\d\p{Pd}\d{3}\p{Pd})\d{3}\p{Pd}\d{2}\p)" + R"({Pd}?|(?:\+\d{2}[\p{Pd}\p{Z}]\d{2,3}[\p{Pd}\p{Z}]|\d{3}[\d\p{Pd}\p{Z}]))" + R"(\d{3}[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}]?)\d{2}|\+\d(?:\d(?:[\p{Pd}\p{Z}](?)" + R"(:(?:\(\d(?:\)\d{4}\p{Pd}(?:\d{2}[\p{Pd}\p{Z}]){3}|\d{4}\)[\p{Pd}\p{Z}]\)" + R"(d{5}[\p{Pd}\p{Z}]|\d\)[\p{Pd}\p{Z}]\d{8})|\(\d(?:\)\d{4}\p{Pd}\d{2}(?:[)" + R"(\p{Pd}\p{Z}]\d)?\d[\p{Pd}\p{Z}]|\d(?:\d{3}\)[\p{Pd}\p{Z}]|\)[\p{Pd}\p{Z)" + R"(}]\d{3})\d{3})\d)\d|\d{2}(?:\d{2}(?:[\p{Pd}\p{Z}]?\d{4}[\p{Pd}\p{Z}]\d{)" + R"(3}|[\p{Pd}\p{Z}]\d{5}(?:\d[\p{Pd}\p{Z}]|[\p{Pd}\p{Z}]\d)|\d{6}[\p{Pd}\p)" + R"({Z}])|(?:(?:[\d\p{Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z}]){2}|[\p{Pd}\p{Z}]\d{5})" + R"()\d{2}[\p{Pd}\p{Z}]|[\p{Pd}\p{Z}]\d{6})\d)\d|\d{2}(?:(?:(?:[\d\p{Pd}\p{)" + R"(Z}](?:\d{2}[\p{Pd}\p{Z}]){2}|[\p{Pd}\p{Z}]\d{5})\d{2}[\p{Pd}\p{Z}]|(?:[)" + R"(\d\p{Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z}]){2}|[\p{Pd}\p{Z}]\d{5})\d)\d|\d{2}()" + R"(?:[\p{Pd}\p{Z}]?\d{4}[\p{Pd}\p{Z}](?:\d{2}|\d)|[\p{Pd}\p{Z}]\d{4}(?:\d[)" + R"(\p{Pd}\p{Z}]\d|\d{2}|\d)?|\d{4,6})))|\d{3}(?:(?:[\p{Pd}\p{Z}]\d{2}(?:[\)" + R"(p{Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z}]){2}\d|\d{4}(?:\d[\p{Pd}\p{Z}]|[\p{Pd}\)" + R"(p{Z}]\d))|\d{3}(?:[\p{Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z}]){2}|\d{3}[\p{Pd}\p)" + R"({Z}]\d|[\p{Pd}\p{Z}]\d{3}|\d{3}))\d|[\p{Pd}\p{Z}]\d{2}(?:(?:[\p{Pd}\p{Z)" + R"(}]\d{2}){2}(?:[\p{Pd}\p{Z}]\d)?|\d{4}(?:[\p{Pd}\p{Z}]?\d)?)|\d{3}(?:(?:)" + R"([\p{Pd}\p{Z}]\d{2}){2}|\d{2}(?:\d[\p{Pd}\p{Z}]\d|\d)?)))|[\p{Pd}\p{Z}]\)" + R"((\d{3}\)[\p{Pd}\p{Z}]\d{3}\p{Pd}\d{3,4})|\(\d{2}(?:\d(?:\)(?:(?:[\p{Pd})" + R"(\p{Z}]\d{3}(?:\p{Pd}\d{2}(?:\d{2}[\p{Pd}\p{Z}]\d{5}|\p{Pd}\d{2}[\p{Pd}\)" + R"(p{Z}])|[\p{Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z}]){2}\d|[\p{Pd}\p{Z}]\d{3}|\d{4)" + R"(})|\d{7}[\p{Pd}\p{Z}]|\d{6})\d|[\p{Pd}\p{Z}]\d{3}(?:\p{Pd}\d{2}(?:\d{2})" + R"((?:[\p{Pd}\p{Z}]\d{3,4})?|\p{Pd}\d{2})|[\p{Pd}\p{Z}](?:\d{2}[\p{Pd}\p{Z)" + R"(}]){2}\d|(?:[\p{Pd}\p{Z}]\d{2}){2}|\d{4}))|\d\)[\p{Pd}\p{Z}]\d{2}(?:(?:)" + R"(\p{Pd}\d{2}){2}(?:[\p{Pd}\p{Z}]\d)?|\d(?:[\p{Pd}\p{Z}]\d{2}){2}))|\)[\p)" + R"({Pd}\p{Z}]\d{3}(?:\p{Pd}\d{2}\p{Pd}|[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}])\d{)" + R"(2})|\d(?:[\p{Pd}\p{Z}]\(\d{3}(?:\d\)[\p{Pd}\p{Z}](?:\d{2}\p{Pd}){2}|\)()" + R"(?:[\p{Pd}\p{Z}]\d{3}[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}]?|[\p{Pd}\p{Z}]?\d{5)" + R"(}))\d{2}|\d(?:\d(?:(?:(?:\p{Pd}\d{3}\p{Pd}\d{4}[\p{Pd}\p{Z}](?:\d{2}|\d)" + R"()|\d\p{Pd}(?:\d{2}[\p{Pd}\p{Z}]){3}|\d{3}[\p{Pd}\p{Z}]\d{3}|\d\p{Pd}\d{)" + R"(5})\d|\d\p{Pd}(?:\d{2}[\p{Pd}\p{Z}]){3}|\d{3}[\p{Pd}\p{Z}]\d{3}|\d\p{Pd)" + R"(}\d{5})\d|[\p{Pd}\p{Z}]\d{4}(?:(?:\p{Pd}\d{3}[\p{Pd}\p{Z}])?\d{4}|\d{1,)" + R"(3})|\d(?:(?:\p{Pd}\d{2}(?:\d[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}]\d|[\p{Pd}\p)" + R"({Z}]\d{2}[\p{Pd}\p{Z}]\d|\d[\p{Pd}\p{Z}]\d|\d)|(?:[\p{Pd}\p{Z}]\d{2}|\d)" + R"([\p{Pd}\p{Z}]\d|\d\/)\d{5})\d|[\p{Pd}\p{Z}]\d{4,7}|\d(?:[\p{Pd}\p{Z}]\d)" + R"({4,6}|\/\d{4,5}))|\p{Pd}\d{3}(?:\p{Pd}\d{3,4}|\d))|[\p{Pd}\p{Z}]\d{2}(?)" + R"(:\d{2}(?:\p{Pd}?\d)?\d|[\p{Pd}\p{Z}]\d{2}[\p{Pd}\p{Z}])\d{2})))(?i:[\,\)" + R"(;]?(?:\p{Z})?(?:[x\#\~]|ext[\.\:\=]?)(?:\p{Z})?\d{1,6})?)(?:$|(?sm:\b)|)" + R"(\p{Z})(?:$|\p{Z}(?:$|[^\p{Z}\d\/+=#\p{Pd}])|\.(?:$|\D)|[^.\p{Z}\d\/+=#\)" + R"(p{Pd}]))"; + void PrecompilePhoneNumberRegexes() { SCOPED_UMA_HISTOGRAM_TIMER("Sharing.ClickToCallPhoneNumberPrecompileTime"); static const char kExampleInput[] = "+01(2)34-5678 9012"; std::string parsed; - for (auto variant : {PhoneNumberRegexVariant::kSimple}) { + for (auto variant : {PhoneNumberRegexVariant::kSimple, + PhoneNumberRegexVariant::kLowConfidenceModified}) { // Run RE2::PartialMatch over some example input to speed up future queries. re2::RE2::PartialMatch(kExampleInput, GetPhoneNumberRegex(variant), &parsed); @@ -38,10 +145,14 @@ const re2::RE2& GetPhoneNumberRegex(PhoneNumberRegexVariant variant) { static const re2::LazyRE2 kRegexSimple = {kPhoneNumberRegexPatternSimple}; + static const re2::LazyRE2 kRegexLowConfidenceModified = { + kPhoneNumberRegexPatternLowConfidenceModified}; switch (variant) { case PhoneNumberRegexVariant::kSimple: return *kRegexSimple; + case PhoneNumberRegexVariant::kLowConfidenceModified: + return *kRegexLowConfidenceModified; } }
diff --git a/chrome/browser/sharing/click_to_call/phone_number_regex.h b/chrome/browser/sharing/click_to_call/phone_number_regex.h index 8a045a38..30aab61 100644 --- a/chrome/browser/sharing/click_to_call/phone_number_regex.h +++ b/chrome/browser/sharing/click_to_call/phone_number_regex.h
@@ -5,8 +5,15 @@ #ifndef CHROME_BROWSER_SHARING_CLICK_TO_CALL_PHONE_NUMBER_REGEX_H_ #define CHROME_BROWSER_SHARING_CLICK_TO_CALL_PHONE_NUMBER_REGEX_H_ -#include "chrome/browser/sharing/sharing_metrics.h" -#include "third_party/re2/src/re2/re2.h" +namespace re2 { +class RE2; +} // namespace re2 + +// Phone number regex to use to detect numbers from text selections. +enum class PhoneNumberRegexVariant { + kSimple = 0, + kLowConfidenceModified = 1, +}; // Returns an RE2 instance for the given |variant| to detect phone numbers. const re2::RE2& GetPhoneNumberRegex(PhoneNumberRegexVariant variant);
diff --git a/chrome/browser/sharing/sharing_device_registration_unittest.cc b/chrome/browser/sharing/sharing_device_registration_unittest.cc index 727e8301..9c6e7e34 100644 --- a/chrome/browser/sharing/sharing_device_registration_unittest.cc +++ b/chrome/browser/sharing/sharing_device_registration_unittest.cc
@@ -85,7 +85,7 @@ void ValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) override { + ValidateTokenCallback callback) override { NOTIMPLEMENTED(); }
diff --git a/chrome/browser/sharing/sharing_metrics.cc b/chrome/browser/sharing/sharing_metrics.cc index e68a3832..fe0ab5c 100644 --- a/chrome/browser/sharing/sharing_metrics.cc +++ b/chrome/browser/sharing/sharing_metrics.cc
@@ -4,19 +4,9 @@ #include "chrome/browser/sharing/sharing_metrics.h" -#include <string.h> -#include <algorithm> - #include "base/metrics/histogram_functions.h" -#include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h" #include "chrome/browser/sharing/sharing_device_registration_result.h" -#include "components/cast_channel/enum_table.h" -#include "components/ukm/content/source_url_recorder.h" -#include "content/public/browser/web_contents.h" -#include "services/metrics/public/cpp/ukm_builders.h" -#include "services/metrics/public/cpp/ukm_recorder.h" -#include "services/metrics/public/cpp/ukm_source_id.h" namespace { const char* GetEnumStringValue(SharingFeatureName feature) { @@ -33,34 +23,6 @@ } } -// The returned values must match the values of the SharingClickToCallEntryPoint -// suffixes defined in histograms.xml. -const char* ClickToCallEntryPointToSuffix( - SharingClickToCallEntryPoint entry_point) { - switch (entry_point) { - case SharingClickToCallEntryPoint::kLeftClickLink: - return "LeftClickLink"; - case SharingClickToCallEntryPoint::kRightClickLink: - return "RightClickLink"; - case SharingClickToCallEntryPoint::kRightClickSelection: - return "RightClickSelection"; - } -} - -const char* PhoneNumberRegexVariantToSuffix(PhoneNumberRegexVariant variant) { - switch (variant) { - case PhoneNumberRegexVariant::kSimple: - // Keep the initial regex in the default metric. - return ""; - } -} - -// The returned values must match the values of the -// SharingClickToCallSendToDevice suffixes defined in histograms.xml. -const char* SendToDeviceToSuffix(bool send_to_device) { - return send_to_device ? "Sending" : "Showing"; -} - const std::string& MessageTypeToMessageSuffix( chrome_browser_sharing::MessageType message_type) { // For proto3 enums unrecognized enum values are kept when parsing and their @@ -75,18 +37,6 @@ } } // namespace -ScopedUmaHistogramMicrosecondsTimer::ScopedUmaHistogramMicrosecondsTimer( - PhoneNumberRegexVariant variant) - : variant_(variant) {} - -ScopedUmaHistogramMicrosecondsTimer::~ScopedUmaHistogramMicrosecondsTimer() { - base::UmaHistogramCustomMicrosecondsTimes( - base::StrCat({"Sharing.ClickToCallContextMenuPhoneNumberParsingDelay", - PhoneNumberRegexVariantToSuffix(variant_)}), - timer_.Elapsed(), base::TimeDelta::FromMicroseconds(1), - base::TimeDelta::FromSeconds(1), 50); -} - chrome_browser_sharing::MessageType SharingPayloadCaseToMessageType( chrome_browser_sharing::SharingMessage::PayloadCase payload_case) { switch (payload_case) { @@ -244,10 +194,6 @@ type); } -void LogClickToCallHelpTextClicked(SharingDialogType type) { - base::UmaHistogramEnumeration("Sharing.ClickToCallHelpTextClicked", type); -} - void LogSendSharingMessageResult( chrome_browser_sharing::MessageType message_type, SharingSendMessageResult result) { @@ -268,53 +214,11 @@ result); } -void LogClickToCallUKM(content::WebContents* web_contents, - SharingClickToCallEntryPoint entry_point, - bool has_devices, - bool has_apps, - SharingClickToCallSelection selection) { - ukm::UkmRecorder* ukm_recorder = ukm::UkmRecorder::Get(); - if (!ukm_recorder) - return; - - ukm::SourceId source_id = - ukm::GetSourceIdForWebContentsDocument(web_contents); - if (source_id == ukm::kInvalidSourceId) - return; - - ukm::builders::Sharing_ClickToCall(source_id) - .SetEntryPoint(static_cast<int64_t>(entry_point)) - .SetHasDevices(has_devices) - .SetHasApps(has_apps) - .SetSelection(static_cast<int64_t>(selection)) - .Record(ukm_recorder); -} - void LogSharedClipboardSelectedTextSize(size_t size) { base::UmaHistogramCounts100000("Sharing.SharedClipboardSelectedTextSize", size); } -void LogClickToCallPhoneNumberSize(const std::string& number, - SharingClickToCallEntryPoint entry_point, - bool send_to_device) { - int length = number.size(); - int digits = std::count_if(number.begin(), number.end(), - [](char c) { return std::isdigit(c); }); - - std::string suffix = - base::StrCat({ClickToCallEntryPointToSuffix(entry_point), ".", - SendToDeviceToSuffix(send_to_device)}); - - base::UmaHistogramCounts100("Sharing.ClickToCallPhoneNumberLength", length); - base::UmaHistogramCounts100( - base::StrCat({"Sharing.ClickToCallPhoneNumberLength.", suffix}), length); - - base::UmaHistogramCounts100("Sharing.ClickToCallPhoneNumberDigits", digits); - base::UmaHistogramCounts100( - base::StrCat({"Sharing.ClickToCallPhoneNumberDigits.", suffix}), digits); -} - void LogRemoteCopyHandleMessageResult(RemoteCopyHandleMessageResult result) { base::UmaHistogramEnumeration("Sharing.RemoteCopyHandleMessageResult", result);
diff --git a/chrome/browser/sharing/sharing_metrics.h b/chrome/browser/sharing/sharing_metrics.h index e38efd5c..8539d7b 100644 --- a/chrome/browser/sharing/sharing_metrics.h +++ b/chrome/browser/sharing/sharing_metrics.h
@@ -5,27 +5,14 @@ #ifndef CHROME_BROWSER_SHARING_SHARING_METRICS_H_ #define CHROME_BROWSER_SHARING_SHARING_METRICS_H_ -#include <string> - -#include "base/macros.h" #include "base/time/time.h" -#include "base/timer/elapsed_timer.h" #include "chrome/browser/sharing/shared_clipboard/remote_copy_handle_message_result.h" #include "chrome/browser/sharing/sharing_constants.h" #include "chrome/browser/sharing/sharing_send_message_result.h" #include "components/sync/protocol/sharing_message.pb.h" -namespace content { -class WebContents; -} // namespace content - enum class SharingDeviceRegistrationResult; -// Phone number regex to use to detect numbers from text selections. -enum class PhoneNumberRegexVariant { - kSimple = 0, -}; - // Result of VAPID key creation during Sharing registration. // These values are logged to UMA. Entries should not be renumbered and numeric // values should never be reused. Please keep in sync with @@ -54,45 +41,6 @@ // defined in histograms.xml. const char kSharingUiContextMenu[] = "ContextMenu"; const char kSharingUiDialog[] = "Dialog"; -// Entry point of a Click to Call journey. -// These values are logged to UKM. Entries should not be renumbered and numeric -// values should never be reused. Please keep in sync with -// "SharingClickToCallEntryPoint" in src/tools/metrics/histograms/enums.xml. -enum class SharingClickToCallEntryPoint { - kLeftClickLink = 0, - kRightClickLink = 1, - kRightClickSelection = 2, - kMaxValue = kRightClickSelection, -}; - -// Selection at the end of a Click to Call journey. -// These values are logged to UKM. Entries should not be renumbered and numeric -// values should never be reused. Please keep in sync with -// "SharingClickToCallSelection" in src/tools/metrics/histograms/enums.xml. -enum class SharingClickToCallSelection { - kNone = 0, - kDevice = 1, - kApp = 2, - kMaxValue = kApp, -}; - -// TODO(himanshujaju): Make it generic and move to base/metrics/histogram_base.h -// Used to Log delay in parsing phone number in highlighted text to UMA. -struct ScopedUmaHistogramMicrosecondsTimer { - explicit ScopedUmaHistogramMicrosecondsTimer(PhoneNumberRegexVariant variant); - ~ScopedUmaHistogramMicrosecondsTimer(); - - private: - const PhoneNumberRegexVariant variant_; - const base::ElapsedTimer timer_; - - DISALLOW_COPY_AND_ASSIGN(ScopedUmaHistogramMicrosecondsTimer); -}; - -// These histogram suffixes must match the ones in SharingClickToCallUi defined -// in histograms.xml. -const char kSharingClickToCallUiContextMenu[] = "ContextMenu"; -const char kSharingClickToCallUiDialog[] = "Dialog"; chrome_browser_sharing::MessageType SharingPayloadCaseToMessageType( chrome_browser_sharing::SharingMessage::PayloadCase payload_case); @@ -160,10 +108,6 @@ // Logs to UMA the |type| of dialog shown for sharing feature. void LogSharingDialogShown(SharingFeatureName feature, SharingDialogType type); -// Logs the dialog type when a user clicks on the help text in the Click to Call -// dialog. -void LogClickToCallHelpTextClicked(SharingDialogType type); - // Logs to UMA result of sending a SharingMessage. This should not be called for // sending ack messages. void LogSendSharingMessageResult( @@ -175,22 +119,9 @@ chrome_browser_sharing::MessageType message_type, SharingSendMessageResult result); -// Records a Click to Call selection to UKM. This is logged after a completed -// action like selecting an app or a device to send the phone number to. -void LogClickToCallUKM(content::WebContents* web_contents, - SharingClickToCallEntryPoint entry_point, - bool has_devices, - bool has_apps, - SharingClickToCallSelection selection); - // Logs to UMA the size of the selected text for Shared Clipboard. void LogSharedClipboardSelectedTextSize(size_t text_size); -// Logs the raw phone number length and the number of digits in it. -void LogClickToCallPhoneNumberSize(const std::string& number, - SharingClickToCallEntryPoint entry_point, - bool send_to_device); - // Logs to UMA the result of handling a Remote Copy message. void LogRemoteCopyHandleMessageResult(RemoteCopyHandleMessageResult result);
diff --git a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc index 9b57b2d..a4b6538 100644 --- a/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_passwords_sync_test.cc
@@ -14,6 +14,7 @@ #include "chrome/browser/sync/test/integration/sync_test.h" #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" #include "components/password_manager/core/browser/password_manager_test_utils.h" +#include "components/password_manager/core/browser/password_manager_util.h" #include "components/password_manager/core/browser/sync/password_sync_bridge.h" #include "components/password_manager/core/common/password_manager_features.h" #include "components/signin/public/identity_manager/identity_test_utils.h" @@ -65,6 +66,18 @@ return encrypted_specifics; } +class PasswordSyncActiveChecker : public SingleClientStatusChangeChecker { + public: + explicit PasswordSyncActiveChecker(syncer::ProfileSyncService* service) + : SingleClientStatusChangeChecker(service) {} + ~PasswordSyncActiveChecker() override = default; + + // SingleClientStatusChangeChecker. + bool IsExitConditionSatisfied(std::ostream* os) override { + return service()->GetActiveDataTypes().Has(syncer::PASSWORDS); + } +}; + class SingleClientPasswordsSyncTest : public FeatureToggler, public SyncTest { public: SingleClientPasswordsSyncTest() @@ -445,8 +458,13 @@ // that Sync will start in transport mode). ASSERT_TRUE(GetClient(0)->SignInPrimaryAccount()); ASSERT_TRUE(GetClient(0)->AwaitSyncTransportActive()); - ASSERT_FALSE(GetSyncService(0)->IsSyncFeatureEnabled()); + + // Let the user opt in to the passwords account storage, and wait for it to + // become active. + password_manager_util::SetAccountStorageOptIn(GetProfile(0)->GetPrefs(), + GetSyncService(0), true); + PasswordSyncActiveChecker(GetSyncService(0)).Wait(); ASSERT_TRUE(GetSyncService(0)->GetActiveDataTypes().Has(syncer::PASSWORDS)); // Make sure the password showed up in the account store and not in the @@ -474,8 +492,13 @@ secondary_account_helper::SignInSecondaryAccount( GetProfile(0), &test_url_loader_factory_, "user@email.com"); ASSERT_TRUE(GetClient(0)->AwaitSyncTransportActive()); - ASSERT_FALSE(GetSyncService(0)->IsSyncFeatureEnabled()); + + // Let the user opt in to the passwords account storage, and wait for it to + // become active. + password_manager_util::SetAccountStorageOptIn(GetProfile(0)->GetPrefs(), + GetSyncService(0), true); + PasswordSyncActiveChecker(GetSyncService(0)).Wait(); ASSERT_TRUE(GetSyncService(0)->GetActiveDataTypes().Has(syncer::PASSWORDS)); // Make sure the password showed up in the account store and not in the @@ -538,6 +561,12 @@ ASSERT_TRUE(GetClient(0)->AwaitSyncTransportActive()); ASSERT_FALSE(GetSyncService(0)->IsSyncFeatureEnabled()); + // Let the user opt in to the passwords account storage, and wait for it to + // become active. + password_manager_util::SetAccountStorageOptIn(GetProfile(0)->GetPrefs(), + GetSyncService(0), true); + PasswordSyncActiveChecker(GetSyncService(0)).Wait(); + // Make sure the password showed up in the account store. password_manager::PasswordStore* account_store = passwords_helper::GetAccountPasswordStore(0); @@ -572,6 +601,12 @@ ASSERT_TRUE(GetClient(0)->AwaitSyncTransportActive()); ASSERT_FALSE(GetSyncService(0)->IsSyncFeatureEnabled()); + // Let the user opt in to the passwords account storage, and wait for it to + // become active. + password_manager_util::SetAccountStorageOptIn(GetProfile(0)->GetPrefs(), + GetSyncService(0), true); + PasswordSyncActiveChecker(GetSyncService(0)).Wait(); + // Make sure the password showed up in the account store. password_manager::PasswordStore* account_store = passwords_helper::GetAccountPasswordStore(0); @@ -620,6 +655,12 @@ ASSERT_TRUE(GetClient(0)->AwaitSyncTransportActive()); ASSERT_FALSE(GetSyncService(0)->IsSyncFeatureEnabled()); + // Let the user opt in to the passwords account storage, and wait for it to + // become active. + password_manager_util::SetAccountStorageOptIn(GetProfile(0)->GetPrefs(), + GetSyncService(0), true); + PasswordSyncActiveChecker(GetSyncService(0)).Wait(); + // Make sure the password showed up in the account store. password_manager::PasswordStore* account_store = passwords_helper::GetAccountPasswordStore(0);
diff --git a/chrome/browser/sync/test/integration/sync_test.h b/chrome/browser/sync/test/integration/sync_test.h index 068f7dcc..91cfa3c3 100644 --- a/chrome/browser/sync/test/integration/sync_test.h +++ b/chrome/browser/sync/test/integration/sync_test.h
@@ -113,7 +113,7 @@ void ValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) override {} + ValidateTokenCallback callback) override {} void DeleteToken(const std::string& authorized_entity, const std::string& scope,
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 6272da6..89640352 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -3425,10 +3425,6 @@ "views/relaunch_notification/relaunch_required_dialog_view.cc", "views/relaunch_notification/relaunch_required_dialog_view.h", "views/screen_capture_notification_ui_views.cc", - "views/sync/bubble_sync_promo_view.cc", - "views/sync/bubble_sync_promo_view.h", - "views/sync/bubble_sync_promo_view_util.cc", - "views/sync/bubble_sync_promo_view_util.h", "views/sync/dice_bubble_sync_promo_view.cc", "views/sync/dice_bubble_sync_promo_view.h", "views/sync/dice_signin_button_view.cc",
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd index a8d06589..3ff6593 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3529,7 +3529,7 @@ Phone numbers </message> <message name="IDS_TOP_VIEW_ICON_FILTER_LABEL" desc="The label shown for the icon filter toggle button (allowing the user to exclude icons)."> - Icons + Profile photos </message> <message name="IDS_CONTACTS_PICKER_MORE_DETAILS" desc="Label describing that the user has one or more telephone/emails (used for either)."> {DETAIL_COUNT, plural,
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_TOP_VIEW_ICON_FILTER_LABEL.png.sha1 b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_TOP_VIEW_ICON_FILTER_LABEL.png.sha1 index 57f1d4b..5dabfcdc 100644 --- a/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_TOP_VIEW_ICON_FILTER_LABEL.png.sha1 +++ b/chrome/browser/ui/android/strings/android_chrome_strings_grd/IDS_TOP_VIEW_ICON_FILTER_LABEL.png.sha1
@@ -1 +1 @@ -8fc40d4329e025b0eeea4789fff384fa2b86a54d \ No newline at end of file +f5df0cce2bd690e26010b2284b64c57b506ed14f \ No newline at end of file
diff --git a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc index dee6114..087f16c 100644 --- a/chrome/browser/ui/autofill/autofill_popup_layout_model.cc +++ b/chrome/browser/ui/autofill/autofill_popup_layout_model.cc
@@ -193,6 +193,7 @@ case POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY: case POPUP_ITEM_ID_GENERATE_PASSWORD_ENTRY: case POPUP_ITEM_ID_SHOW_ACCOUNT_CARDS: + case POPUP_ITEM_ID_PASSWORD_SYNC_OPTIN: return normal_font_list_; case POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY: case POPUP_ITEM_ID_DATALIST_ENTRY:
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc index 8c621e69..6d05f4a 100644 --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.cc
@@ -39,6 +39,7 @@ #include "components/autofill/core/common/autofill_prefs.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_buildflags.h" +#include "components/signin/public/base/signin_pref_names.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/strings/grit/components_strings.h" #include "components/sync/driver/sync_service.h" @@ -361,6 +362,9 @@ if (is_upload_save_) return false; + if (!GetProfile()->GetPrefs()->GetBoolean(::prefs::kSigninAllowed)) + return false; + const syncer::SyncService* sync_service = ProfileSyncServiceFactory::GetForProfile(GetProfile());
diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc index b471d13..43d514c 100644 --- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc
@@ -80,20 +80,20 @@ return browser()->bookmark_bar_state() == BookmarkBar::SHOW; } - static void CheckAnimation(Browser* browser, const base::Closure& quit_task) { + static void CheckAnimation(Browser* browser, base::OnceClosure* quit_task) { if (!browser->window()->IsBookmarkBarAnimating()) - quit_task.Run(); + std::move(*quit_task).Run(); } base::TimeDelta WaitForBookmarkBarAnimationToFinish() { base::Time start(base::Time::Now()); scoped_refptr<content::MessageLoopRunner> runner = new content::MessageLoopRunner; + base::OnceClosure quit_closure = runner->QuitClosure(); base::RepeatingTimer timer; - timer.Start( - FROM_HERE, base::TimeDelta::FromMilliseconds(15), - base::BindRepeating(&CheckAnimation, browser(), runner->QuitClosure())); + timer.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(15), + base::BindRepeating(&CheckAnimation, browser(), &quit_closure)); runner->Run(); return base::Time::Now() - start; }
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 9456b9b..99768c8 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc
@@ -1773,9 +1773,9 @@ namespace { -void OnZoomLevelChanged(const base::Closure& callback, +void OnZoomLevelChanged(base::OnceClosure* callback, const HostZoomMap::ZoomLevelChange& host) { - callback.Run(); + std::move(*callback).Run(); } } // namespace @@ -1801,8 +1801,9 @@ { scoped_refptr<content::MessageLoopRunner> loop_runner( new content::MessageLoopRunner); + base::OnceClosure quit_closure = loop_runner->QuitClosure(); content::HostZoomMap::ZoomLevelChangedCallback callback( - base::Bind(&OnZoomLevelChanged, loop_runner->QuitClosure())); + base::BindRepeating(&OnZoomLevelChanged, &quit_closure)); std::unique_ptr<content::HostZoomMap::Subscription> sub = content::HostZoomMap::GetDefaultForBrowserContext(browser()->profile()) ->AddZoomLevelChangedCallback(callback); @@ -1817,8 +1818,9 @@ { scoped_refptr<content::MessageLoopRunner> loop_runner( new content::MessageLoopRunner); + base::OnceClosure quit_closure = loop_runner->QuitClosure(); content::HostZoomMap::ZoomLevelChangedCallback callback( - base::Bind(&OnZoomLevelChanged, loop_runner->QuitClosure())); + base::Bind(&OnZoomLevelChanged, &quit_closure)); std::unique_ptr<content::HostZoomMap::Subscription> sub = content::HostZoomMap::GetDefaultForBrowserContext(browser()->profile()) ->AddZoomLevelChangedCallback(callback); @@ -1833,8 +1835,9 @@ { scoped_refptr<content::MessageLoopRunner> loop_runner( new content::MessageLoopRunner); + base::OnceClosure quit_closure = loop_runner->QuitClosure(); content::HostZoomMap::ZoomLevelChangedCallback callback( - base::Bind(&OnZoomLevelChanged, loop_runner->QuitClosure())); + base::Bind(&OnZoomLevelChanged, &quit_closure)); std::unique_ptr<content::HostZoomMap::Subscription> sub = content::HostZoomMap::GetDefaultForBrowserContext(browser()->profile()) ->AddZoomLevelChangedCallback(callback);
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 2bb0ffc7..3bb67757 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -688,17 +688,25 @@ } #if !defined(OS_CHROMEOS) - if (!process_startup && - base::FeatureList::IsEnabled(features::kOnConnectNative) && + if (base::FeatureList::IsEnabled(features::kOnConnectNative) && command_line.HasSwitch(switches::kNativeMessagingConnectHost) && command_line.HasSwitch(switches::kNativeMessagingConnectExtension)) { - silent_launch = true; extensions::LaunchNativeMessageHostFromNativeApp( command_line.GetSwitchValueASCII( switches::kNativeMessagingConnectExtension), command_line.GetSwitchValueASCII(switches::kNativeMessagingConnectHost), command_line.GetSwitchValueASCII(switches::kNativeMessagingConnectId), last_used_profile); + + // Chrome's lifetime, if the specified extension and native messaging host + // are both valid and a connection is established, is prolonged by + // BackgroundModeManager. If |process_startup| is true, --no-startup-window + // must be set or a browser window must be created for BackgroundModeManager + // to start background mode. Without this, nothing will take the first + // keep-alive and the browser process will not terminate. To avoid this + // situation, don't set |silent_launch| in response to the native messaging + // connect switches; require the client to pass --no-startup-window if + // suppressing the creation of a window is desired. } #endif
diff --git a/chrome/browser/ui/user_manager.h b/chrome/browser/ui/user_manager.h index 79bd4c01..22fd9d1 100644 --- a/chrome/browser/ui/user_manager.h +++ b/chrome/browser/ui/user_manager.h
@@ -43,9 +43,10 @@ // To be called once the User Manager's contents are showing. static void OnUserManagerShown(); - // Add a callback that will be called when OnUserManagerShown is called. + // Add a callback that will be called the next time OnUserManagerShown is + // called. static void AddOnUserManagerShownCallbackForTesting( - const base::Closure& callback); + base::OnceClosure callback); // Get the path of profile that is being signed in. static base::FilePath GetSigninProfilePath();
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc b/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc index 262a77e..626d195b 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_view_native_views.cc
@@ -957,6 +957,7 @@ case autofill::PopupItemId::POPUP_ITEM_ID_SCAN_CREDIT_CARD: case autofill::PopupItemId::POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO: case autofill::PopupItemId::POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY: + case autofill::PopupItemId::POPUP_ITEM_ID_PASSWORD_SYNC_OPTIN: case autofill::PopupItemId::POPUP_ITEM_ID_SHOW_ACCOUNT_CARDS: // This is a footer, so this suggestion will be processed later. Don't // increment |line_number|, or else it will be skipped when adding
diff --git a/chrome/browser/ui/views/autofill/payments/save_card_manage_cards_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/save_card_manage_cards_bubble_views.cc index 03724499..93ae4666 100644 --- a/chrome/browser/ui/views/autofill/payments/save_card_manage_cards_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/save_card_manage_cards_bubble_views.cc
@@ -18,7 +18,7 @@ #include "ui/views/layout/box_layout.h" #if !defined(OS_CHROMEOS) -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h" +#include "chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h" #endif namespace { @@ -52,27 +52,17 @@ #else if (!controller()->ShouldShowSignInPromo()) return nullptr; - sync_promo_delegate_ = std::make_unique<SaveCardManageCardsBubbleViews::SyncPromoDelegate>( controller(), signin_metrics::AccessPoint::ACCESS_POINT_MANAGE_CARDS_BUBBLE); - - BubbleSyncPromoViewParams params; - params.link_text_resource_id = IDS_AUTOFILL_SIGNIN_PROMO_LINK_DICE_DISABLED; - params.message_text_resource_id = - IDS_AUTOFILL_SIGNIN_PROMO_MESSAGE_DICE_DISABLED; - params.dice_no_accounts_promo_message_resource_id = - IDS_AUTOFILL_SIGNIN_PROMO_MESSAGE; - params.dice_accounts_promo_message_resource_id = - IDS_AUTOFILL_SYNC_PROMO_MESSAGE; - params.dice_signin_button_prominent = false; - params.dice_text_style = views::style::STYLE_SECONDARY; - - auto promo_view = CreateBubbleSyncPromoView( - controller()->GetProfile(), sync_promo_delegate_.get(), - signin_metrics::AccessPoint::ACCESS_POINT_MANAGE_CARDS_BUBBLE, params); - + std::unique_ptr<views::View> promo_view = + std::make_unique<DiceBubbleSyncPromoView>( + controller()->GetProfile(), sync_promo_delegate_.get(), + signin_metrics::AccessPoint::ACCESS_POINT_MANAGE_CARDS_BUBBLE, + IDS_AUTOFILL_SYNC_PROMO_MESSAGE, + /*dice_signin_button_prominent=*/false, + views::style::STYLE_SECONDARY); DCHECK(promo_view); InitFootnoteView(promo_view.get()); return promo_view;
diff --git a/chrome/browser/ui/views/autofill/payments/save_card_sign_in_promo_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/save_card_sign_in_promo_bubble_views.cc index a0d0ce3b..5910eb3f 100644 --- a/chrome/browser/ui/views/autofill/payments/save_card_sign_in_promo_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/save_card_sign_in_promo_bubble_views.cc
@@ -18,7 +18,7 @@ #include "ui/views/layout/box_layout.h" #if !defined(OS_CHROMEOS) -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h" +#include "chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h" #endif namespace autofill { @@ -49,16 +49,12 @@ std::make_unique<SaveCardSignInPromoBubbleViews::SyncPromoDelegate>( controller(), signin_metrics::AccessPoint::ACCESS_POINT_SAVE_CARD_BUBBLE); - - BubbleSyncPromoViewParams params; - params.link_text_resource_id = IDS_AUTOFILL_SIGNIN_PROMO_LINK_DICE_DISABLED; - params.message_text_resource_id = - IDS_AUTOFILL_SIGNIN_PROMO_MESSAGE_DICE_DISABLED; - - std::unique_ptr<views::View> signin_view = CreateBubbleSyncPromoView( - controller()->GetProfile(), sync_promo_delegate_.get(), - signin_metrics::AccessPoint::ACCESS_POINT_SAVE_CARD_BUBBLE, params); - + std::unique_ptr<views::View> signin_view = + std::make_unique<DiceBubbleSyncPromoView>( + controller()->GetProfile(), sync_promo_delegate_.get(), + signin_metrics::AccessPoint::ACCESS_POINT_SAVE_CARD_BUBBLE, + /*dice_accounts_promo_message_resource_id=*/0, + /*dice_signin_button_prominent=*/true); signin_view->SetID(DialogViewId::SIGN_IN_VIEW); view->AddChildView(signin_view.release()); #endif
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index 5bcb8c2e..36bd9c4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -33,7 +33,7 @@ #include "ui/views/widget/widget.h" #if !defined(OS_CHROMEOS) -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h" +#include "chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h" #endif using base::UserMetricsAction; @@ -309,17 +309,10 @@ if (!SyncPromoUI::ShouldShowSyncPromo(profile_)) return nullptr; - BubbleSyncPromoViewParams params; - params.link_text_resource_id = IDS_BOOKMARK_SYNC_PROMO_LINK; - params.message_text_resource_id = IDS_BOOKMARK_SYNC_PROMO_MESSAGE; - params.dice_no_accounts_promo_message_resource_id = - IDS_BOOKMARK_DICE_PROMO_SIGNIN_MESSAGE; - params.dice_accounts_promo_message_resource_id = - IDS_BOOKMARK_DICE_PROMO_SYNC_MESSAGE; - params.dice_signin_button_prominent = false; - - return CreateBubbleSyncPromoView( + return std::make_unique<DiceBubbleSyncPromoView>( profile_, delegate_.get(), - signin_metrics::AccessPoint::ACCESS_POINT_BOOKMARK_BUBBLE, params); + signin_metrics::AccessPoint::ACCESS_POINT_BOOKMARK_BUBBLE, + IDS_BOOKMARK_DICE_PROMO_SYNC_MESSAGE, + /*dice_signin_button_prominent=*/false); #endif }
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc index 8dfd564..3209bf92 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc
@@ -51,7 +51,7 @@ #include "ui/views/layout/box_layout.h" #if !defined(OS_CHROMEOS) -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h" +#include "chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h" #endif using extensions::Extension; @@ -124,18 +124,11 @@ if (!(bubble_options & ExtensionInstalledBubble::SIGN_IN_PROMO)) return nullptr; - BubbleSyncPromoViewParams params; - params.link_text_resource_id = IDS_EXTENSION_INSTALLED_SYNC_PROMO_LINK_NEW; - params.message_text_resource_id = IDS_EXTENSION_INSTALLED_SYNC_PROMO_NEW; - params.dice_no_accounts_promo_message_resource_id = - IDS_EXTENSION_INSTALLED_DICE_PROMO_SIGNIN_MESSAGE; - params.dice_accounts_promo_message_resource_id = - IDS_EXTENSION_INSTALLED_DICE_PROMO_SYNC_MESSAGE; - - return CreateBubbleSyncPromoView( + return std::make_unique<DiceBubbleSyncPromoView>( profile, delegate, signin_metrics::AccessPoint::ACCESS_POINT_EXTENSION_INSTALL_BUBBLE, - params); + IDS_EXTENSION_INSTALLED_DICE_PROMO_SYNC_MESSAGE, + /*dice_signin_button_prominent=*/true); #endif }
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.cc b/chrome/browser/ui/views/profiles/profile_menu_view.cc index 3bbb230..439f206f 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
@@ -66,6 +66,7 @@ constexpr float kShortcutIconToImageRatio = 9.0 / 16.0; +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Number of times the Dice sign-in promo illustration should be shown. constexpr int kDiceSigninPromoIllustrationShowCountMax = 10; @@ -77,6 +78,7 @@ return entry; } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. BadgedProfilePhoto::BadgeType GetProfileBadgeType(Profile* profile) { if (profile->IsSupervised()) { return profile->IsChild() ? BadgedProfilePhoto::BADGE_TYPE_CHILD @@ -114,6 +116,7 @@ return client->AreSigninCookiesDeletedOnExit(); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. #if BUILDFLAG(GOOGLE_CHROME_BRANDING) // Returns the Google G icon in grey and with a padding of 2. The padding is // needed to make the icon look smaller, otherwise it looks too big compared to @@ -182,11 +185,13 @@ ProfileMenuView::~ProfileMenuView() = default; void ProfileMenuView::BuildMenu() { + // TODO(crbug.com/993752): Remove after ProfileMenuRevamp. avatar_menu_ = std::make_unique<AvatarMenu>( &g_browser_process->profile_manager()->GetProfileAttributesStorage(), this, browser()); avatar_menu_->RebuildMenu(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. if (!base::FeatureList::IsEnabled(features::kProfileMenuRevamp)) { if (dice_enabled_) { // Fetch DICE accounts. Note: This always includes the primary account if @@ -215,16 +220,18 @@ BuildProfileManagementFeatureButtons(); } +// TODO(crbug.com/993752): Remove after ProfileMenuRevamp. void ProfileMenuView::OnAvatarMenuChanged( AvatarMenu* avatar_menu) { - // TODO(crbug.com/993752): Remove AvatarMenu observer. } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::FocusButtonOnKeyboardOpen() { if (first_profile_button_) first_profile_button_->RequestFocus(); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::OnWidgetClosing(views::Widget* /*widget*/) { // Unsubscribe from everything early so that the updates do not reach the // bubble and change its state. @@ -294,6 +301,7 @@ PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_OPEN_USER_MANAGER); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::OnLockButtonClicked() { RecordClick(ActionableItem::kLockButton); profiles::LockProfile(browser()->profile()); @@ -362,6 +370,7 @@ } } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::OnCurrentProfileCardClicked() { RecordClick(ActionableItem::kCurrentProfileCard); if (dice_enabled_ && @@ -697,6 +706,7 @@ } } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::AddProfileMenuView(AvatarMenu* avatar_menu) { // Separate items into active and alternatives. const AvatarMenu::Item* active_item = nullptr; @@ -735,6 +745,7 @@ AddOptionsView(display_lock, avatar_menu); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. bool ProfileMenuView::AddSyncErrorViewIfNeeded( const AvatarMenu::Item& avatar_item) { int content_string_id, button_string_id; @@ -754,6 +765,7 @@ return true; } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::AddPreDiceSyncErrorView( const AvatarMenu::Item& avatar_item, sync_ui_util::AvatarSyncErrorType error, @@ -780,6 +792,7 @@ } } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::AddDiceSyncErrorView( const AvatarMenu::Item& avatar_item, sync_ui_util::AvatarSyncErrorType error, @@ -832,6 +845,7 @@ } } +// TODO(crbug.com/1021587): Incorporate into ProfileMenuRevamp. void ProfileMenuView::AddSyncPausedReasonCookiesClearedOnExit() { base::string16 link_text = l10n_util::GetStringUTF16( IDS_SYNC_PAUSED_REASON_CLEAR_COOKIES_ON_EXIT_LINK_TEXT); @@ -845,6 +859,7 @@ base::Unretained(this))); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuView::AddCurrentProfileView( const AvatarMenu::Item& avatar_item, bool is_guest) {
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h index 4629a12..444ee1a 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h
@@ -28,6 +28,7 @@ // This bubble view is displayed when the user clicks on the avatar button. // It displays a list of profiles and allows users to switch between profiles. +// TODO(crbug.com/993752): Remove AvatarMenuObserver after ProfileMenuRevamp. class ProfileMenuView : public ProfileMenuViewBase, public AvatarMenuObserver { public: ProfileMenuView(views::Button* anchor_button, @@ -41,6 +42,7 @@ private: friend class ProfileMenuViewExtensionsTest; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // ProfileMenuViewBase: void FocusButtonOnKeyboardOpen() override; @@ -55,11 +57,9 @@ void OnAddressesButtonClicked(); void OnGuestProfileButtonClicked(); void OnManageProfilesButtonClicked(); - void OnLockButtonClicked(); void OnExitProfileButtonClicked(); void OnSyncSettingsButtonClicked(); void OnSyncErrorButtonClicked(sync_ui_util::AvatarSyncErrorType error); - void OnCurrentProfileCardClicked(); void OnSigninButtonClicked(); void OnSigninAccountButtonClicked(AccountInfo account); void OnSignoutButtonClicked(); @@ -68,6 +68,11 @@ void OnAddNewProfileButtonClicked(); void OnEditProfileButtonClicked(); + // TODO(crbug.com/1021587): Remove methods after ProfileMenuRevamp. + void OnLockButtonClicked(); + void OnCurrentProfileCardClicked(); + + // TODO(crbug.com/993752): Remove after ProfileMenuRevamp. // AvatarMenuObserver: void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override; @@ -87,9 +92,11 @@ void BuildSelectableProfiles(); void BuildProfileManagementFeatureButtons(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Adds the profile chooser view. void AddProfileMenuView(AvatarMenu* avatar_menu); + // TODO(crbug.com/1021587): Remove methods below after ProfileMenuRevamp. // Adds the main profile card for the profile |avatar_item|. |is_guest| is // used to determine whether to show any Sign in/Sign out/Manage accounts // links. @@ -101,14 +108,17 @@ void AddAutofillHomeView(); void AddManageGoogleAccountButton(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Adds the DICE UI view to sign in and turn on sync. It includes an // illustration, a promo and a button. void AddDiceSigninView(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Adds a header for signin and sync error surfacing for the user menu. // Returns true if header is created. bool AddSyncErrorViewIfNeeded(const AvatarMenu::Item& avatar_item); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Adds a view showing a sync error and an error button, when dice is not // enabled. void AddPreDiceSyncErrorView(const AvatarMenu::Item& avatar_item, @@ -116,42 +126,53 @@ int button_string_id, int content_string_id); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Adds a view showing the profile associated with |avatar_item| and an error // button below, when dice is enabled. void AddDiceSyncErrorView(const AvatarMenu::Item& avatar_item, sync_ui_util::AvatarSyncErrorType error, int button_string_id); + // TODO(crbug.com/1021587): Add to new profile menu. // Add a view showing that the reason for the sync paused is in the cookie // settings setup. On click, will direct to the cookie settings page. void AddSyncPausedReasonCookiesClearedOnExit(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Adds a promo for signin, if dice is not enabled. void AddPreDiceSigninPromo(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Adds a promo for signin, if dice is enabled. void AddDiceSigninPromo(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Clean-up done after an action was performed in the ProfileChooser. void PostActionPerformed(ProfileMetrics::ProfileDesktopMenu action_performed); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Methods to keep track of the number of times the Dice sign-in promo has // been shown. int GetDiceSigninPromoShowCount() const; void IncrementDiceSigninPromoShowCount(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. std::unique_ptr<AvatarMenu> avatar_menu_; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Button pointers used in tests. views::Button* first_profile_button_ = nullptr; views::Button* lock_button_ = nullptr; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // The current access point of sign in. const signin_metrics::AccessPoint access_point_; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Dice accounts used in the sync promo. std::vector<AccountInfo> dice_accounts_; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. const bool dice_enabled_; DISALLOW_COPY_AND_ASSIGN(ProfileMenuView);
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc index e6808a8..e955616 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -162,6 +162,7 @@ } // namespace +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // MenuItems-------------------------------------------------------------------- ProfileMenuViewBase::MenuItems::MenuItems() @@ -246,6 +247,7 @@ // Items stored for menu generation are removed after menu is finalized, hence // it's not expected to have while destroying the object. DCHECK(g_profile_bubble_ != this); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. DCHECK(menu_item_groups_.empty()); } @@ -569,6 +571,7 @@ void ProfileMenuViewBase::Init() { Reset(); BuildMenu(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. if (!base::FeatureList::IsEnabled(features::kProfileMenuRevamp)) RepopulateViewFromMenuItems(); } @@ -617,6 +620,7 @@ } void ProfileMenuViewBase::Reset() { + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. if (!base::FeatureList::IsEnabled(features::kProfileMenuRevamp)) { menu_item_groups_.clear(); return; @@ -683,6 +687,7 @@ layout->AddView(std::move(scroll_view)); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. int ProfileMenuViewBase::GetMarginSize(GroupMarginSize margin_size) const { switch (margin_size) { case kNone: @@ -699,6 +704,7 @@ } } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuViewBase::AddMenuGroup(bool add_separator) { if (add_separator && !menu_item_groups_.empty()) { DCHECK(!menu_item_groups_.back().items.empty()); @@ -708,6 +714,7 @@ menu_item_groups_.emplace_back(); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuViewBase::AddMenuItemInternal(std::unique_ptr<views::View> view, MenuItems::ItemType item_type) { DCHECK(!menu_item_groups_.empty()); @@ -724,6 +731,7 @@ } } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. views::Button* ProfileMenuViewBase::CreateAndAddTitleCard( std::unique_ptr<views::View> icon_view, const base::string16& title, @@ -739,6 +747,7 @@ return button_ptr; } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. views::Button* ProfileMenuViewBase::CreateAndAddButton( const gfx::ImageSkia& icon, const base::string16& title, @@ -751,6 +760,7 @@ return pointer; } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. views::Button* ProfileMenuViewBase::CreateAndAddBlueButton( const base::string16& text, bool md_style, @@ -772,6 +782,7 @@ return pointer; } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. #if !defined(OS_CHROMEOS) DiceSigninButtonView* ProfileMenuViewBase::CreateAndAddDiceSigninButton( AccountInfo* account_info, @@ -796,6 +807,7 @@ } #endif +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. views::Label* ProfileMenuViewBase::CreateAndAddLabel(const base::string16& text, int text_context) { std::unique_ptr<views::Label> label = @@ -816,6 +828,7 @@ return pointer; } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. views::StyledLabel* ProfileMenuViewBase::CreateAndAddLabelWithLink( const base::string16& text, gfx::Range link_range, @@ -831,6 +844,7 @@ return pointer; } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuViewBase::AddViewItem(std::unique_ptr<views::View> view) { // Add margins. std::unique_ptr<views::View> margined_view = std::make_unique<views::View>(); @@ -847,6 +861,7 @@ click_actions_[clickable_view] = std::move(action); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void ProfileMenuViewBase::RepopulateViewFromMenuItems() { RemoveAllChildViews(true); @@ -941,11 +956,13 @@ } } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. gfx::ImageSkia ProfileMenuViewBase::CreateVectorIcon( const gfx::VectorIcon& icon) { return gfx::CreateVectorIcon(icon, kIconSize, GetDefaultIconColor()); } +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. int ProfileMenuViewBase::GetDefaultIconSize() { return kIconSize; }
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h index e232b61..fdd6e12 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h
@@ -32,6 +32,7 @@ } // namespace views struct AccountInfo; +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. class DiceSigninButtonView; // This class provides the UI for different menus that are created by user @@ -67,6 +68,7 @@ kMaxValue = kEditProfileButton, }; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // MenuItems struct keeps the menu items and meta data for a group of items in // a menu. It takes the ownership of views and passes it to the menu when menu // is constructed. @@ -93,6 +95,7 @@ DISALLOW_COPY_AND_ASSIGN(MenuItems); }; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. enum GroupMarginSize { kNone, kTiny, kSmall, kLarge }; // Shows the bubble if one is not already showing. This allows us to easily @@ -158,10 +161,12 @@ // Should be called inside each button/link action. void RecordClick(ActionableItem item); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Initializes a new group of menu items. A separator is added before them if // |add_separator| is true. void AddMenuGroup(bool add_separator = true); + // TODO(crbug.com/1021587): Remove methods below after ProfileMenuRevamp. // The following functions add different menu items to the latest menu group. // They pass the ownership of the generated item to |menu_item_groups_| and // return a raw pointer to the object. The ownership is transferred to the @@ -200,16 +205,20 @@ views::Button* anchor_button() const { return anchor_button_; } + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. gfx::ImageSkia CreateVectorIcon(const gfx::VectorIcon& icon); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. int GetDefaultIconSize(); private: friend class ProfileMenuViewExtensionsTest; void Reset(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void RepopulateViewFromMenuItems(); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Requests focus for a button when opened by keyboard. virtual void FocusButtonOnKeyboardOpen() {} @@ -240,14 +249,17 @@ void RegisterClickAction(views::View* clickable_view, base::RepeatingClosure action); + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // Returns the size of different margin types. int GetMarginSize(GroupMarginSize margin_size) const; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. void AddMenuItemInternal(std::unique_ptr<views::View> view, MenuItems::ItemType item_type); Browser* const browser_; + // TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // ProfileMenuViewBase takes ownership of all menu_items and passes it to the // underlying view when it is created. std::vector<MenuItems> menu_item_groups_;
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc index 08e3728..957bac4 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_browsertest.cc
@@ -155,6 +155,7 @@ } // namespace +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. class ProfileMenuViewExtensionsTest : public SupportsTestDialog<extensions::ExtensionBrowserTest> { public: @@ -266,6 +267,7 @@ DISALLOW_COPY_AND_ASSIGN(ProfileMenuViewExtensionsTest); }; +// TODO(crbug.com/1021587): Remove after ProfileMenuRevamp. // TODO(crbug.com/932818): Remove this class after // |kAutofillEnableToolbarStatusChip| is cleaned up. Otherwise we need it // because the toolbar is init-ed before each test is set up. Thus need to
diff --git a/chrome/browser/ui/views/profiles/user_manager_view.cc b/chrome/browser/ui/views/profiles/user_manager_view.cc index 42ca9b3..215802a 100644 --- a/chrome/browser/ui/views/profiles/user_manager_view.cc +++ b/chrome/browser/ui/views/profiles/user_manager_view.cc
@@ -55,7 +55,7 @@ // An open User Manager window. There can only be one open at a time. This // is reset to nullptr when the window is closed. UserManagerView* g_user_manager_view = nullptr; -base::Closure* g_user_manager_shown_callback_for_testing = nullptr; +base::OnceClosure* g_user_manager_shown_callback_for_testing = nullptr; bool g_is_user_manager_view_under_construction = false; } // namespace @@ -202,7 +202,7 @@ g_user_manager_view->LogTimeToOpen(); if (g_user_manager_shown_callback_for_testing) { if (!g_user_manager_shown_callback_for_testing->is_null()) - g_user_manager_shown_callback_for_testing->Run(); + std::move(*g_user_manager_shown_callback_for_testing).Run(); delete g_user_manager_shown_callback_for_testing; g_user_manager_shown_callback_for_testing = nullptr; @@ -212,9 +212,10 @@ // static void UserManager::AddOnUserManagerShownCallbackForTesting( - const base::Closure& callback) { + base::OnceClosure callback) { DCHECK(!g_user_manager_shown_callback_for_testing); - g_user_manager_shown_callback_for_testing = new base::Closure(callback); + g_user_manager_shown_callback_for_testing = + new base::OnceClosure(std::move(callback)); } // static
diff --git a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc index 8d587cb..95dee91 100644 --- a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc +++ b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc
@@ -15,12 +15,12 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/policy/policy_test_utils.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h" +#include "chrome/browser/sharing/click_to_call/click_to_call_metrics.h" #include "chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h" #include "chrome/browser/sharing/click_to_call/click_to_call_utils.h" #include "chrome/browser/sharing/click_to_call/feature.h" #include "chrome/browser/sharing/features.h" #include "chrome/browser/sharing/sharing_constants.h" -#include "chrome/browser/sharing/sharing_metrics.h" #include "chrome/browser/sharing/sharing_sync_preference.h" #include "chrome/browser/sync/test/integration/sessions_helper.h" #include "chrome/browser/ui/views/hover_button.h"
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc b/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc deleted file mode 100644 index 76a64ea..0000000 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc +++ /dev/null
@@ -1,56 +0,0 @@ -// Copyright 2013 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. - -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view.h" - -#include <stddef.h> - -#include "base/strings/string16.h" -#include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" -#include "chrome/browser/ui/views/chrome_typography.h" -#include "components/signin/public/identity_manager/account_info.h" -#include "third_party/skia/include/core/SkColor.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/gfx/font.h" -#include "ui/views/controls/styled_label.h" -#include "ui/views/layout/fill_layout.h" - -BubbleSyncPromoView::BubbleSyncPromoView( - BubbleSyncPromoDelegate* delegate, - signin_metrics::AccessPoint access_point, - int link_text_resource_id, - int message_text_resource_id) - : StyledLabel(base::string16(), this), delegate_(delegate) { - size_t offset = 0; - base::string16 link_text = l10n_util::GetStringUTF16(link_text_resource_id); - base::string16 promo_text = - l10n_util::GetStringFUTF16(message_text_resource_id, link_text, &offset); - SetText(promo_text); - - AddStyleRange(gfx::Range(offset, offset + link_text.length()), - views::StyledLabel::RangeStyleInfo::CreateForLink()); - - views::StyledLabel::RangeStyleInfo promo_style; - promo_style.text_style = views::style::STYLE_SECONDARY; - gfx::Range before_link_range(0, offset); - if (!before_link_range.is_empty()) - AddStyleRange(before_link_range, promo_style); - gfx::Range after_link_range(offset + link_text.length(), promo_text.length()); - if (!after_link_range.is_empty()) - AddStyleRange(after_link_range, promo_style); - - signin_metrics::RecordSigninImpressionUserActionForAccessPoint(access_point); -} - -BubbleSyncPromoView::~BubbleSyncPromoView() {} - -const char* BubbleSyncPromoView::GetClassName() const { - return "BubbleSyncPromoView"; -} - -void BubbleSyncPromoView::StyledLabelLinkClicked(views::StyledLabel* label, - const gfx::Range& range, - int event_flags) { - delegate_->OnEnableSync(AccountInfo(), false /* is_default_promo_account */); -}
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view.h b/chrome/browser/ui/views/sync/bubble_sync_promo_view.h deleted file mode 100644 index 560aa97..0000000 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view.h +++ /dev/null
@@ -1,42 +0,0 @@ -// Copyright 2013 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. - -#ifndef CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_H_ -#define CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_H_ - -#include "base/compiler_specific.h" -#include "base/macros.h" -#include "components/signin/public/base/signin_metrics.h" -#include "ui/views/controls/styled_label.h" -#include "ui/views/controls/styled_label_listener.h" - -class BubbleSyncPromoDelegate; - -// Bookmark sync promo displayed at the bottom of the bookmark bubble. -class BubbleSyncPromoView : public views::StyledLabel, - public views::StyledLabelListener { - public: - // |delegate| is not owned by BubbleSyncPromoView. - BubbleSyncPromoView(BubbleSyncPromoDelegate* delegate, - signin_metrics::AccessPoint access_point, - int link_text_resource_id, - int message_text_resource_id); - ~BubbleSyncPromoView() override; - - private: - // views::StyledLabel: - const char* GetClassName() const override; - - // views::StyledLabelListener: - void StyledLabelLinkClicked(views::StyledLabel* label, - const gfx::Range& range, - int event_flags) override; - - // Delegate, to handle clicks on the sign in link. - BubbleSyncPromoDelegate* delegate_; - - DISALLOW_COPY_AND_ASSIGN(BubbleSyncPromoView); -}; - -#endif // CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_H_
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc b/chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc deleted file mode 100644 index 3a65ca7..0000000 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc +++ /dev/null
@@ -1,56 +0,0 @@ -// Copyright 2013 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. - -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view.h" - -#include <memory> - -#include "base/compiler_specific.h" -#include "base/macros.h" -#include "base/strings/utf_string_conversions.h" -#include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h" -#include "chrome/grit/chromium_strings.h" -#include "chrome/grit/generated_resources.h" -#include "chrome/test/views/chrome_views_test_base.h" -#include "components/signin/public/identity_manager/account_info.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "ui/events/event_constants.h" -#include "ui/gfx/range/range.h" -#include "ui/views/controls/styled_label.h" - -class BubbleSyncPromoViewTest : public ChromeViewsTestBase, - public BubbleSyncPromoDelegate { - public: - BubbleSyncPromoViewTest() {} - - protected: - // BubbleSyncPromoDelegate: - void OnEnableSync(const AccountInfo& account, - bool is_default_promo_account) override { - // The bubble sync promo view does not allow the user to enable sync - // for an existing account id. - DCHECK(account.IsEmpty()); - ++on_enable_sync_count_; - } - - // Number of times that OnSignInLinkClicked has been called. - int on_enable_sync_count_ = 0; - - private: - DISALLOW_COPY_AND_ASSIGN(BubbleSyncPromoViewTest); -}; - -TEST_F(BubbleSyncPromoViewTest, SignInLink) { - std::unique_ptr<BubbleSyncPromoView> sync_promo; - sync_promo = std::make_unique<BubbleSyncPromoView>( - this, signin_metrics::AccessPoint::ACCESS_POINT_BOOKMARK_BUBBLE, - IDS_BOOKMARK_SYNC_PROMO_LINK, IDS_BOOKMARK_SYNC_PROMO_MESSAGE); - - // Simulate clicking the "Sign in" link. - views::StyledLabel styled_label(base::ASCIIToUTF16("test"), nullptr); - views::StyledLabelListener* listener = sync_promo.get(); - listener->StyledLabelLinkClicked(&styled_label, gfx::Range(), ui::EF_NONE); - - EXPECT_EQ(1, on_enable_sync_count_); -}
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view_util.cc b/chrome/browser/ui/views/sync/bubble_sync_promo_view_util.cc deleted file mode 100644 index 5f3c0d3..0000000 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view_util.cc +++ /dev/null
@@ -1,27 +0,0 @@ -// Copyright 2019 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. - -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h" - -#include "chrome/browser/signin/account_consistency_mode_manager.h" -#include "chrome/browser/ui/views/sync/bubble_sync_promo_view.h" -#include "chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h" - -std::unique_ptr<views::View> CreateBubbleSyncPromoView( - Profile* profile, - BubbleSyncPromoDelegate* delegate, - signin_metrics::AccessPoint access_point, - const BubbleSyncPromoViewParams& params) { - if (AccountConsistencyModeManager::IsDiceEnabledForProfile(profile)) { - return std::make_unique<DiceBubbleSyncPromoView>( - profile, delegate, access_point, - params.dice_no_accounts_promo_message_resource_id, - params.dice_accounts_promo_message_resource_id, - params.dice_signin_button_prominent, params.dice_text_style); - } else { - return std::make_unique<BubbleSyncPromoView>( - delegate, access_point, params.link_text_resource_id, - params.message_text_resource_id); - } -}
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h b/chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h deleted file mode 100644 index 28ec9a1e..0000000 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view_util.h +++ /dev/null
@@ -1,42 +0,0 @@ -// Copyright 2019 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. - -#ifndef CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_UTIL_H_ -#define CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_UTIL_H_ - -#include <memory> - -#include "build/build_config.h" -#include "components/signin/public/base/signin_metrics.h" -#include "ui/views/style/typography.h" - -namespace views { -class View; -} - -class BubbleSyncPromoDelegate; -class Profile; - -// Parameters for CreateBubbleSyncPromoView. -struct BubbleSyncPromoViewParams { - // Used when Dice is not enabled. - int link_text_resource_id = 0; - int message_text_resource_id = 0; - - // Used when Dice is enabled. - int dice_no_accounts_promo_message_resource_id = 0; - int dice_accounts_promo_message_resource_id = 0; - bool dice_signin_button_prominent = true; - int dice_text_style = views::style::STYLE_PRIMARY; -}; - -// Creates a view that can be used a a sync promo. ChromeOS does not have sync -// promos. -std::unique_ptr<views::View> CreateBubbleSyncPromoView( - Profile* profile, - BubbleSyncPromoDelegate* delegate, - signin_metrics::AccessPoint access_point, - const BubbleSyncPromoViewParams& params); - -#endif // CHROME_BROWSER_UI_VIEWS_SYNC_BUBBLE_SYNC_PROMO_VIEW_UTIL_H_
diff --git a/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.cc b/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.cc index c76c94a..99a5384 100644 --- a/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.cc +++ b/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.cc
@@ -24,7 +24,6 @@ Profile* profile, BubbleSyncPromoDelegate* delegate, signin_metrics::AccessPoint access_point, - int no_accounts_promo_message_resource_id, int accounts_promo_message_resource_id, bool signin_button_prominent, int text_style)
diff --git a/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h b/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h index 7d65dc56..2e7c31bd 100644 --- a/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h +++ b/chrome/browser/ui/views/sync/dice_bubble_sync_promo_view.h
@@ -31,8 +31,6 @@ public: // Creates a personalized sync promo view. // |delegate| is not owned by DiceBubbleSyncPromoView. - // The promo message is set to |no_accounts_promo_message_resource_id| when - // Chrome has no accounts. If no value is given, then no message is shown. // The promo message is set to |accounts_promo_message_resource_id| when // Chrome has at least one account. // If |signin_button_prominent| is false and a non-personalized signin button @@ -43,7 +41,6 @@ DiceBubbleSyncPromoView(Profile* profile, BubbleSyncPromoDelegate* delegate, signin_metrics::AccessPoint access_point, - int no_accounts_promo_message_resource_id = 0, int accounts_promo_message_resource_id = 0, bool signin_button_prominent = true, int text_style = views::style::STYLE_PRIMARY);
diff --git a/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc b/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc index 81055ab9..d19a0b89 100644 --- a/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc +++ b/chrome/browser/ui/web_applications/system_web_app_ui_utils.cc
@@ -184,9 +184,10 @@ [](const std::string& path) { return path == "manifest.json"; }), base::BindRepeating( [](const std::string& response, const std::string& path, - const content::WebUIDataSource::GotDataCallback& callback) { + content::WebUIDataSource::GotDataCallback callback) { std::string response_copy = response; - callback.Run(base::RefCountedString::TakeString(&response_copy)); + std::move(callback).Run( + base::RefCountedString::TakeString(&response_copy)); }, std::move(response))); }
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 53acc4d..948e173 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc
@@ -181,9 +181,9 @@ : public base::RefCountedThreadSafe<ChromeOSTermsHandler> { public: static void Start(const std::string& path, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { scoped_refptr<ChromeOSTermsHandler> handler( - new ChromeOSTermsHandler(path, callback)); + new ChromeOSTermsHandler(path, std::move(callback))); handler->StartOnUIThread(); } @@ -191,9 +191,9 @@ friend class base::RefCountedThreadSafe<ChromeOSTermsHandler>; ChromeOSTermsHandler(const std::string& path, - const content::URLDataSource::GotDataCallback& callback) + content::URLDataSource::GotDataCallback callback) : path_(path), - callback_(callback), + callback_(std::move(callback)), // Previously we were using "initial locale" http://crbug.com/145142 locale_(g_browser_process->GetApplicationLocale()) {} @@ -343,7 +343,7 @@ // Do nothing if OEM EULA or Play Store ToS load failed. if (contents_.empty() && path_.empty()) contents_ = l10n_util::GetStringUTF8(IDS_TERMS_HTML); - callback_.Run(base::RefCountedString::TakeString(&contents_)); + std::move(callback_).Run(base::RefCountedString::TakeString(&contents_)); } // Path in the URL. @@ -365,19 +365,18 @@ : public base::RefCountedThreadSafe<ChromeOSCreditsHandler> { public: static void Start(const std::string& path, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { scoped_refptr<ChromeOSCreditsHandler> handler( - new ChromeOSCreditsHandler(path, callback)); + new ChromeOSCreditsHandler(path, std::move(callback))); handler->StartOnUIThread(); } private: friend class base::RefCountedThreadSafe<ChromeOSCreditsHandler>; - ChromeOSCreditsHandler( - const std::string& path, - const content::URLDataSource::GotDataCallback& callback) - : path_(path), callback_(callback) {} + ChromeOSCreditsHandler(const std::string& path, + content::URLDataSource::GotDataCallback callback) + : path_(path), callback_(std::move(callback)) {} virtual ~ChromeOSCreditsHandler() {} @@ -415,7 +414,7 @@ ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( IDR_OS_CREDITS_HTML); } - callback_.Run(base::RefCountedString::TakeString(&contents_)); + std::move(callback_).Run(base::RefCountedString::TakeString(&contents_)); } // Path in the URL. @@ -434,9 +433,9 @@ : public base::RefCountedThreadSafe<LinuxCreditsHandler> { public: static void Start(const std::string& path, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { scoped_refptr<LinuxCreditsHandler> handler( - new LinuxCreditsHandler(path, callback)); + new LinuxCreditsHandler(path, std::move(callback))); handler->StartOnUIThread(); } @@ -444,8 +443,8 @@ friend class base::RefCountedThreadSafe<LinuxCreditsHandler>; LinuxCreditsHandler(const std::string& path, - const content::URLDataSource::GotDataCallback& callback) - : path_(path), callback_(callback) {} + content::URLDataSource::GotDataCallback callback) + : path_(path), callback_(std::move(callback)) {} virtual ~LinuxCreditsHandler() {} @@ -485,7 +484,7 @@ ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( IDR_OS_CREDITS_HTML); } - callback_.Run(base::RefCountedString::TakeString(&contents_)); + std::move(callback_).Run(base::RefCountedString::TakeString(&contents_)); } // Path in the URL. @@ -597,7 +596,7 @@ void AboutUIHTMLSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. const std::string path = content::URLDataSource::URLToRequestPath(url); std::string response; @@ -624,16 +623,16 @@ #endif #if defined(OS_CHROMEOS) } else if (source_name_ == chrome::kChromeUIOSCreditsHost) { - ChromeOSCreditsHandler::Start(path, callback); + ChromeOSCreditsHandler::Start(path, std::move(callback)); return; } else if (source_name_ == chrome::kChromeUILinuxCreditsHost) { - LinuxCreditsHandler::Start(path, callback); + LinuxCreditsHandler::Start(path, std::move(callback)); return; #endif #if !defined(OS_ANDROID) } else if (source_name_ == chrome::kChromeUITermsHost) { #if defined(OS_CHROMEOS) - ChromeOSTermsHandler::Start(path, callback); + ChromeOSTermsHandler::Start(path, std::move(callback)); return; #else response = l10n_util::GetStringUTF8(IDS_TERMS_HTML); @@ -641,14 +640,14 @@ #endif } - FinishDataRequest(response, callback); + FinishDataRequest(response, std::move(callback)); } void AboutUIHTMLSource::FinishDataRequest( const std::string& html, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { std::string html_copy(html); - callback.Run(base::RefCountedString::TakeString(&html_copy)); + std::move(callback).Run(base::RefCountedString::TakeString(&html_copy)); } std::string AboutUIHTMLSource::GetMimeType(const std::string& path) {
diff --git a/chrome/browser/ui/webui/about_ui.h b/chrome/browser/ui/webui/about_ui.h index 485fa5b..8a77e03b 100644 --- a/chrome/browser/ui/webui/about_ui.h +++ b/chrome/browser/ui/webui/about_ui.h
@@ -27,16 +27,15 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; bool ShouldAddContentSecurityPolicy() override; std::string GetAccessControlAllowOriginForOrigin( const std::string& origin) override; // Send the response data. - void FinishDataRequest( - const std::string& html, - const content::URLDataSource::GotDataCallback& callback); + void FinishDataRequest(const std::string& html, + content::URLDataSource::GotDataCallback callback); Profile* profile() { return profile_; }
diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.cc b/chrome/browser/ui/webui/app_launcher_page_ui.cc index 553d3f2..f4d500f5 100644 --- a/chrome/browser/ui/webui/app_launcher_page_ui.cc +++ b/chrome/browser/ui/webui/app_launcher_page_ui.cc
@@ -101,7 +101,7 @@ void AppLauncherPageUI::HTMLSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); NTPResourceCache* resource = AppResourceCacheFactory::GetForProfile(profile_); @@ -114,7 +114,7 @@ scoped_refptr<base::RefCountedMemory> html_bytes( resource->GetNewTabHTML(win_type)); - callback.Run(html_bytes.get()); + std::move(callback).Run(html_bytes.get()); } std::string AppLauncherPageUI::HTMLSource::GetMimeType(
diff --git a/chrome/browser/ui/webui/app_launcher_page_ui.h b/chrome/browser/ui/webui/app_launcher_page_ui.h index 011f5579..280e6003 100644 --- a/chrome/browser/ui/webui/app_launcher_page_ui.h +++ b/chrome/browser/ui/webui/app_launcher_page_ui.h
@@ -41,7 +41,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string&) override; bool ShouldReplaceExistingSource() override; bool AllowCaching() override;
diff --git a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc index 2d32689..9868804 100644 --- a/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/cellular_setup/mobile_setup_ui.cc
@@ -112,12 +112,11 @@ MobileActivator::ActivationError::kActivationFailed, carrier); } -void DataRequestFailed( - const std::string& service_path, - const content::URLDataSource::GotDataCallback& callback) { +void DataRequestFailed(const std::string& service_path, + content::URLDataSource::GotDataCallback callback) { NET_LOG(ERROR) << "Data Request Failed for Mobile Setup: " << service_path; scoped_refptr<base::RefCountedBytes> html_bytes(new base::RefCountedBytes); - callback.Run(html_bytes.get()); + std::move(callback).Run(html_bytes.get()); } // Keys for the dictionary that is set to activation UI and that contains the @@ -179,7 +178,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string&) override { return "text/html"; } bool ShouldAddContentSecurityPolicy() override { return false; } bool AllowCaching() override { @@ -271,7 +270,7 @@ void MobileSetupUIHTMLSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { const std::string path = content::URLDataSource::URLToRequestPath(url); // Sanity checks that activation was requested for an appropriate network. const NetworkState* network = @@ -279,13 +278,13 @@ if (!network) { NET_LOG(ERROR) << "Network for mobile setup not found: " << path; - DataRequestFailed(path, callback); + DataRequestFailed(path, std::move(callback)); return; } if (!network->Matches(NetworkTypePattern::Cellular())) { NET_LOG(ERROR) << "Mobile setup attempt for non cellular network: " << path; - DataRequestFailed(path, callback); + DataRequestFailed(path, std::move(callback)); return; } @@ -294,7 +293,7 @@ NET_LOG(ERROR) << "Mobile setup network in unexpected state: " << path << " payment_url: " << network->payment_url() << " activation_state: " << network->activation_state(); - DataRequestFailed(path, callback); + DataRequestFailed(path, std::move(callback)); return; } @@ -304,7 +303,7 @@ if (!device) { NET_LOG(ERROR) << "Network device for mobile setup not found: " << network->device_path(); - DataRequestFailed(path, callback); + DataRequestFailed(path, std::move(callback)); return; } @@ -354,7 +353,7 @@ full_html = webui::GetI18nTemplateHtml(html_for_non_activated, &strings); } - callback.Run(base::RefCountedString::TakeString(&full_html)); + std::move(callback).Run(base::RefCountedString::TakeString(&full_html)); } ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/webui/chromeos/image_source.cc b/chrome/browser/ui/webui/chromeos/image_source.cc index 3110ff0..2ad02f4c 100644 --- a/chrome/browser/ui/webui/chromeos/image_source.cc +++ b/chrome/browser/ui/webui/chromeos/image_source.cc
@@ -29,13 +29,12 @@ const char* const kWhitelistedDirectories[] = {"regulatory_labels"}; // Callback for user_manager::UserImageLoader. -void ImageLoaded( - const content::URLDataSource::GotDataCallback& got_data_callback, - std::unique_ptr<user_manager::UserImage> user_image) { +void ImageLoaded(content::URLDataSource::GotDataCallback got_data_callback, + std::unique_ptr<user_manager::UserImage> user_image) { if (user_image->has_image_bytes()) - got_data_callback.Run(user_image->image_bytes()); + std::move(got_data_callback).Run(user_image->image_bytes()); else - got_data_callback.Run(nullptr); + std::move(got_data_callback).Run(nullptr); } } // namespace @@ -56,10 +55,10 @@ void ImageSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& got_data_callback) { + content::URLDataSource::GotDataCallback got_data_callback) { const std::string path = content::URLDataSource::URLToRequestPath(url); if (!IsWhitelisted(path)) { - got_data_callback.Run(nullptr); + std::move(got_data_callback).Run(nullptr); return; } @@ -68,24 +67,23 @@ base::PostTaskAndReplyWithResult( FROM_HERE, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_VISIBLE}, - base::Bind(&base::PathExists, image_path), - base::Bind(&ImageSource::StartDataRequestAfterPathExists, - weak_factory_.GetWeakPtr(), image_path, got_data_callback)); + base::BindOnce(&base::PathExists, image_path), + base::BindOnce(&ImageSource::StartDataRequestAfterPathExists, + weak_factory_.GetWeakPtr(), image_path, + std::move(got_data_callback))); } void ImageSource::StartDataRequestAfterPathExists( const base::FilePath& image_path, - const content::URLDataSource::GotDataCallback& got_data_callback, + content::URLDataSource::GotDataCallback got_data_callback, bool path_exists) { if (path_exists) { user_image_loader::StartWithFilePath( - task_runner_, - image_path, - ImageDecoder::DEFAULT_CODEC, + task_runner_, image_path, ImageDecoder::DEFAULT_CODEC, 0, // Do not crop. - base::Bind(&ImageLoaded, got_data_callback)); + base::BindOnce(&ImageLoaded, std::move(got_data_callback))); } else { - got_data_callback.Run(nullptr); + std::move(got_data_callback).Run(nullptr); } }
diff --git a/chrome/browser/ui/webui/chromeos/image_source.h b/chrome/browser/ui/webui/chromeos/image_source.h index 6848d0a..a36c544 100644 --- a/chrome/browser/ui/webui/chromeos/image_source.h +++ b/chrome/browser/ui/webui/chromeos/image_source.h
@@ -27,10 +27,10 @@ // content::URLDataSource implementation. std::string GetSource() override; - void StartDataRequest(const GURL& url, - const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& - got_data_callback) override; + void StartDataRequest( + const GURL& url, + const content::WebContents::Getter& wc_getter, + content::URLDataSource::GotDataCallback got_data_callback) override; std::string GetMimeType(const std::string& path) override; @@ -38,7 +38,7 @@ // Continuation from StartDataRequest(). void StartDataRequestAfterPathExists( const base::FilePath& image_path, - const content::URLDataSource::GotDataCallback& got_data_callback, + content::URLDataSource::GotDataCallback got_data_callback, bool path_exists); // Checks whether we have allowed the image to be loaded.
diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc index 2d4544f..19b15236 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.cc
@@ -36,9 +36,9 @@ void ScreenlockIconSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { if (!icon_provider_) { - callback.Run(GetDefaultIcon().As1xPNGBytes().get()); + std::move(callback).Run(GetDefaultIcon().As1xPNGBytes().get()); return; } @@ -49,11 +49,11 @@ gfx::Image image = icon_provider_->GetIcon(username); if (image.IsEmpty()) { - callback.Run(GetDefaultIcon().As1xPNGBytes().get()); + std::move(callback).Run(GetDefaultIcon().As1xPNGBytes().get()); return; } - callback.Run(image.As1xPNGBytes().get()); + std::move(callback).Run(image.As1xPNGBytes().get()); } std::string ScreenlockIconSource::GetMimeType(const std::string&) const {
diff --git a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h index 0293300..b0a8d43 100644 --- a/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h +++ b/chrome/browser/ui/webui/chromeos/login/screenlock_icon_source.h
@@ -25,7 +25,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) const override;
diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc index 0919e411..96c237d 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc
@@ -35,7 +35,7 @@ void SlowTraceSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { int trace_id = 0; // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. const std::string path = content::URLDataSource::URLToRequestPath(url); @@ -44,13 +44,12 @@ if (!manager || pos == std::string::npos || !base::StringToInt(path.substr(pos + 1), &trace_id)) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } - manager->GetTraceData(trace_id, - base::Bind(&SlowTraceSource::OnGetTraceData, - base::Unretained(this), - callback)); + manager->GetTraceData( + trace_id, base::BindOnce(&SlowTraceSource::OnGetTraceData, + base::Unretained(this), std::move(callback))); } std::string SlowTraceSource::GetMimeType(const std::string& path) { @@ -60,9 +59,9 @@ SlowTraceSource::~SlowTraceSource() {} void SlowTraceSource::OnGetTraceData( - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, scoped_refptr<base::RefCountedString> trace_data) { - callback.Run(trace_data.get()); + std::move(callback).Run(trace_data.get()); } bool SlowTraceSource::AllowCaching() {
diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h index 78ebae81..aa719c2f 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.h +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.h
@@ -33,12 +33,12 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; bool AllowCaching() override; private: - void OnGetTraceData(const content::URLDataSource::GotDataCallback& callback, + void OnGetTraceData(content::URLDataSource::GotDataCallback callback, scoped_refptr<base::RefCountedString> trace_data); DISALLOW_COPY_AND_ASSIGN(SlowTraceSource);
diff --git a/chrome/browser/ui/webui/chromeos/terminal/terminal_source.cc b/chrome/browser/ui/webui/chromeos/terminal/terminal_source.cc index c63f034..a89867c 100644 --- a/chrome/browser/ui/webui/chromeos/terminal/terminal_source.cc +++ b/chrome/browser/ui/webui/chromeos/terminal/terminal_source.cc
@@ -25,7 +25,7 @@ constexpr char kDefaultMime[] = "text/html"; void ReadFile(const base::FilePath& path, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { std::string content; // First look for uncompressed resource, then try for gzipped file. bool result = base::ReadFileToString(path, &content); @@ -43,7 +43,7 @@ << path; scoped_refptr<base::RefCountedString> response = base::RefCountedString::TakeString(&content); - callback.Run(response.get()); + std::move(callback).Run(response.get()); } } // namespace @@ -60,7 +60,7 @@ void TerminalSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. const std::string path = content::URLDataSource::URLToRequestPath(url); // Reparse path to strip any query or fragment, skip first '/' in path. @@ -72,7 +72,7 @@ base::PostTask( FROM_HERE, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_BLOCKING}, - base::BindOnce(&ReadFile, file_path, callback)); + base::BindOnce(&ReadFile, file_path, std::move(callback))); } std::string TerminalSource::GetMimeType(const std::string& path) {
diff --git a/chrome/browser/ui/webui/chromeos/terminal/terminal_source.h b/chrome/browser/ui/webui/chromeos/terminal/terminal_source.h index 10f3d0d5..119ca1b 100644 --- a/chrome/browser/ui/webui/chromeos/terminal/terminal_source.h +++ b/chrome/browser/ui/webui/chromeos/terminal/terminal_source.h
@@ -27,7 +27,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override;
diff --git a/chrome/browser/ui/webui/chromeos/user_image_source.cc b/chrome/browser/ui/webui/chromeos/user_image_source.cc index 50d6e7a..18aaf98 100644 --- a/chrome/browser/ui/webui/chromeos/user_image_source.cc +++ b/chrome/browser/ui/webui/chromeos/user_image_source.cc
@@ -180,7 +180,7 @@ void UserImageSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { // TODO(crbug/1009127): Make sure |url| matches // |chrome::kChromeUIUserImageURL| now that |url| is available. const std::string path = content::URLDataSource::URLToRequestPath(url); @@ -188,7 +188,7 @@ int frame = -1; ParseRequest(url, &email, &frame); const AccountId account_id(AccountId::FromUserEmail(email)); - callback.Run(GetUserImageInternal(account_id, frame)); + std::move(callback).Run(GetUserImageInternal(account_id, frame)); } std::string UserImageSource::GetMimeType(const std::string& path) {
diff --git a/chrome/browser/ui/webui/chromeos/user_image_source.h b/chrome/browser/ui/webui/chromeos/user_image_source.h index 85c68ad..4e6374d 100644 --- a/chrome/browser/ui/webui/chromeos/user_image_source.h +++ b/chrome/browser/ui/webui/chromeos/user_image_source.h
@@ -34,7 +34,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; // Returns PNG encoded image for user with specified |account_id|. If there's
diff --git a/chrome/browser/ui/webui/chromeos/video_source.cc b/chrome/browser/ui/webui/chromeos/video_source.cc index e8d5262..f3b5379a 100644 --- a/chrome/browser/ui/webui/chromeos/video_source.cc +++ b/chrome/browser/ui/webui/chromeos/video_source.cc
@@ -39,16 +39,16 @@ } // Callback for user_manager::UserImageLoader. -void VideoLoaded( - const content::URLDataSource::GotDataCallback& got_data_callback, - std::unique_ptr<std::string> video_data, - bool did_load_file) { +void VideoLoaded(content::URLDataSource::GotDataCallback got_data_callback, + std::unique_ptr<std::string> video_data, + bool did_load_file) { if (video_data->size() && did_load_file) { - got_data_callback.Run(new base::RefCountedBytes( - reinterpret_cast<const unsigned char*>(video_data->data()), - video_data->size())); + std::move(got_data_callback) + .Run(new base::RefCountedBytes( + reinterpret_cast<const unsigned char*>(video_data->data()), + video_data->size())); } else { - got_data_callback.Run(nullptr); + std::move(got_data_callback).Run(nullptr); } } @@ -69,10 +69,10 @@ void VideoSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& got_data_callback) { + content::URLDataSource::GotDataCallback got_data_callback) { const std::string path = content::URLDataSource::URLToRequestPath(url); if (!IsWhitelisted(path)) { - got_data_callback.Run(nullptr); + std::move(got_data_callback).Run(nullptr); return; } @@ -84,7 +84,7 @@ base::BindOnce(&base::PathExists, video_path), base::BindOnce(&VideoSource::StartDataRequestAfterPathExists, weak_factory_.GetWeakPtr(), video_path, - got_data_callback)); + std::move(got_data_callback))); } std::string VideoSource::GetMimeType(const std::string& path) { @@ -97,7 +97,7 @@ void VideoSource::StartDataRequestAfterPathExists( const base::FilePath& video_path, - const content::URLDataSource::GotDataCallback& got_data_callback, + content::URLDataSource::GotDataCallback got_data_callback, bool path_exists) { if (path_exists) { auto video_data = std::make_unique<std::string>(); @@ -105,10 +105,11 @@ base::PostTaskAndReplyWithResult( task_runner_.get(), FROM_HERE, base::BindOnce(&base::ReadFileToString, video_path, data), - base::BindOnce(&VideoLoaded, got_data_callback, std::move(video_data))); + base::BindOnce(&VideoLoaded, std::move(got_data_callback), + std::move(video_data))); } else { - got_data_callback.Run(nullptr); + std::move(got_data_callback).Run(nullptr); } }
diff --git a/chrome/browser/ui/webui/chromeos/video_source.h b/chrome/browser/ui/webui/chromeos/video_source.h index e113f3f..5ac0abd7 100644 --- a/chrome/browser/ui/webui/chromeos/video_source.h +++ b/chrome/browser/ui/webui/chromeos/video_source.h
@@ -29,17 +29,17 @@ // content::URLDataSource: std::string GetSource() override; - void StartDataRequest(const GURL& url, - const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& - got_data_callback) override; + void StartDataRequest( + const GURL& url, + const content::WebContents::Getter& wc_getter, + content::URLDataSource::GotDataCallback got_data_callback) override; std::string GetMimeType(const std::string& path) override; private: // Continuation from StartDataRequest(). void StartDataRequestAfterPathExists( const base::FilePath& video_path, - const content::URLDataSource::GotDataCallback& got_data_callback, + content::URLDataSource::GotDataCallback got_data_callback, bool path_exists); // The background task runner on which file I/O is performed.
diff --git a/chrome/browser/ui/webui/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools_ui_data_source.cc index da69f1a..d718f14 100644 --- a/chrome/browser/ui/webui/devtools_ui_data_source.cc +++ b/chrome/browser/ui/webui/devtools_ui_data_source.cc
@@ -97,7 +97,7 @@ void DevToolsDataSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const GotDataCallback& callback) { + GotDataCallback callback) { // Serve request to devtools://bundled/ from local bundle. // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. const std::string path = content::URLDataSource::URLToRequestPath(url); @@ -114,12 +114,12 @@ #if !BUILDFLAG(DEBUG_DEVTOOLS) if (!GetCustomDevToolsFrontendURL().SchemeIsFile()) { // Fetch from packaged resources. - StartBundledDataRequest(path_under_bundled, callback); + StartBundledDataRequest(path_under_bundled, std::move(callback)); return; } #endif // Fetch from file system. - StartFileRequest(path_under_bundled, callback); + StartFileRequest(path_under_bundled, std::move(callback)); return; } @@ -127,7 +127,7 @@ std::string empty_path_prefix(chrome::kChromeUIDevToolsBlankPath); if (base::StartsWith(path, empty_path_prefix, base::CompareCase::INSENSITIVE_ASCII)) { - callback.Run(new base::RefCountedStaticMemory()); + std::move(callback).Run(new base::RefCountedStaticMemory()); return; } @@ -140,10 +140,10 @@ CHECK_EQ(url.host(), kRemoteFrontendDomain); if (url.is_valid() && DevToolsUIBindings::IsValidRemoteFrontendURL(url)) { - StartRemoteDataRequest(url, callback); + StartRemoteDataRequest(url, std::move(callback)); } else { DLOG(ERROR) << "Refusing to load invalid remote front-end URL"; - callback.Run(CreateNotFoundResponse()); + std::move(callback).Run(CreateNotFoundResponse()); } return; } @@ -158,12 +158,12 @@ GURL url = GURL(custom_devtools_frontend.spec() + path.substr(custom_path_prefix.length())); DCHECK(url.is_valid()); - StartCustomDataRequest(url, callback); + StartCustomDataRequest(url, std::move(callback)); return; } } - callback.Run(CreateNotFoundResponse()); + std::move(callback).Run(CreateNotFoundResponse()); } std::string DevToolsDataSource::GetMimeType(const std::string& path) { @@ -184,7 +184,7 @@ void DevToolsDataSource::StartBundledDataRequest( const std::string& path, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { scoped_refptr<base::RefCountedMemory> bytes = content::DevToolsFrontendHost::GetFrontendResourceBytes(path); @@ -192,12 +192,12 @@ << "Unable to find dev tool resource: " << path << ". If you compiled with debug_devtools=1, try running with " "--debug-devtools."; - callback.Run(bytes); + std::move(callback).Run(bytes); } void DevToolsDataSource::StartRemoteDataRequest( const GURL& url, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { CHECK(url.is_valid()); net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("devtools_hard_coded_data_source", @@ -224,14 +224,15 @@ } })"); - StartNetworkRequest(url, traffic_annotation, net::LOAD_NORMAL, callback); + StartNetworkRequest(url, traffic_annotation, net::LOAD_NORMAL, + std::move(callback)); } void DevToolsDataSource::StartCustomDataRequest( const GURL& url, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { if (!url.is_valid()) { - callback.Run(CreateNotFoundResponse()); + std::move(callback).Run(CreateNotFoundResponse()); return; } net::NetworkTrafficAnnotationTag traffic_annotation = @@ -264,20 +265,20 @@ })"); StartNetworkRequest(url, traffic_annotation, net::LOAD_DISABLE_CACHE, - callback); + std::move(callback)); } void DevToolsDataSource::StartNetworkRequest( const GURL& url, const net::NetworkTrafficAnnotationTag& traffic_annotation, int load_flags, - const GotDataCallback& callback) { + GotDataCallback callback) { auto request = std::make_unique<network::ResourceRequest>(); request->url = url; request->load_flags = load_flags; auto request_iter = pending_requests_.emplace(pending_requests_.begin()); - request_iter->callback = callback; + request_iter->callback = std::move(callback); request_iter->loader = network::SimpleURLLoader::Create(std::move(request), traffic_annotation); request_iter->loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie( @@ -297,7 +298,7 @@ } void DevToolsDataSource::StartFileRequest(const std::string& path, - const GotDataCallback& callback) { + GotDataCallback callback) { base::FilePath base_path; GURL custom_devtools_frontend = GetCustomDevToolsFrontendURL(); if (custom_devtools_frontend.SchemeIsFile()) { @@ -306,7 +307,7 @@ #if BUILDFLAG(DEBUG_DEVTOOLS) // Use default path for unbundled files when debug_devtools=true if (!base::PathService::Get(chrome::DIR_INSPECTOR_DEBUG, &base_path)) { - callback.Run(CreateNotFoundResponse()); + std::move(callback).Run(CreateNotFoundResponse()); return; } #else @@ -322,10 +323,8 @@ {base::MayBlock(), base::ThreadPool(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN, base::TaskPriority::USER_VISIBLE}, - // The usage of BindRepeating below is only because the type of - // task callback needs to match that of response callback, which - // is currently a repeating callback. - base::BindRepeating(ReadFileForDevTools, std::move(full_path)), callback); + base::BindOnce(ReadFileForDevTools, std::move(full_path)), + std::move(callback)); } void DevToolsDataSource::OnLoadComplete( @@ -345,5 +344,5 @@ DevToolsDataSource::PendingRequest::~PendingRequest() { if (callback) - callback.Run(CreateNotFoundResponse()); + std::move(callback).Run(CreateNotFoundResponse()); }
diff --git a/chrome/browser/ui/webui/devtools_ui_data_source.h b/chrome/browser/ui/webui/devtools_ui_data_source.h index 04a5c00..a713ac1 100644 --- a/chrome/browser/ui/webui/devtools_ui_data_source.h +++ b/chrome/browser/ui/webui/devtools_ui_data_source.h
@@ -41,7 +41,7 @@ void StartDataRequest(const GURL& url, const content::WebContents::Getter& wc_getter, - const GotDataCallback& callback) override; + GotDataCallback callback) override; private: friend class DevToolsUIDataSourceTest; @@ -59,23 +59,23 @@ // Serves bundled DevTools frontend from ResourceBundle. void StartBundledDataRequest(const std::string& path, - const GotDataCallback& callback); + GotDataCallback callback); // Serves remote DevTools frontend from hard-coded App Engine domain. - void StartRemoteDataRequest(const GURL& url, const GotDataCallback& callback); + void StartRemoteDataRequest(const GURL& url, GotDataCallback callback); // Serves remote DevTools frontend from any endpoint, passed through // command-line flag. - void StartCustomDataRequest(const GURL& url, const GotDataCallback& callback); + void StartCustomDataRequest(const GURL& url, GotDataCallback callback); virtual void StartNetworkRequest( const GURL& url, const net::NetworkTrafficAnnotationTag& traffic_annotation, int load_flags, - const GotDataCallback& callback); + GotDataCallback callback); virtual void StartFileRequest(const std::string& path, - const GotDataCallback& callback); + GotDataCallback callback); struct PendingRequest { PendingRequest();
diff --git a/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc b/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc index 07ccf1d0..64171abd1 100644 --- a/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc +++ b/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc
@@ -49,15 +49,15 @@ const GURL& url, const net::NetworkTrafficAnnotationTag& traffic_annotation, int load_flags, - const GotDataCallback& callback) override { + GotDataCallback callback) override { std::string result = "url: " + url.spec(); - callback.Run(base::RefCountedString::TakeString(&result)); + std::move(callback).Run(base::RefCountedString::TakeString(&result)); } void StartFileRequest(const std::string& path, - const GotDataCallback& callback) override { + GotDataCallback callback) override { std::string result = "file: " + path; - callback.Run(base::RefCountedString::TakeString(&result)); + std::move(callback).Run(base::RefCountedString::TakeString(&result)); } };
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index ee1b12dd..9d56d83 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -115,17 +115,17 @@ void ExtensionIconSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { const std::string path = content::URLDataSource::URLToRequestPath(url); // This is where everything gets started. First, parse the request and make // the request data available for later. static int next_id = 0; - if (!ParseData(path, ++next_id, callback)) { + if (!ParseData(path, ++next_id, &callback)) { // If the request data cannot be parsed, request parameters will not be // added to |request_map_|. // Send back the default application icon (not resized or desaturated) as // the default response. - callback.Run(BitmapToMemory(GetDefaultAppImage()).get()); + std::move(callback).Run(BitmapToMemory(GetDefaultAppImage()).get()); return; } @@ -174,7 +174,7 @@ else bitmap = *image; - request->callback.Run(BitmapToMemory(&bitmap).get()); + std::move(request->callback).Run(BitmapToMemory(&bitmap).get()); ClearData(request_id); } @@ -243,7 +243,7 @@ if (!request->grayscale) { // If we don't need a grayscale image, then we can bypass FinalizeImage // to avoid unnecessary conversions. - request->callback.Run(bitmap_result.bitmap_data.get()); + std::move(request->callback).Run(bitmap_result.bitmap_data.get()); ClearData(request_id); } else { FinalizeImage(ToBitmap(bitmap_result.bitmap_data->front(), @@ -273,7 +273,7 @@ bool ExtensionIconSource::ParseData( const std::string& path, int request_id, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback* callback) { // Extract the parameters from the path by lower casing and splitting. std::string path_lower = base::ToLowerASCII(path); std::vector<std::string> path_parts = base::SplitString( @@ -309,21 +309,22 @@ bool grayscale = path_lower.find("grayscale=true") != std::string::npos; - SetData(request_id, callback, extension, grayscale, size, match_type); + SetData(request_id, std::move(*callback), extension, grayscale, size, + match_type); return true; } void ExtensionIconSource::SetData( int request_id, - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, const Extension* extension, bool grayscale, int size, ExtensionIconSet::MatchType match) { std::unique_ptr<ExtensionIconRequest> request = std::make_unique<ExtensionIconRequest>(); - request->callback = callback; + request->callback = std::move(callback); request->extension = extension; request->grayscale = grayscale; request->size = size;
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h index c3e1d66..324b27fd 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.h +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h
@@ -73,7 +73,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; bool AllowCaching() override; private: @@ -120,15 +120,15 @@ void LoadIconFailed(int request_id); // Parses and saves an ExtensionIconRequest for the URL |path| for the - // specified |request_id|. + // specified |request_id|. Takes the |callback| if it returns true. bool ParseData(const std::string& path, int request_id, - const content::URLDataSource::GotDataCallback& callback); + content::URLDataSource::GotDataCallback* callback); // Stores the parameters associated with the |request_id|, making them // as an ExtensionIconRequest via GetData. void SetData(int request_id, - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, const Extension* extension, bool grayscale, int size,
diff --git a/chrome/browser/ui/webui/extensions/extensions_internals_source.cc b/chrome/browser/ui/webui/extensions/extensions_internals_source.cc index d957a3e..c60227d 100644 --- a/chrome/browser/ui/webui/extensions/extensions_internals_source.cc +++ b/chrome/browser/ui/webui/extensions/extensions_internals_source.cc
@@ -436,9 +436,9 @@ void ExtensionsInternalsSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { std::string json = WriteToString(); - callback.Run(base::RefCountedString::TakeString(&json)); + std::move(callback).Run(base::RefCountedString::TakeString(&json)); } std::string ExtensionsInternalsSource::WriteToString() const {
diff --git a/chrome/browser/ui/webui/extensions/extensions_internals_source.h b/chrome/browser/ui/webui/extensions/extensions_internals_source.h index ca3121c..31e4952 100644 --- a/chrome/browser/ui/webui/extensions/extensions_internals_source.h +++ b/chrome/browser/ui/webui/extensions/extensions_internals_source.h
@@ -23,7 +23,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; // Simpler interface to generate string output, without needing to // call StartDataRequest.
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index d62e7ae..f53b02a6 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -77,27 +77,27 @@ void FaviconSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { const std::string path = content::URLDataSource::URLToRequestPath(url); favicon::FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(profile_, ServiceAccessType::EXPLICIT_ACCESS); if (!favicon_service) { - SendDefaultResponse(callback); + SendDefaultResponse(std::move(callback)); return; } chrome::ParsedFaviconPath parsed; bool success = chrome::ParseFaviconPath(path, url_format_, &parsed); if (!success) { - SendDefaultResponse(callback); + SendDefaultResponse(std::move(callback)); return; } GURL page_url(parsed.page_url); GURL icon_url(parsed.icon_url); if (!page_url.is_valid() && !icon_url.is_valid()) { - SendDefaultResponse(callback); + SendDefaultResponse(std::move(callback)); return; } @@ -111,9 +111,9 @@ // IconType. favicon_service->GetRawFavicon( icon_url, favicon_base::IconType::kFavicon, desired_size_in_pixel, - base::BindRepeating(&FaviconSource::OnFaviconDataAvailable, - base::Unretained(this), callback, - parsed.size_in_dip, parsed.device_scale_factor), + base::BindOnce(&FaviconSource::OnFaviconDataAvailable, + base::Unretained(this), std::move(callback), + parsed.size_in_dip, parsed.device_scale_factor), &cancelable_task_tracker_); } else { // Intercept requests for prepopulated pages if TopSites exists. @@ -124,7 +124,7 @@ if (page_url == prepopulated_page.most_visited.url) { ui::ScaleFactor resource_scale_factor = ui::GetSupportedScaleFactor(parsed.device_scale_factor); - callback.Run( + std::move(callback).Run( ui::ResourceBundle::GetSharedInstance() .LoadDataResourceBytesForScale(prepopulated_page.favicon_id, resource_scale_factor)); @@ -144,9 +144,9 @@ favicon_service->GetRawFaviconForPageURL( page_url, {favicon_base::IconType::kFavicon}, desired_size_in_pixel, fallback_to_host, - base::Bind(&FaviconSource::OnFaviconDataAvailable, - base::Unretained(this), callback, parsed.size_in_dip, - parsed.device_scale_factor), + base::BindOnce(&FaviconSource::OnFaviconDataAvailable, + base::Unretained(this), std::move(callback), + parsed.size_in_dip, parsed.device_scale_factor), &cancelable_task_tracker_); return; } @@ -158,14 +158,14 @@ HistoryUiFaviconRequestHandlerFactory::GetForBrowserContext( profile_); if (!history_ui_favicon_request_handler) { - SendDefaultResponse(callback); + SendDefaultResponse(std::move(callback)); return; } history_ui_favicon_request_handler->GetRawFaviconForPageURL( page_url, desired_size_in_pixel, base::BindOnce(&FaviconSource::OnFaviconDataAvailable, - base::Unretained(this), callback, parsed.size_in_dip, - parsed.device_scale_factor), + base::Unretained(this), std::move(callback), + parsed.size_in_dip, parsed.device_scale_factor), favicon::FaviconRequestPlatform::kDesktop, parsed_history_ui_origin, /*icon_url_for_uma=*/ GURL(parsed.icon_url), &cancelable_task_tracker_); @@ -205,25 +205,25 @@ } void FaviconSource::OnFaviconDataAvailable( - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, int size_in_dip, float scale_factor, const favicon_base::FaviconRawBitmapResult& bitmap_result) { if (bitmap_result.is_valid()) { // Forward the data along to the networking system. - callback.Run(bitmap_result.bitmap_data.get()); + std::move(callback).Run(bitmap_result.bitmap_data.get()); } else { - SendDefaultResponse(callback, size_in_dip, scale_factor); + SendDefaultResponse(std::move(callback), size_in_dip, scale_factor); } } void FaviconSource::SendDefaultResponse( - const content::URLDataSource::GotDataCallback& callback) { - SendDefaultResponse(callback, 16, 1.0f); + content::URLDataSource::GotDataCallback callback) { + SendDefaultResponse(std::move(callback), 16, 1.0f); } void FaviconSource::SendDefaultResponse( - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, int size_in_dip, float scale_factor) { const bool dark = GetNativeTheme()->ShouldUseDarkColors(); @@ -239,7 +239,7 @@ resource_id = dark ? IDR_DEFAULT_FAVICON_DARK : IDR_DEFAULT_FAVICON; break; } - callback.Run(LoadIconBytes(scale_factor, resource_id)); + std::move(callback).Run(LoadIconBytes(scale_factor, resource_id)); } base::RefCountedMemory* FaviconSource::LoadIconBytes(float scale_factor,
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h index 5e419abf..7b21b8a 100644 --- a/chrome/browser/ui/webui/favicon_source.h +++ b/chrome/browser/ui/webui/favicon_source.h
@@ -46,7 +46,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string&) override; bool AllowCaching() override; bool ShouldReplaceExistingSource() override; @@ -75,20 +75,18 @@ // |bitmap_result| is valid, returns it to caller using |callback|. Otherwise // will send appropriate default icon for |size_in_dip| and |scale_factor|. void OnFaviconDataAvailable( - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, int size_in_dip, float scale_factor, const favicon_base::FaviconRawBitmapResult& bitmap_result); // Sends the 16x16 DIP 1x default favicon. - void SendDefaultResponse( - const content::URLDataSource::GotDataCallback& callback); + void SendDefaultResponse(content::URLDataSource::GotDataCallback callback); // Sends the default favicon. - void SendDefaultResponse( - const content::URLDataSource::GotDataCallback& callback, - int size_in_dip, - float scale_factor); + void SendDefaultResponse(content::URLDataSource::GotDataCallback callback, + int size_in_dip, + float scale_factor); chrome::FaviconUrlFormat url_format_;
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index f6ddc145..5a0a51e 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -65,24 +65,21 @@ } // namespace -FileIconSource::IconRequestDetails::IconRequestDetails() : scale_factor(1.0f) { -} - +FileIconSource::IconRequestDetails::IconRequestDetails() = default; FileIconSource::IconRequestDetails::IconRequestDetails( - const IconRequestDetails& other) = default; + IconRequestDetails&& other) = default; +FileIconSource::IconRequestDetails& FileIconSource::IconRequestDetails:: +operator=(IconRequestDetails&& other) = default; +FileIconSource::IconRequestDetails::~IconRequestDetails() = default; -FileIconSource::IconRequestDetails::~IconRequestDetails() { -} - -FileIconSource::FileIconSource() {} - -FileIconSource::~FileIconSource() {} +FileIconSource::FileIconSource() = default; +FileIconSource::~FileIconSource() = default; void FileIconSource::FetchFileIcon( const base::FilePath& path, float scale_factor, IconLoader::IconSize icon_size, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { IconManager* im = g_browser_process->icon_manager(); gfx::Image* icon = im->LookupIconFromFilepath(path, icon_size); @@ -92,18 +89,17 @@ icon->ToImageSkia()->GetRepresentation(scale_factor).GetBitmap(), false, &icon_data->data()); - callback.Run(icon_data.get()); + std::move(callback).Run(icon_data.get()); } else { // Attach the ChromeURLDataManager request ID to the history request. IconRequestDetails details; - details.callback = callback; + details.callback = std::move(callback); details.scale_factor = scale_factor; // Icon was not in cache, go fetch it slowly. - im->LoadIcon(path, - icon_size, - base::Bind(&FileIconSource::OnFileIconDataAvailable, - base::Unretained(this), details), + im->LoadIcon(path, icon_size, + base::BindOnce(&FileIconSource::OnFileIconDataAvailable, + base::Unretained(this), std::move(details)), &cancelable_task_tracker_); } } @@ -115,14 +111,14 @@ void FileIconSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { const std::string path = content::URLDataSource::URLToRequestPath(url); base::FilePath file_path; IconLoader::IconSize icon_size = IconLoader::NORMAL; float scale_factor = 1.0f; // TODO(crbug/1009127): Make ParseQueryParams take GURL. ParseQueryParams(path, &file_path, &scale_factor, &icon_size); - FetchFileIcon(file_path, scale_factor, icon_size, callback); + FetchFileIcon(file_path, scale_factor, icon_size, std::move(callback)); } std::string FileIconSource::GetMimeType(const std::string&) { @@ -134,7 +130,7 @@ return false; } -void FileIconSource::OnFileIconDataAvailable(const IconRequestDetails& details, +void FileIconSource::OnFileIconDataAvailable(IconRequestDetails details, gfx::Image icon) { if (!icon.IsEmpty()) { scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes); @@ -142,9 +138,9 @@ icon.ToImageSkia()->GetRepresentation(details.scale_factor).GetBitmap(), false, &icon_data->data()); - details.callback.Run(icon_data.get()); + std::move(details.callback).Run(icon_data.get()); } else { // TODO(glen): send a dummy icon. - details.callback.Run(nullptr); + std::move(details.callback).Run(nullptr); } }
diff --git a/chrome/browser/ui/webui/fileicon_source.h b/chrome/browser/ui/webui/fileicon_source.h index c7599d7..89cc0d1 100644 --- a/chrome/browser/ui/webui/fileicon_source.h +++ b/chrome/browser/ui/webui/fileicon_source.h
@@ -29,7 +29,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string&) override; bool AllowCaching() override; @@ -37,29 +37,30 @@ // Once the |path| and |icon_size| has been determined from the request, this // function is called to perform the actual fetch. Declared as virtual for // testing. - virtual void FetchFileIcon( - const base::FilePath& path, - float scale_factor, - IconLoader::IconSize icon_size, - const content::URLDataSource::GotDataCallback& callback); + virtual void FetchFileIcon(const base::FilePath& path, + float scale_factor, + IconLoader::IconSize icon_size, + content::URLDataSource::GotDataCallback callback); private: // Contains the necessary information for completing an icon fetch request. struct IconRequestDetails { IconRequestDetails(); - IconRequestDetails(const IconRequestDetails& other); + + IconRequestDetails(IconRequestDetails&& other); + IconRequestDetails& operator=(IconRequestDetails&& other); + ~IconRequestDetails(); // The callback to run with the response. content::URLDataSource::GotDataCallback callback; // The requested scale factor to respond with. - float scale_factor; + float scale_factor = 1; }; // Called when favicon data is available from the history backend. - void OnFileIconDataAvailable(const IconRequestDetails& details, - gfx::Image icon); + void OnFileIconDataAvailable(IconRequestDetails details, gfx::Image icon); // Tracks tasks requesting file icons. base::CancelableTaskTracker cancelable_task_tracker_;
diff --git a/chrome/browser/ui/webui/fileicon_source_unittest.cc b/chrome/browser/ui/webui/fileicon_source_unittest.cc index f56d2b6..c2b59c0 100644 --- a/chrome/browser/ui/webui/fileicon_source_unittest.cc +++ b/chrome/browser/ui/webui/fileicon_source_unittest.cc
@@ -22,11 +22,18 @@ public: TestFileIconSource() {} - MOCK_METHOD4(FetchFileIcon, + void FetchFileIcon( + const base::FilePath& path, + float scale_factor, + IconLoader::IconSize icon_size, + content::URLDataSource::GotDataCallback callback) override { + FetchFileIcon_(path, scale_factor, icon_size, callback); + } + MOCK_METHOD4(FetchFileIcon_, void(const base::FilePath& path, float scale_factor, IconLoader::IconSize icon_size, - const content::URLDataSource::GotDataCallback& callback)); + content::URLDataSource::GotDataCallback& callback)); ~TestFileIconSource() override {} }; @@ -115,14 +122,14 @@ for (unsigned i = 0; i < base::size(kBasicExpectations); i++) { auto source = std::make_unique<TestFileIconSource>(); content::URLDataSource::GotDataCallback callback; - EXPECT_CALL(*source.get(), - FetchFileIcon( - base::FilePath(kBasicExpectations[i].unescaped_path), - kBasicExpectations[i].scale_factor, - kBasicExpectations[i].size, CallbackIsNull())); + EXPECT_CALL( + *source.get(), + FetchFileIcon_(base::FilePath(kBasicExpectations[i].unescaped_path), + kBasicExpectations[i].scale_factor, + kBasicExpectations[i].size, CallbackIsNull())); source->StartDataRequest( GURL(base::StrCat( {"chrome://any-host/", kBasicExpectations[i].request_path})), - content::WebContents::Getter(), callback); + content::WebContents::Getter(), std::move(callback)); } }
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc index caafe22..0535200 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -97,7 +97,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; private: #if BUILDFLAG(ENABLE_SUPERVISED_USERS) @@ -479,7 +479,7 @@ void InterstitialHTMLSource::StartDataRequest( const GURL& request_url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { // TODO(crbug/1009127): Simplify usages of |path| since |request_url| is // available. const std::string path = @@ -536,7 +536,7 @@ } scoped_refptr<base::RefCountedString> html_bytes = new base::RefCountedString; html_bytes->data().assign(html.begin(), html.end()); - callback.Run(html_bytes.get()); + std::move(callback).Run(html_bytes.get()); } #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index aaa9615..f979ed1 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -154,7 +154,7 @@ void NewTabUI::NewTabHTMLSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. const std::string path = content::URLDataSource::URLToRequestPath(url); @@ -162,7 +162,7 @@ // A path under new-tab was requested; it's likely a bad relative // URL from the new tab page, but in any case it's an error. NOTREACHED() << path << " should not have been requested on the NTP"; - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } @@ -175,7 +175,7 @@ NTPResourceCacheFactory::GetForProfile(profile_)-> GetNewTabHTML(win_type)); - callback.Run(html_bytes.get()); + std::move(callback).Run(html_bytes.get()); } std::string NewTabUI::NewTabHTMLSource::GetMimeType(
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.h b/chrome/browser/ui/webui/ntp/new_tab_ui.h index 66f6c4d..acaf5cc2 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.h +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.h
@@ -58,7 +58,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string&) override; bool ShouldReplaceExistingSource() override; std::string GetContentSecurityPolicyScriptSrc() override;
diff --git a/chrome/browser/ui/webui/prefs_internals_source.cc b/chrome/browser/ui/webui/prefs_internals_source.cc index d4ba24aa..2885476 100644 --- a/chrome/browser/ui/webui/prefs_internals_source.cc +++ b/chrome/browser/ui/webui/prefs_internals_source.cc
@@ -30,7 +30,7 @@ void PrefsInternalsSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); std::string json; std::unique_ptr<base::DictionaryValue> prefs = @@ -38,5 +38,5 @@ DCHECK(prefs); CHECK(base::JSONWriter::WriteWithOptions( *prefs, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json)); - callback.Run(base::RefCountedString::TakeString(&json)); + std::move(callback).Run(base::RefCountedString::TakeString(&json)); }
diff --git a/chrome/browser/ui/webui/prefs_internals_source.h b/chrome/browser/ui/webui/prefs_internals_source.h index 8aad42fa..5fc4058 100644 --- a/chrome/browser/ui/webui/prefs_internals_source.h +++ b/chrome/browser/ui/webui/prefs_internals_source.h
@@ -22,7 +22,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; private: Profile* profile_;
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index fa158a2..e3cf8ccb 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -146,9 +146,8 @@ } // Get markup or other resources for the print preview page. -void HandleRequestCallback( - const std::string& path, - const content::WebUIDataSource::GotDataCallback& callback) { +void HandleRequestCallback(const std::string& path, + content::WebUIDataSource::GotDataCallback callback) { // ChromeWebUIDataSource handles most requests except for the print preview // data. int preview_ui_id; @@ -159,12 +158,12 @@ PrintPreviewDataService::GetInstance()->GetDataEntry(preview_ui_id, page_index, &data); if (data.get()) { - callback.Run(data.get()); + std::move(callback).Run(data.get()); return; } // Invalid request. auto empty_bytes = base::MakeRefCounted<base::RefCountedBytes>(); - callback.Run(empty_bytes.get()); + std::move(callback).Run(empty_bytes.get()); } void AddPrintPreviewStrings(content::WebUIDataSource* source) {
diff --git a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc index f249f72..f20ce9d 100644 --- a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc +++ b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.cc
@@ -7,10 +7,13 @@ #include <utility> #include "base/bind.h" +#include "base/memory/ptr_util.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager.h" +#include "chrome/browser/chromeos/kerberos/kerberos_credentials_manager_factory.h" +#include "chrome/browser/profiles/profile.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/time_format.h" #include "ui/base/resource/resource_bundle.h" @@ -21,9 +24,26 @@ namespace chromeos { namespace settings { -KerberosAccountsHandler::KerberosAccountsHandler() = default; +// static +std::unique_ptr<KerberosAccountsHandler> +KerberosAccountsHandler::CreateIfKerberosEnabled(Profile* profile) { + KerberosCredentialsManager* kerberos_credentials_manager = + KerberosCredentialsManagerFactory::GetExisting(profile); + if (!kerberos_credentials_manager || + !kerberos_credentials_manager->IsKerberosEnabled()) + return nullptr; + return base::WrapUnique( + new KerberosAccountsHandler(kerberos_credentials_manager)); +} + KerberosAccountsHandler::~KerberosAccountsHandler() = default; +KerberosAccountsHandler::KerberosAccountsHandler( + KerberosCredentialsManager* kerberos_credentials_manager) + : kerberos_credentials_manager_(kerberos_credentials_manager) { + DCHECK(kerberos_credentials_manager_); +} + void KerberosAccountsHandler::RegisterMessages() { web_ui()->RegisterMessageCallback( "getKerberosAccounts", @@ -56,12 +76,12 @@ CHECK_EQ(1U, args->GetSize()); const std::string& callback_id = args->GetList()[0].GetString(); - if (!KerberosCredentialsManager::Get().IsKerberosEnabled()) { + if (!kerberos_credentials_manager_->IsKerberosEnabled()) { ResolveJavascriptCallback(base::Value(callback_id), base::Value()); return; } - KerberosCredentialsManager::Get().ListAccounts( + kerberos_credentials_manager_->ListAccounts( base::BindOnce(&KerberosAccountsHandler::OnListAccounts, weak_factory_.GetWeakPtr(), callback_id)); } @@ -79,7 +99,7 @@ skia_ticket_icon.GetRepresentation(1.0f).GetBitmap()); const std::string& active_principal = - KerberosCredentialsManager::Get().GetActiveAccount(); + kerberos_credentials_manager_->GetActiveAccount(); for (int n = 0; n < response.accounts_size(); ++n) { const kerberos::Account& account = response.accounts(n); @@ -125,13 +145,13 @@ const std::string& config = args->GetList()[4].GetString(); const bool allow_existing = args->GetList()[5].GetBool(); - if (!KerberosCredentialsManager::Get().IsKerberosEnabled()) { + if (!kerberos_credentials_manager_->IsKerberosEnabled()) { ResolveJavascriptCallback(base::Value(callback_id), base::Value(kerberos::ERROR_KERBEROS_DISABLED)); return; } - KerberosCredentialsManager::Get().AddAccountAndAuthenticate( + kerberos_credentials_manager_->AddAccountAndAuthenticate( principal_name, false /* is_managed */, password, remember_password, config, allow_existing, base::BindOnce(&KerberosAccountsHandler::OnAddAccountAndAuthenticate, @@ -153,13 +173,13 @@ const std::string& callback_id = args->GetList()[0].GetString(); const std::string& principal_name = args->GetList()[1].GetString(); - if (!KerberosCredentialsManager::Get().IsKerberosEnabled()) { + if (!kerberos_credentials_manager_->IsKerberosEnabled()) { ResolveJavascriptCallback(base::Value(callback_id), base::Value(kerberos::ERROR_KERBEROS_DISABLED)); return; } - KerberosCredentialsManager::Get().RemoveAccount( + kerberos_credentials_manager_->RemoveAccount( principal_name, base::BindOnce(&KerberosAccountsHandler::OnRemoveAccount, weak_factory_.GetWeakPtr(), callback_id)); } @@ -178,13 +198,13 @@ const std::string& callback_id = args->GetList()[0].GetString(); const std::string& krb5conf = args->GetList()[1].GetString(); - if (!KerberosCredentialsManager::Get().IsKerberosEnabled()) { + if (!kerberos_credentials_manager_->IsKerberosEnabled()) { ResolveJavascriptCallback(base::Value(callback_id), base::Value(kerberos::ERROR_KERBEROS_DISABLED)); return; } - KerberosCredentialsManager::Get().ValidateConfig( + kerberos_credentials_manager_->ValidateConfig( krb5conf, base::BindOnce(&KerberosAccountsHandler::OnValidateConfig, weak_factory_.GetWeakPtr(), callback_id)); } @@ -212,11 +232,11 @@ CHECK_EQ(1U, args->GetSize()); const std::string& principal_name = args->GetList()[0].GetString(); - KerberosCredentialsManager::Get().SetActiveAccount(principal_name); + kerberos_credentials_manager_->SetActiveAccount(principal_name); } void KerberosAccountsHandler::OnJavascriptAllowed() { - credentials_manager_observer_.Add(&KerberosCredentialsManager::Get()); + credentials_manager_observer_.Add(kerberos_credentials_manager_); } void KerberosAccountsHandler::OnJavascriptDisallowed() {
diff --git a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h index 00dfa0c..7502d89 100644 --- a/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h +++ b/chrome/browser/ui/webui/settings/chromeos/kerberos_accounts_handler.h
@@ -5,6 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_KERBEROS_ACCOUNTS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_KERBEROS_ACCOUNTS_HANDLER_H_ +#include <memory> #include <string> #include <vector> @@ -20,13 +21,17 @@ class ListAccountsResponse; } +class Profile; + namespace chromeos { namespace settings { class KerberosAccountsHandler : public ::settings::SettingsPageUIHandler, public KerberosCredentialsManager::Observer { public: - KerberosAccountsHandler(); + static std::unique_ptr<KerberosAccountsHandler> CreateIfKerberosEnabled( + Profile* profile); + ~KerberosAccountsHandler() override; // WebUIMessageHandler: @@ -38,6 +43,9 @@ void OnAccountsChanged() override; private: + explicit KerberosAccountsHandler( + KerberosCredentialsManager* kerberos_credentials_manager); + // WebUI "getKerberosAccounts" message callback. void HandleGetKerberosAccounts(const base::ListValue* args); @@ -79,6 +87,9 @@ KerberosCredentialsManager::Observer> credentials_manager_observer_{this}; + // Not owned. + KerberosCredentialsManager* kerberos_credentials_manager_; + base::WeakPtrFactory<KerberosAccountsHandler> weak_factory_{this}; DISALLOW_COPY_AND_ASSIGN(KerberosAccountsHandler);
diff --git a/chrome/browser/ui/webui/settings/settings_ui.cc b/chrome/browser/ui/webui/settings/settings_ui.cc index 7f944de..71b480e 100644 --- a/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chrome/browser/ui/webui/settings/settings_ui.cc
@@ -388,11 +388,16 @@ std::make_unique<chromeos::settings::FingerprintHandler>(profile)); web_ui->AddMessageHandler( std::make_unique<chromeos::settings::GoogleAssistantHandler>(profile)); - if (g_browser_process->local_state()->GetBoolean(prefs::kKerberosEnabled)) { - // Note that UI is also dependent on this pref. - web_ui->AddMessageHandler( - std::make_unique<chromeos::settings::KerberosAccountsHandler>()); + + std::unique_ptr<chromeos::settings::KerberosAccountsHandler> + kerberos_accounts_handler = + chromeos::settings::KerberosAccountsHandler::CreateIfKerberosEnabled( + profile); + if (kerberos_accounts_handler) { + // Note that the UI is enabled only if Kerberos is enabled. + web_ui->AddMessageHandler(std::move(kerberos_accounts_handler)); } + web_ui->AddMessageHandler( std::make_unique<chromeos::settings::KeyboardHandler>());
diff --git a/chrome/browser/ui/webui/test_data_source.cc b/chrome/browser/ui/webui/test_data_source.cc index 06a22e5d..aa03e09 100644 --- a/chrome/browser/ui/webui/test_data_source.cc +++ b/chrome/browser/ui/webui/test_data_source.cc
@@ -45,13 +45,13 @@ void TestDataSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { const std::string path = content::URLDataSource::URLToRequestPath(url); base::PostTask( FROM_HERE, {base::ThreadPool(), base::MayBlock(), base::TaskPriority::USER_BLOCKING}, base::BindOnce(&TestDataSource::ReadFile, base::Unretained(this), path, - callback)); + std::move(callback))); } std::string TestDataSource::GetMimeType(const std::string& path) { @@ -87,7 +87,7 @@ void TestDataSource::ReadFile( const std::string& path, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { std::string content; GURL url = GetURLForPath(path); @@ -125,5 +125,5 @@ scoped_refptr<base::RefCountedString> response = base::RefCountedString::TakeString(&content); - callback.Run(response.get()); + std::move(callback).Run(response.get()); }
diff --git a/chrome/browser/ui/webui/test_data_source.h b/chrome/browser/ui/webui/test_data_source.h index b34e8808..f65809d 100644 --- a/chrome/browser/ui/webui/test_data_source.h +++ b/chrome/browser/ui/webui/test_data_source.h
@@ -22,7 +22,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; @@ -37,7 +37,7 @@ GURL GetURLForPath(const std::string& path); void ReadFile(const std::string& path, - const content::URLDataSource::GotDataCallback& callback); + content::URLDataSource::GotDataCallback callback); base::FilePath src_root_; base::FilePath gen_root_;
diff --git a/chrome/browser/ui/webui/test_files_request_filter.cc b/chrome/browser/ui/webui/test_files_request_filter.cc index 8255db50..7b971f56 100644 --- a/chrome/browser/ui/webui/test_files_request_filter.cc +++ b/chrome/browser/ui/webui/test_files_request_filter.cc
@@ -29,7 +29,7 @@ void HandleTestFileRequestCallback( const std::string& path, - const content::WebUIDataSource::GotDataCallback& callback) { + content::WebUIDataSource::GotDataCallback callback) { DCHECK(ShouldHandleTestFileRequestCallback(path)); base::ScopedAllowBlockingForTesting allow_blocking; @@ -44,7 +44,7 @@ base::RefCountedString* ref_contents = new base::RefCountedString(); ref_contents->data() = contents; - callback.Run(ref_contents); + std::move(callback).Run(ref_contents); } } // namespace
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 31b07bc..536f075 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc
@@ -84,7 +84,7 @@ void ThemeSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { // TODO(crbug/1009127): Simplify usages of |path| since |url| is available. const std::string path = content::URLDataSource::URLToRequestPath(url); // Default scale factor if not specified. @@ -99,7 +99,7 @@ NTPResourceCache::WindowType type = NTPResourceCache::GetWindowType(profile_, /*render_host=*/nullptr); NTPResourceCache* cache = NTPResourceCacheFactory::GetForProfile(profile_); - callback.Run(cache->GetNewTabCSS(type)); + std::move(callback).Run(cache->GetNewTabCSS(type)); return; } @@ -150,16 +150,16 @@ // URLs are only used by WebUI pages and component extensions. However, the // user can also enter these into the omnibox, so we need to fail // gracefully. - callback.Run(nullptr); + std::move(callback).Run(nullptr); } else if ((GetMimeType(path) == "image/png") && ((scale > max_scale) || (frame != -1))) { // This will extract and scale frame 0 of animated images. // TODO(reveman): Support scaling of animated images and avoid scaling and // re-encode when specific frame is specified (crbug.com/750064). DCHECK_LE(frame, 0); - SendThemeImage(callback, resource_id, scale); + SendThemeImage(std::move(callback), resource_id, scale); } else { - SendThemeBitmap(callback, resource_id, scale); + SendThemeBitmap(std::move(callback), resource_id, scale); } } @@ -206,7 +206,7 @@ // ThemeSource, private: void ThemeSource::SendThemeBitmap( - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, int resource_id, float scale) { ui::ScaleFactor scale_factor = ui::GetSupportedScaleFactor(scale); @@ -215,16 +215,17 @@ scoped_refptr<base::RefCountedMemory> image_data( ThemeService::GetThemeProviderForProfile(profile_->GetOriginalProfile()) .GetRawData(resource_id, scale_factor)); - callback.Run(image_data.get()); + std::move(callback).Run(image_data.get()); } else { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); const ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - callback.Run(rb.LoadDataResourceBytesForScale(resource_id, scale_factor)); + std::move(callback).Run( + rb.LoadDataResourceBytesForScale(resource_id, scale_factor)); } } void ThemeSource::SendThemeImage( - const content::URLDataSource::GotDataCallback& callback, + content::URLDataSource::GotDataCallback callback, int resource_id, float scale) { scoped_refptr<base::RefCountedBytes> data(new base::RefCountedBytes()); @@ -233,7 +234,7 @@ const ui::ThemeProvider& tp = ThemeService::GetThemeProviderForProfile( profile_->GetOriginalProfile()); ProcessImageOnUiThread(*tp.GetImageSkiaNamed(resource_id), scale, data); - callback.Run(data.get()); + std::move(callback).Run(data.get()); } else { DCHECK_CURRENTLY_ON(content::BrowserThread::IO); // Fetching image data in ResourceBundle should happen on the UI thread. See @@ -241,7 +242,7 @@ base::PostTaskAndReply( FROM_HERE, {content::BrowserThread::UI}, base::BindOnce(&ProcessResourceOnUiThread, resource_id, scale, data), - base::BindOnce(callback, data)); + base::BindOnce(std::move(callback), data)); } }
diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h index b862455..33849c5 100644 --- a/chrome/browser/ui/webui/theme_source.h +++ b/chrome/browser/ui/webui/theme_source.h
@@ -25,7 +25,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; scoped_refptr<base::SingleThreadTaskRunner> TaskRunnerForRequestPath( const std::string& path) override; @@ -38,14 +38,14 @@ private: // Fetches and sends the theme bitmap. - void SendThemeBitmap(const content::URLDataSource::GotDataCallback& callback, + void SendThemeBitmap(content::URLDataSource::GotDataCallback callback, int resource_id, float scale); // Used in place of SendThemeBitmap when the desired scale is larger than // what the resource bundle supports. This can rescale the provided bitmap up // to the desired size. - void SendThemeImage(const content::URLDataSource::GotDataCallback& callback, + void SendThemeImage(content::URLDataSource::GotDataCallback callback, int resource_id, float scale);
diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index 489540a1..d4cc3e8e 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc
@@ -28,7 +28,9 @@ theme_source()->StartDataRequest( GURL(base::StrCat({content::kChromeUIScheme, "://", chrome::kChromeUIThemeHost, "/", source})), - content::WebContents::Getter(), callback_); + content::WebContents::Getter(), + base::BindOnce(&WebUISourcesTest::SendResponse, + base::Unretained(this))); } size_t result_data_size_; @@ -37,8 +39,6 @@ void SetUp() override { profile_ = std::make_unique<TestingProfile>(); theme_source_ = std::make_unique<ThemeSource>(profile_.get()); - callback_ = base::Bind(&WebUISourcesTest::SendResponse, - base::Unretained(this)); } void TearDown() override { @@ -50,8 +50,6 @@ result_data_size_ = data ? data->size() : 0; } - content::URLDataSource::GotDataCallback callback_; - content::BrowserTaskEnvironment task_environment_; std::unique_ptr<TestingProfile> profile_;
diff --git a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.cc b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.cc index 9a5026c..8715328 100644 --- a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.cc +++ b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.cc
@@ -21,9 +21,9 @@ NtpBackgroundFetcher::NtpBackgroundFetcher( size_t index, - const content::WebUIDataSource::GotDataCallback& callback) - : index_(index), callback_(callback) { - DCHECK(callback_ && !callback_.is_null()); + content::WebUIDataSource::GotDataCallback callback) + : index_(index), callback_(std::move(callback)) { + DCHECK(callback_); net::NetworkTrafficAnnotationTag traffic_annotation = net::DefineNetworkTrafficAnnotation("nux_ntp_background_preview", R"( semantics { @@ -74,9 +74,10 @@ void NtpBackgroundFetcher::OnFetchCompleted( std::unique_ptr<std::string> response_body) { if (response_body) { - callback_.Run(base::RefCountedString::TakeString(response_body.release())); + std::move(callback_).Run( + base::RefCountedString::TakeString(response_body.release())); } else { - callback_.Run(base::MakeRefCounted<base::RefCountedBytes>()); + std::move(callback_).Run(base::MakeRefCounted<base::RefCountedBytes>()); } }
diff --git a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h index bfd25a3..f7ec424 100644 --- a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h +++ b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h
@@ -20,9 +20,8 @@ class NtpBackgroundFetcher { public: - NtpBackgroundFetcher( - size_t index, - const content::WebUIDataSource::GotDataCallback& callback); + NtpBackgroundFetcher(size_t index, + content::WebUIDataSource::GotDataCallback callback); ~NtpBackgroundFetcher(); private:
diff --git a/chrome/browser/ui/webui/welcome/welcome_ui.cc b/chrome/browser/ui/webui/welcome/welcome_ui.cc index bff9f47a..a6209d2e 100644 --- a/chrome/browser/ui/webui/welcome/welcome_ui.cc +++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc
@@ -54,10 +54,9 @@ return !!weak_ptr; } -void HandleRequestCallback( - base::WeakPtr<WelcomeUI> weak_ptr, - const std::string& path, - const content::WebUIDataSource::GotDataCallback& callback) { +void HandleRequestCallback(base::WeakPtr<WelcomeUI> weak_ptr, + const std::string& path, + content::WebUIDataSource::GotDataCallback callback) { DCHECK(ShouldHandleRequestCallback(weak_ptr, path)); std::string index_param = path.substr(path.find_first_of("?") + 1); @@ -66,7 +65,7 @@ background_index < 0); DCHECK(weak_ptr); - weak_ptr->CreateBackgroundFetcher(background_index, callback); + weak_ptr->CreateBackgroundFetcher(background_index, std::move(callback)); } void AddStrings(content::WebUIDataSource* html_source) { @@ -204,9 +203,9 @@ void WelcomeUI::CreateBackgroundFetcher( size_t background_index, - const content::WebUIDataSource::GotDataCallback& callback) { + content::WebUIDataSource::GotDataCallback callback) { background_fetcher_ = std::make_unique<welcome::NtpBackgroundFetcher>( - background_index, callback); + background_index, std::move(callback)); } void WelcomeUI::StorePageSeen(Profile* profile) {
diff --git a/chrome/browser/ui/webui/welcome/welcome_ui.h b/chrome/browser/ui/webui/welcome/welcome_ui.h index 3f0be1a..4b51947 100644 --- a/chrome/browser/ui/webui/welcome/welcome_ui.h +++ b/chrome/browser/ui/webui/welcome/welcome_ui.h
@@ -26,7 +26,7 @@ void CreateBackgroundFetcher( size_t background_index, - const content::WebUIDataSource::GotDataCallback& callback); + content::WebUIDataSource::GotDataCallback callback); protected: // Visible for testing.
diff --git a/chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.cc b/chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.cc index f8399a6..fce490a 100644 --- a/chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.cc +++ b/chrome/browser/web_applications/extensions/system_web_app_manager_browsertest.cc
@@ -82,7 +82,7 @@ }), base::BindRepeating( [](const std::string& id, - const content::WebUIDataSource::GotDataCallback& callback) { + content::WebUIDataSource::GotDataCallback callback) { scoped_refptr<base::RefCountedString> ref_contents( new base::RefCountedString); if (id == "manifest.json") @@ -92,7 +92,7 @@ else NOTREACHED(); - callback.Run(ref_contents); + std::move(callback).Run(ref_contents); })); content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), data_source);
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 2133047..c211d94 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -763,6 +763,7 @@ "//ppapi:ppapi_tests", "//ppapi:power_saver_test_plugin", "//testing/buildbot/filters:browser_tests_filters", + "//testing/buildbot/filters:linux_trusty_rel_browser_tests_filters", "//third_party/mesa_headers", "//third_party/widevine/cdm:widevine_test_license_server", "//tools/media_engagement_preload:generator", @@ -2139,6 +2140,7 @@ "../browser/chromeos/input_method/textinput_surroundingtext_browsertest.cc", "../browser/chromeos/input_method/textinput_test_helper.cc", "../browser/chromeos/input_method/textinput_test_helper.h", + "../browser/chromeos/kerberos/kerberos_credentials_manager_factory_browsertest.cc", "../browser/chromeos/lock_screen_apps/note_taking_browsertest.cc", "../browser/chromeos/logging_browsertest.cc", "../browser/chromeos/login/accessibility_browsertest.cc", @@ -3164,6 +3166,8 @@ "../browser/permissions/chooser_context_base_mock_permission_observer.cc", "../browser/permissions/chooser_context_base_mock_permission_observer.h", "../browser/permissions/chooser_context_base_unittest.cc", + "../browser/permissions/crowd_deny_preload_data_unittest.cc", + "../browser/permissions/crowd_deny_safe_browsing_request_unittest.cc", "../browser/permissions/permission_context_base_feature_policy_unittest.cc", "../browser/permissions/permission_context_base_unittest.cc", "../browser/permissions/permission_decision_auto_blocker_unittest.cc", @@ -5142,7 +5146,6 @@ if (!is_chromeos) { sources += [ "../browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc", - "../browser/ui/views/sync/bubble_sync_promo_view_unittest.cc", "../browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc", ] }
diff --git a/chrome/test/base/search_test_utils.cc b/chrome/test/base/search_test_utils.cc index 76fc37a..45e3fc82 100644 --- a/chrome/test/base/search_test_utils.cc +++ b/chrome/test/base/search_test_utils.cc
@@ -5,6 +5,7 @@ #include "chrome/test/base/search_test_utils.h" #include "base/memory/ref_counted.h" +#include "base/test/bind_test_util.h" #include "components/search_engines/template_url_service.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h" @@ -17,7 +18,8 @@ scoped_refptr<content::MessageLoopRunner> message_loop_runner = new content::MessageLoopRunner; std::unique_ptr<TemplateURLService::Subscription> subscription = - service->RegisterOnLoadedCallback(message_loop_runner->QuitClosure()); + service->RegisterOnLoadedCallback( + base::BindLambdaForTesting([&]() { message_loop_runner->Quit(); })); service->Load(); message_loop_runner->Run();
diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc index e404704..0341a0d 100644 --- a/chrome/test/base/web_ui_browser_test.cc +++ b/chrome/test/base/web_ui_browser_test.cc
@@ -347,9 +347,6 @@ #endif } -const std::string BaseWebUIBrowserTest::kDummyURL = - content::GetWebUIURLString("DummyURL"); - BaseWebUIBrowserTest::BaseWebUIBrowserTest() : libraries_preloaded_(false), override_selected_web_ui_(nullptr) {} @@ -369,6 +366,11 @@ namespace { +const GURL& DummyUrl() { + static GURL url(content::GetWebUIURLString("DummyURL")); + return url; +} + // DataSource for the dummy URL. If no data source is provided then an error // page is shown. While this doesn't matter for most tests, without it, // navigation to different anchors cannot be listened to (via the hashchange @@ -384,11 +386,11 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override { + content::URLDataSource::GotDataCallback callback) override { std::string dummy_html = "<html><body>Dummy</body></html>"; scoped_refptr<base::RefCountedString> response = base::RefCountedString::TakeString(&dummy_html); - callback.Run(response.get()); + std::move(callback).Run(response.get()); } std::string GetMimeType(const std::string& path) override { @@ -450,7 +452,7 @@ content::WebUIControllerFactory::RegisterFactory(test_factory_.get()); - test_factory_->AddFactoryOverride(GURL(kDummyURL).host(), + test_factory_->AddFactoryOverride(DummyUrl().host(), mock_provider_.Pointer()); test_factory_->AddFactoryOverride(content::kChromeUIResourcesHost, mock_provider_.Pointer()); @@ -459,7 +461,7 @@ void BaseWebUIBrowserTest::TearDownOnMainThread() { logging::SetLogMessageHandler(nullptr); - test_factory_->RemoveFactoryOverride(GURL(kDummyURL).host()); + test_factory_->RemoveFactoryOverride(DummyUrl().host()); content::WebUIControllerFactory::UnregisterFactoryForTesting( test_factory_.get());
diff --git a/chrome/test/base/web_ui_browser_test_browsertest.cc b/chrome/test/base/web_ui_browser_test_browsertest.cc index dcbcfc10..b1a7abf 100644 --- a/chrome/test/base/web_ui_browser_test_browsertest.cc +++ b/chrome/test/base/web_ui_browser_test_browsertest.cc
@@ -21,6 +21,13 @@ using content::WebUIMessageHandler; +namespace { +const GURL& DummyUrl() { + static GURL url(content::GetWebUIURLString("DummyURL")); + return url; +} +} // namespace + // According to the interface for EXPECT_FATAL_FAILURE // (https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuide.md#catching-failures) // the statement must be statically available. Therefore, we make a static @@ -79,7 +86,7 @@ IN_PROC_BROWSER_TEST_F(WebUIBrowserExpectFailTest, MAYBE_TestRuntimeErrorFailsFast) { AddLibrary(base::FilePath(FILE_PATH_LITERAL("runtime_error.js"))); - ui_test_utils::NavigateToURL(browser(), GURL(kDummyURL)); + ui_test_utils::NavigateToURL(browser(), DummyUrl()); EXPECT_FATAL_FAILURE(RunJavascriptTestNoReturn("TestRuntimeErrorFailsFast"), "GetAsBoolean(&run_test_succeeded_)"); } @@ -170,11 +177,11 @@ return &message_handler_; } - // Set up and browse to kDummyURL for all tests. + // Set up and browse to DummyUrl() for all tests. void SetUpOnMainThread() override { WebUIBrowserTest::SetUpOnMainThread(); AddLibrary(base::FilePath(FILE_PATH_LITERAL("async.js"))); - ui_test_utils::NavigateToURL(browser(), GURL(kDummyURL)); + ui_test_utils::NavigateToURL(browser(), DummyUrl()); } DISALLOW_COPY_AND_ASSIGN(WebUIBrowserAsyncTest);
diff --git a/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_default_account.Nexus_5-19.png.sha1 b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_default_account.Nexus_5-19.png.sha1 new file mode 100644 index 0000000..c6579784 --- /dev/null +++ b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_default_account.Nexus_5-19.png.sha1
@@ -0,0 +1 @@ +fd443b5ae7299144538cfe6b719665465ccfde39 \ No newline at end of file
diff --git a/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_default_account.Nexus_5X-23.png.sha1 b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_default_account.Nexus_5X-23.png.sha1 new file mode 100644 index 0000000..561e74f --- /dev/null +++ b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_default_account.Nexus_5X-23.png.sha1
@@ -0,0 +1 @@ +0355de87435bd2c19d0959d3b2ba5ff2652fe9f6 \ No newline at end of file
diff --git a/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_new_account.Nexus_5-19.png.sha1 b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_new_account.Nexus_5-19.png.sha1 new file mode 100644 index 0000000..77b6d8c --- /dev/null +++ b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_new_account.Nexus_5-19.png.sha1
@@ -0,0 +1 @@ +0d7c8965aab0e4e91b61bf29a85ff91df24cb6b7 \ No newline at end of file
diff --git a/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_new_account.Nexus_5X-23.png.sha1 b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_new_account.Nexus_5X-23.png.sha1 new file mode 100644 index 0000000..6263ab71 --- /dev/null +++ b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_new_account.Nexus_5X-23.png.sha1
@@ -0,0 +1 @@ +59aa24bcca0dc6713ef3567cf71f7e16e6ce0725 \ No newline at end of file
diff --git a/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_not_default_account.Nexus_5-19.png.sha1 b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_not_default_account.Nexus_5-19.png.sha1 new file mode 100644 index 0000000..c6579784 --- /dev/null +++ b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_not_default_account.Nexus_5-19.png.sha1
@@ -0,0 +1 @@ +fd443b5ae7299144538cfe6b719665465ccfde39 \ No newline at end of file
diff --git a/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_not_default_account.Nexus_5X-23.png.sha1 b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_not_default_account.Nexus_5X-23.png.sha1 new file mode 100644 index 0000000..561e74f --- /dev/null +++ b/chrome/test/data/android/render_tests/SigninFragmentTest.signin_fragment_not_default_account.Nexus_5X-23.png.sha1
@@ -0,0 +1 @@ +0355de87435bd2c19d0959d3b2ba5ff2652fe9f6 \ No newline at end of file
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM index 3447e57..803521a8 100644 --- a/chromeos/CHROMEOS_LKGM +++ b/chromeos/CHROMEOS_LKGM
@@ -1 +1 @@ -12719.0.0 \ No newline at end of file +12720.0.0 \ No newline at end of file
diff --git a/components/BUILD.gn b/components/BUILD.gn index 4902423..9b01ba9 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn
@@ -235,7 +235,6 @@ "//components/gcm_driver/instance_id:unit_tests", "//components/history/content/browser:unit_tests", "//components/invalidation/impl:unit_tests", - "//components/invalidation/public:unit_tests", "//components/keyed_service/content:unit_tests", "//components/language/content/browser:unit_tests", "//components/link_header_util:unit_tests",
diff --git a/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc b/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc index ef331aa3..e35e0bd 100644 --- a/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc +++ b/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc
@@ -43,13 +43,14 @@ // to a task runner, requires running the loop to complete. strike_database_.reset(); strike_database_service_.reset(); + db_provider_.reset(); task_environment_.RunUntilIdle(); } protected: base::HistogramTester* GetHistogramTester() { return &histogram_tester_; } - base::test::TaskEnvironment task_environment_; base::ScopedTempDir temp_dir_; + base::test::TaskEnvironment task_environment_; std::unique_ptr<leveldb_proto::ProtoDatabaseProvider> db_provider_; std::unique_ptr<StrikeDatabase> strike_database_service_; std::unique_ptr<StrikeDatabaseIntegratorTestStrikeDatabase> strike_database_;
diff --git a/components/autofill/core/browser/ui/popup_item_ids.h b/components/autofill/core/browser/ui/popup_item_ids.h index 52193d51..275d923 100644 --- a/components/autofill/core/browser/ui/popup_item_ids.h +++ b/components/autofill/core/browser/ui/popup_item_ids.h
@@ -27,6 +27,7 @@ POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY = -13, POPUP_ITEM_ID_GENERATE_PASSWORD_ENTRY = -14, POPUP_ITEM_ID_SHOW_ACCOUNT_CARDS = -15, + POPUP_ITEM_ID_PASSWORD_SYNC_OPTIN = -16, }; } // namespace autofill
diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index 62ab107..3b93b6a 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp
@@ -1,18 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <grit-part> - <message name="IDS_AUTOFILL_SIGNIN_PROMO_MESSAGE" desc="Promo message for Sign-in Promo bubble (shown after a local save) to get people to sign in."> - To use your cards on all devices, sign in and turn on sync. - </message> <message name="IDS_AUTOFILL_SYNC_PROMO_MESSAGE" desc="Promo message for Sign-in Promo bubble (shown after a local save) to get people to sync."> To use your cards on all devices, turn on sync. </message> - <message name="IDS_AUTOFILL_SIGNIN_PROMO_MESSAGE_DICE_DISABLED" desc="Text of the sign in promo bubble and manage cards footnote."> - To use your cards on all your devices, <ph name="SIGN_IN_LINK">$1<ex>sign in</ex></ph>. - </message> - <message name="IDS_AUTOFILL_SIGNIN_PROMO_LINK_DICE_DISABLED" desc="Text of the link to sign in from the save card sync promo."> - sign in to Chrome - </message> <if expr="not use_titlecase"> <message name="IDS_AUTOFILL_NO_THANKS_DESKTOP_LOCAL_SAVE" desc="The label for cancel button used in autofill credit card local save bubble on desktop.">
diff --git a/components/browser_sync/profile_sync_components_factory_impl.cc b/components/browser_sync/profile_sync_components_factory_impl.cc index 2ae3cb5b..d9124245 100644 --- a/components/browser_sync/profile_sync_components_factory_impl.cc +++ b/components/browser_sync/profile_sync_components_factory_impl.cc
@@ -289,7 +289,8 @@ account_password_store_ ? account_password_store_->CreateSyncControllerDelegate() : nullptr, - sync_service, sync_client_->GetPasswordStateChangedCallback())); + sync_client_->GetPrefService(), sync_service, + sync_client_->GetPasswordStateChangedCallback())); } } else { controllers.push_back(std::make_unique<PasswordDataTypeController>(
diff --git a/components/cronet/ios/cronet_environment.mm b/components/cronet/ios/cronet_environment.mm index 00eec63..3ec7cda 100644 --- a/components/cronet/ios/cronet_environment.mm +++ b/components/cronet/ios/cronet_environment.mm
@@ -315,7 +315,8 @@ } if (user_agent_partial_) - user_agent_ = web::BuildUserAgentFromProduct(user_agent_); + user_agent_ = + web::BuildUserAgentFromProduct(web::UserAgentType::MOBILE, user_agent_); // Cache base::FilePath storage_path;
diff --git a/components/cronet/ios/cronet_global_state_ios.mm b/components/cronet/ios/cronet_global_state_ios.mm index b38c0598..5683a70 100644 --- a/components/cronet/ios/cronet_global_state_ios.mm +++ b/components/cronet/ios/cronet_global_state_ios.mm
@@ -81,7 +81,8 @@ // Creates default User-Agent request value, combining optional // |partial_user_agent| with system-dependent values. std::string CreateDefaultUserAgent(const std::string& partial_user_agent) { - return web::BuildUserAgentFromProduct(partial_user_agent); + return web::BuildUserAgentFromProduct(web::UserAgentType::MOBILE, + partial_user_agent); } void SetNetworkThreadPriorityOnNetworkThread(double priority) {
diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc index 6f57f7b..f82ccdb 100644 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -206,7 +206,7 @@ void DomDistillerViewerSource::StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) { + content::URLDataSource::GotDataCallback callback) { // TODO(crbug/1009127): simplify path matching. const std::string path = URLDataSource::URLToRequestPath(url); content::WebContents* web_contents = wc_getter.Run(); @@ -214,12 +214,12 @@ return; if (kViewerCssPath == path) { std::string css = viewer::GetCss(); - callback.Run(base::RefCountedString::TakeString(&css)); + std::move(callback).Run(base::RefCountedString::TakeString(&css)); return; } if (kViewerLoadingImagePath == path) { std::string image = viewer::GetLoadingImage(); - callback.Run(base::RefCountedString::TakeString(&image)); + std::move(callback).Run(base::RefCountedString::TakeString(&image)); return; } if (base::StartsWith(path, kViewerSaveFontScalingPath, @@ -267,7 +267,8 @@ } // Place template on the page. - callback.Run(base::RefCountedString::TakeString(&unsafe_page_html)); + std::move(callback).Run( + base::RefCountedString::TakeString(&unsafe_page_html)); } std::string DomDistillerViewerSource::GetMimeType(const std::string& path) {
diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.h b/components/dom_distiller/content/browser/dom_distiller_viewer_source.h index f011c182..0e1e660 100644 --- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.h +++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.h
@@ -32,7 +32,7 @@ void StartDataRequest( const GURL& url, const content::WebContents::Getter& wc_getter, - const content::URLDataSource::GotDataCallback& callback) override; + content::URLDataSource::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) override; bool ShouldServiceRequest(const GURL& url, content::ResourceContext* resource_context,
diff --git a/components/dom_distiller/core/fake_distiller.cc b/components/dom_distiller/core/fake_distiller.cc index c1e97165..a86e7b5 100644 --- a/components/dom_distiller/core/fake_distiller.cc +++ b/components/dom_distiller/core/fake_distiller.cc
@@ -24,12 +24,12 @@ EXPECT_CALL(*this, Die()).Times(testing::AnyNumber()); } -FakeDistiller::FakeDistiller( - bool execute_callback, - const base::Closure& distillation_initiated_callback) +FakeDistiller::FakeDistiller(bool execute_callback, + base::OnceClosure distillation_initiated_callback) : execute_callback_(execute_callback), destruction_allowed_(true), - distillation_initiated_callback_(distillation_initiated_callback) { + distillation_initiated_callback_( + std::move(distillation_initiated_callback)) { EXPECT_CALL(*this, Die()).Times(testing::AnyNumber()); } @@ -46,7 +46,7 @@ url_ = url; article_callback_ = article_callback; page_callback_ = page_callback; - if (!distillation_initiated_callback_.is_null()) { + if (distillation_initiated_callback_) { std::move(distillation_initiated_callback_).Run(); } if (execute_callback_) {
diff --git a/components/dom_distiller/core/fake_distiller.h b/components/dom_distiller/core/fake_distiller.h index ff02014..7b8d47a4 100644 --- a/components/dom_distiller/core/fake_distiller.h +++ b/components/dom_distiller/core/fake_distiller.h
@@ -37,7 +37,7 @@ // TODO(yfriedman): Drop execute_callback from this and give the option of // "auto-distilling" or calling the provided closure. explicit FakeDistiller(bool execute_callback, - const base::Closure& distillation_initiated_callback); + base::OnceClosure distillation_initiated_callback); ~FakeDistiller() override; MOCK_METHOD0(Die, void()); @@ -66,7 +66,7 @@ DistillationUpdateCallback page_callback_; bool destruction_allowed_; // Used to notify when distillation is complete. - base::Closure distillation_initiated_callback_; + base::OnceClosure distillation_initiated_callback_; }; } // namespace test
diff --git a/components/feedback/tracing_manager.cc b/components/feedback/tracing_manager.cc index d440735..eb5fba1 100644 --- a/components/feedback/tracing_manager.cc +++ b/components/feedback/tracing_manager.cc
@@ -48,13 +48,13 @@ return current_trace_id_; } -bool TracingManager::GetTraceData(int id, const TraceDataCallback& callback) { +bool TracingManager::GetTraceData(int id, TraceDataCallback callback) { // If a trace is being collected currently, send it via callback when // complete. if (current_trace_id_) { // Only allow one trace data request at a time. - if (trace_callback_.is_null()) { - trace_callback_ = callback; + if (!trace_callback_) { + trace_callback_ = std::move(callback); return true; } else { return false; @@ -66,7 +66,7 @@ // Always return the data asychronously, so the behavior is consistant. base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(callback, data->second)); + FROM_HERE, base::BindOnce(std::move(callback), data->second)); return true; } } @@ -79,10 +79,8 @@ current_trace_id_ = 0; // If the trace has already been requested, provide an empty string. - if (!trace_callback_.is_null()) { - trace_callback_.Run(scoped_refptr<base::RefCountedString>()); - trace_callback_.Reset(); - } + if (trace_callback_) + std::move(trace_callback_).Run(scoped_refptr<base::RefCountedString>()); } } @@ -106,10 +104,8 @@ trace_data_[current_trace_id_] = output; - if (!trace_callback_.is_null()) { - trace_callback_.Run(output); - trace_callback_.Reset(); - } + if (trace_callback_) + std::move(trace_callback_).Run(output); current_trace_id_ = 0;
diff --git a/components/feedback/tracing_manager.h b/components/feedback/tracing_manager.h index 10d9f41..8238fc4 100644 --- a/components/feedback/tracing_manager.h +++ b/components/feedback/tracing_manager.h
@@ -20,8 +20,8 @@ } // Callback used for getting the output of a trace. -typedef base::Callback<void(scoped_refptr<base::RefCountedString> trace_data)> - TraceDataCallback; +using TraceDataCallback = + base::OnceCallback<void(scoped_refptr<base::RefCountedString> trace_data)>; // This class is used to manage performance metrics that can be attached to // feedback reports. This class is a Singleton that is owned by the preference @@ -49,7 +49,7 @@ // Get the trace data for |id|. On success, true is returned, and the data is // returned via |callback|. Returns false on failure. - bool GetTraceData(int id, const TraceDataCallback& callback); + bool GetTraceData(int id, TraceDataCallback callback); // Discard the data for trace |id|. void DiscardTraceData(int id);
diff --git a/components/gcm_driver/fake_gcm_driver.cc b/components/gcm_driver/fake_gcm_driver.cc index a05cf96d..eab1b9f 100644 --- a/components/gcm_driver/fake_gcm_driver.cc +++ b/components/gcm_driver/fake_gcm_driver.cc
@@ -34,9 +34,9 @@ const std::string& app_id, const std::vector<std::string>& sender_ids, const std::string& registration_id, - const ValidateRegistrationCallback& callback) { + ValidateRegistrationCallback callback) { base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(callback, true /* is_valid */)); + FROM_HERE, base::BindOnce(std::move(callback), true /* is_valid */)); } void FakeGCMDriver::OnSignedIn() {
diff --git a/components/gcm_driver/fake_gcm_driver.h b/components/gcm_driver/fake_gcm_driver.h index cc1a9d90..e0108c1 100644 --- a/components/gcm_driver/fake_gcm_driver.h +++ b/components/gcm_driver/fake_gcm_driver.h
@@ -26,11 +26,10 @@ ~FakeGCMDriver() override; // GCMDriver overrides: - void ValidateRegistration( - const std::string& app_id, - const std::vector<std::string>& sender_ids, - const std::string& registration_id, - const ValidateRegistrationCallback& callback) override; + void ValidateRegistration(const std::string& app_id, + const std::vector<std::string>& sender_ids, + const std::string& registration_id, + ValidateRegistrationCallback callback) override; void OnSignedIn() override; void OnSignedOut() override; void AddConnectionObserver(GCMConnectionObserver* observer) override;
diff --git a/components/gcm_driver/gcm_driver.h b/components/gcm_driver/gcm_driver.h index d924670..8189cc1 100644 --- a/components/gcm_driver/gcm_driver.h +++ b/components/gcm_driver/gcm_driver.h
@@ -44,7 +44,7 @@ public: using GetTokenCallback = base::OnceCallback<void(const std::string& token, GCMClient::Result result)>; - using ValidateTokenCallback = base::Callback<void(bool is_valid)>; + using ValidateTokenCallback = base::OnceCallback<void(bool is_valid)>; using DeleteTokenCallback = base::OnceCallback<void(GCMClient::Result result)>; using GetInstanceIDDataCallback = @@ -64,7 +64,7 @@ const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) = 0; + ValidateTokenCallback callback) = 0; virtual void DeleteToken(const std::string& app_id, const std::string& authorized_entity, const std::string& scope, @@ -95,7 +95,7 @@ using RegisterCallback = base::OnceCallback<void(const std::string& registration_id, GCMClient::Result result)>; - using ValidateRegistrationCallback = base::Callback<void(bool is_valid)>; + using ValidateRegistrationCallback = base::OnceCallback<void(bool is_valid)>; using UnregisterCallback = base::OnceCallback<void(GCMClient::Result result)>; using SendCallback = base::Callback<void(const std::string& message_id, GCMClient::Result result)>; @@ -131,11 +131,10 @@ // Checks that the provided |sender_ids| and |registration_id| matches the // stored registration info for |app_id|. - virtual void ValidateRegistration( - const std::string& app_id, - const std::vector<std::string>& sender_ids, - const std::string& registration_id, - const ValidateRegistrationCallback& callback) = 0; + virtual void ValidateRegistration(const std::string& app_id, + const std::vector<std::string>& sender_ids, + const std::string& registration_id, + ValidateRegistrationCallback callback) = 0; // Unregisters all sender_ids for an app. Only works on non-Android. Will also // remove any encryption keys associated with the |app_id|.
diff --git a/components/gcm_driver/gcm_driver_android.cc b/components/gcm_driver/gcm_driver_android.cc index 9738d1c9..bdf2305 100644 --- a/components/gcm_driver/gcm_driver_android.cc +++ b/components/gcm_driver/gcm_driver_android.cc
@@ -119,10 +119,10 @@ const std::string& app_id, const std::vector<std::string>& sender_ids, const std::string& registration_id, - const ValidateRegistrationCallback& callback) { + ValidateRegistrationCallback callback) { // gcm_driver doesn't store registration IDs on Android, so assume it's valid. base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(callback, true /* is_valid */)); + FROM_HERE, base::BindOnce(std::move(callback), true /* is_valid */)); } void GCMDriverAndroid::OnSignedIn() {
diff --git a/components/gcm_driver/gcm_driver_android.h b/components/gcm_driver/gcm_driver_android.h index 99176b8..b52baed 100644 --- a/components/gcm_driver/gcm_driver_android.h +++ b/components/gcm_driver/gcm_driver_android.h
@@ -58,11 +58,10 @@ const base::android::JavaParamRef<jobjectArray>& data_keys_and_values); // GCMDriver implementation: - void ValidateRegistration( - const std::string& app_id, - const std::vector<std::string>& sender_ids, - const std::string& registration_id, - const ValidateRegistrationCallback& callback) override; + void ValidateRegistration(const std::string& app_id, + const std::vector<std::string>& sender_ids, + const std::string& registration_id, + ValidateRegistrationCallback callback) override; void OnSignedIn() override; void OnSignedOut() override; void Enable() override;
diff --git a/components/gcm_driver/gcm_driver_desktop.cc b/components/gcm_driver/gcm_driver_desktop.cc index 6061918..f674e07 100644 --- a/components/gcm_driver/gcm_driver_desktop.cc +++ b/components/gcm_driver/gcm_driver_desktop.cc
@@ -563,7 +563,7 @@ const std::string& app_id, const std::vector<std::string>& sender_ids, const std::string& registration_id, - const ValidateRegistrationCallback& callback) { + ValidateRegistrationCallback callback) { DCHECK(!app_id.empty()); DCHECK(!sender_ids.empty() && sender_ids.size() <= kMaxSenders); DCHECK(!registration_id.empty()); @@ -586,25 +586,27 @@ std::sort(gcm_info->sender_ids.begin(), gcm_info->sender_ids.end()); if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { - delayed_task_controller_->AddTask(base::Bind( - &GCMDriverDesktop::DoValidateRegistration, - weak_ptr_factory_.GetWeakPtr(), gcm_info, registration_id, callback)); + delayed_task_controller_->AddTask( + base::BindOnce(&GCMDriverDesktop::DoValidateRegistration, + weak_ptr_factory_.GetWeakPtr(), gcm_info, + registration_id, std::move(callback))); return; } - DoValidateRegistration(std::move(gcm_info), registration_id, callback); + DoValidateRegistration(std::move(gcm_info), registration_id, + std::move(callback)); } void GCMDriverDesktop::DoValidateRegistration( scoped_refptr<RegistrationInfo> registration_info, const std::string& registration_id, - const ValidateRegistrationCallback& callback) { + ValidateRegistrationCallback callback) { base::PostTaskAndReplyWithResult( io_thread_.get(), FROM_HERE, - base::Bind(&GCMDriverDesktop::IOWorker::ValidateRegistration, - base::Unretained(io_worker_.get()), - std::move(registration_info), registration_id), - callback); + base::BindOnce(&GCMDriverDesktop::IOWorker::ValidateRegistration, + base::Unretained(io_worker_.get()), + std::move(registration_info), registration_id), + std::move(callback)); } void GCMDriverDesktop::Shutdown() { @@ -928,12 +930,12 @@ const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) { + ValidateTokenCallback callback) { DCHECK(!app_id.empty()); DCHECK(!authorized_entity.empty()); DCHECK(!scope.empty()); DCHECK(!token.empty()); - DCHECK(!callback.is_null()); + DCHECK(callback); DCHECK(ui_thread_->RunsTasksInCurrentSequence()); GCMClient::Result result = EnsureStarted(GCMClient::IMMEDIATE_START); @@ -953,13 +955,15 @@ instance_id_info->scope = scope; if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { - delayed_task_controller_->AddTask(base::Bind( - &GCMDriverDesktop::DoValidateRegistration, - weak_ptr_factory_.GetWeakPtr(), instance_id_info, token, callback)); + delayed_task_controller_->AddTask( + base::BindOnce(&GCMDriverDesktop::DoValidateRegistration, + weak_ptr_factory_.GetWeakPtr(), instance_id_info, token, + std::move(callback))); return; } - DoValidateRegistration(std::move(instance_id_info), token, callback); + DoValidateRegistration(std::move(instance_id_info), token, + std::move(callback)); } void GCMDriverDesktop::DeleteToken(const std::string& app_id, @@ -993,12 +997,9 @@ // Delay the DeleteToken operation until GCMClient is ready. if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { - delayed_task_controller_->AddTask( - base::Bind(&GCMDriverDesktop::DoDeleteToken, - weak_ptr_factory_.GetWeakPtr(), - app_id, - authorized_entity, - scope)); + delayed_task_controller_->AddTask(base::BindOnce( + &GCMDriverDesktop::DoDeleteToken, weak_ptr_factory_.GetWeakPtr(), + app_id, authorized_entity, scope)); return; } @@ -1031,12 +1032,9 @@ // Delay the operation until GCMClient is ready. if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { - delayed_task_controller_->AddTask( - base::Bind(&GCMDriverDesktop::DoAddInstanceIDData, - weak_ptr_factory_.GetWeakPtr(), - app_id, - instance_id, - extra_data)); + delayed_task_controller_->AddTask(base::BindOnce( + &GCMDriverDesktop::DoAddInstanceIDData, weak_ptr_factory_.GetWeakPtr(), + app_id, instance_id, extra_data)); return; } @@ -1066,9 +1064,8 @@ // Delay the operation until GCMClient is ready. if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { delayed_task_controller_->AddTask( - base::Bind(&GCMDriverDesktop::DoRemoveInstanceIDData, - weak_ptr_factory_.GetWeakPtr(), - app_id)); + base::BindOnce(&GCMDriverDesktop::DoRemoveInstanceIDData, + weak_ptr_factory_.GetWeakPtr(), app_id)); return; } @@ -1110,9 +1107,8 @@ // Delay the operation until GCMClient is ready. if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { delayed_task_controller_->AddTask( - base::Bind(&GCMDriverDesktop::DoGetInstanceIDData, - weak_ptr_factory_.GetWeakPtr(), - app_id)); + base::BindOnce(&GCMDriverDesktop::DoGetInstanceIDData, + weak_ptr_factory_.GetWeakPtr(), app_id)); return; } @@ -1178,10 +1174,9 @@ if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { // The GCM service was initialized but has not started yet. - delayed_task_controller_->AddTask( - base::Bind(&GCMDriverDesktop::WakeFromSuspendForHeartbeat, - weak_ptr_factory_.GetWeakPtr(), - wake_from_suspend_enabled_)); + delayed_task_controller_->AddTask(base::BindOnce( + &GCMDriverDesktop::WakeFromSuspendForHeartbeat, + weak_ptr_factory_.GetWeakPtr(), wake_from_suspend_enabled_)); return; } @@ -1205,8 +1200,8 @@ if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { // The GCM service was initialized but has not started yet. delayed_task_controller_->AddTask( - base::Bind(&GCMDriverDesktop::AddHeartbeatInterval, - weak_ptr_factory_.GetWeakPtr(), scope, interval_ms)); + base::BindOnce(&GCMDriverDesktop::AddHeartbeatInterval, + weak_ptr_factory_.GetWeakPtr(), scope, interval_ms)); return; } @@ -1226,8 +1221,8 @@ if (!delayed_task_controller_->CanRunTaskWithoutDelay()) { // The GCM service was initialized but has not started yet. delayed_task_controller_->AddTask( - base::Bind(&GCMDriverDesktop::RemoveHeartbeatInterval, - weak_ptr_factory_.GetWeakPtr(), scope)); + base::BindOnce(&GCMDriverDesktop::RemoveHeartbeatInterval, + weak_ptr_factory_.GetWeakPtr(), scope)); return; }
diff --git a/components/gcm_driver/gcm_driver_desktop.h b/components/gcm_driver/gcm_driver_desktop.h index ce3e46c..6b8d681 100644 --- a/components/gcm_driver/gcm_driver_desktop.h +++ b/components/gcm_driver/gcm_driver_desktop.h
@@ -67,11 +67,10 @@ ~GCMDriverDesktop() override; // GCMDriver implementation: - void ValidateRegistration( - const std::string& app_id, - const std::vector<std::string>& sender_ids, - const std::string& registration_id, - const ValidateRegistrationCallback& callback) override; + void ValidateRegistration(const std::string& app_id, + const std::vector<std::string>& sender_ids, + const std::string& registration_id, + ValidateRegistrationCallback callback) override; void Shutdown() override; void OnSignedIn() override; void OnSignedOut() override; @@ -128,7 +127,7 @@ const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) override; + ValidateTokenCallback callback) override; void DeleteToken(const std::string& app_id, const std::string& authorized_entity, const std::string& scope, @@ -150,7 +149,7 @@ void DoValidateRegistration(scoped_refptr<RegistrationInfo> registration_info, const std::string& registration_id, - const ValidateRegistrationCallback& callback); + ValidateRegistrationCallback callback); // Stops the GCM service. It can be restarted by calling EnsureStarted again. void Stop();
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc index 1ceefba..8320726 100644 --- a/components/gcm_driver/gcm_driver_desktop_unittest.cc +++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -213,6 +213,7 @@ io_thread_.Stop(); task_environment_.RunUntilIdle(); + ASSERT_TRUE(temp_dir_.Delete()); } void GCMDriverTest::PumpIOLoop() {
diff --git a/components/gcm_driver/gcm_driver_unittest.cc b/components/gcm_driver/gcm_driver_unittest.cc index 561b6670..1bbde7d 100644 --- a/components/gcm_driver/gcm_driver_unittest.cc +++ b/components/gcm_driver/gcm_driver_unittest.cc
@@ -151,6 +151,8 @@ PumpIOLoop(); io_thread_.Stop(); + task_environment_.RunUntilIdle(); + ASSERT_TRUE(temp_dir_.Delete()); } void GCMDriverBaseTest::PumpIOLoop() {
diff --git a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc index f704b3e..84fd234 100644 --- a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc +++ b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.cc
@@ -85,9 +85,9 @@ const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) { + ValidateTokenCallback callback) { base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(callback, true /* is_valid */)); + FROM_HERE, base::BindOnce(std::move(callback), true /* is_valid */)); } void FakeGCMDriverForInstanceID::DeleteToken(
diff --git a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h index ff428511..c9eb421 100644 --- a/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h +++ b/components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h
@@ -51,7 +51,7 @@ const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) override; + ValidateTokenCallback callback) override; void DeleteToken(const std::string& app_id, const std::string& authorized_entity, const std::string& scope,
diff --git a/components/gcm_driver/instance_id/instance_id.h b/components/gcm_driver/instance_id/instance_id.h index e9e3be48..628fe9e 100644 --- a/components/gcm_driver/instance_id/instance_id.h +++ b/components/gcm_driver/instance_id/instance_id.h
@@ -71,7 +71,7 @@ base::Callback<void(const base::Time& creation_time)>; using GetTokenCallback = base::OnceCallback<void(const std::string& token, Result result)>; - using ValidateTokenCallback = base::Callback<void(bool is_valid)>; + using ValidateTokenCallback = base::OnceCallback<void(bool is_valid)>; using GetEncryptionInfoCallback = base::OnceCallback<void(std::string p256dh, std::string auth_secret)>; using DeleteTokenCallback = base::OnceCallback<void(Result result)>; @@ -121,7 +121,7 @@ virtual void ValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) = 0; + ValidateTokenCallback callback) = 0; // Get the public encryption key and authentication secret associated with a // GCM-scoped token. If encryption info is not yet associated, it will be
diff --git a/components/gcm_driver/instance_id/instance_id_android.cc b/components/gcm_driver/instance_id/instance_id_android.cc index 065aa4f..ee25207 100644 --- a/components/gcm_driver/instance_id/instance_id_android.cc +++ b/components/gcm_driver/instance_id/instance_id_android.cc
@@ -125,10 +125,10 @@ void InstanceIDAndroid::ValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) { + ValidateTokenCallback callback) { // gcm_driver doesn't store tokens on Android, so assume it's valid. base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::BindOnce(callback, true /* is_valid */)); + FROM_HERE, base::BindOnce(std::move(callback), true /* is_valid */)); } void InstanceIDAndroid::DeleteTokenImpl(const std::string& authorized_entity,
diff --git a/components/gcm_driver/instance_id/instance_id_android.h b/components/gcm_driver/instance_id/instance_id_android.h index ede64fd..89d8a189 100644 --- a/components/gcm_driver/instance_id/instance_id_android.h +++ b/components/gcm_driver/instance_id/instance_id_android.h
@@ -51,7 +51,7 @@ void ValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) override; + ValidateTokenCallback callback) override; void DeleteTokenImpl(const std::string& audience, const std::string& scope, DeleteTokenCallback callback) override;
diff --git a/components/gcm_driver/instance_id/instance_id_impl.cc b/components/gcm_driver/instance_id/instance_id_impl.cc index 6723fb0..b7f7e27 100644 --- a/components/gcm_driver/instance_id/instance_id_impl.cc +++ b/components/gcm_driver/instance_id/instance_id_impl.cc
@@ -118,26 +118,27 @@ void InstanceIDImpl::ValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) { + ValidateTokenCallback callback) { DCHECK(!authorized_entity.empty()); DCHECK(!scope.empty()); DCHECK(!token.empty()); RunWhenReady(base::BindOnce(&InstanceIDImpl::DoValidateToken, weak_ptr_factory_.GetWeakPtr(), authorized_entity, - scope, token, callback)); + scope, token, std::move(callback))); } void InstanceIDImpl::DoValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) { + ValidateTokenCallback callback) { if (id_.empty()) { - callback.Run(false /* is_valid */); + std::move(callback).Run(false /* is_valid */); return; } - Handler()->ValidateToken(app_id(), authorized_entity, scope, token, callback); + Handler()->ValidateToken(app_id(), authorized_entity, scope, token, + std::move(callback)); } void InstanceIDImpl::DeleteTokenImpl(const std::string& authorized_entity,
diff --git a/components/gcm_driver/instance_id/instance_id_impl.h b/components/gcm_driver/instance_id/instance_id_impl.h index 5698718..580d3a7 100644 --- a/components/gcm_driver/instance_id/instance_id_impl.h +++ b/components/gcm_driver/instance_id/instance_id_impl.h
@@ -41,7 +41,7 @@ void ValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback) override; + ValidateTokenCallback callback) override; void DeleteTokenImpl(const std::string& authorized_entity, const std::string& scope, DeleteTokenCallback callback) override; @@ -69,7 +69,7 @@ void DoValidateToken(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback); + ValidateTokenCallback callback); void DoDeleteToken(const std::string& authorized_entity, const std::string& scope, DeleteTokenCallback callback);
diff --git a/components/invalidation/impl/BUILD.gn b/components/invalidation/impl/BUILD.gn index 604c627..c5af0df 100644 --- a/components/invalidation/impl/BUILD.gn +++ b/components/invalidation/impl/BUILD.gn
@@ -48,8 +48,6 @@ "invalidator_registrar_with_memory.h", "invalidator_storage.cc", "invalidator_storage.h", - "logger.cc", - "logger.h", "mock_ack_handler.cc", "mock_ack_handler.h", "per_user_topic_registration_manager.cc",
diff --git a/components/invalidation/impl/deprecated_invalidator_registrar.h b/components/invalidation/impl/deprecated_invalidator_registrar.h index 3f1e6412..0d591d4 100644 --- a/components/invalidation/impl/deprecated_invalidator_registrar.h +++ b/components/invalidation/impl/deprecated_invalidator_registrar.h
@@ -22,6 +22,8 @@ // keep track of registered handlers and which object ID registrations are // associated with which handlers, so implementors can just reuse the logic // here to dispatch invalidations and other interesting notifications. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT DeprecatedInvalidatorRegistrar { public: DeprecatedInvalidatorRegistrar();
diff --git a/components/invalidation/impl/fcm_invalidation_listener.h b/components/invalidation/impl/fcm_invalidation_listener.h index ba900d0..008039e 100644 --- a/components/invalidation/impl/fcm_invalidation_listener.h +++ b/components/invalidation/impl/fcm_invalidation_listener.h
@@ -13,7 +13,6 @@ #include "components/invalidation/impl/channels_states.h" #include "components/invalidation/impl/fcm_sync_network_channel.h" #include "components/invalidation/impl/invalidation_listener.h" -#include "components/invalidation/impl/logger.h" #include "components/invalidation/impl/per_user_topic_registration_manager.h" #include "components/invalidation/impl/unacked_invalidation_set.h" #include "components/invalidation/public/ack_handler.h" @@ -122,7 +121,6 @@ std::unique_ptr<FCMSyncNetworkChannel> network_channel_; UnackedInvalidationsMap unacked_invalidations_map_; Delegate* delegate_; - Logger logger_; // Stored to pass to |per_user_topic_registration_manager_| on start. Topics registered_topics_;
diff --git a/components/invalidation/impl/fcm_invalidation_listener_unittest.cc b/components/invalidation/impl/fcm_invalidation_listener_unittest.cc index f54d01af..a6275c2 100644 --- a/components/invalidation/impl/fcm_invalidation_listener_unittest.cc +++ b/components/invalidation/impl/fcm_invalidation_listener_unittest.cc
@@ -14,7 +14,6 @@ #include "components/invalidation/impl/fake_invalidation_state_tracker.h" #include "components/invalidation/impl/fcm_invalidation_listener.h" #include "components/invalidation/impl/per_user_topic_registration_manager.h" -#include "components/invalidation/impl/push_client_channel.h" #include "components/invalidation/impl/unacked_invalidation_set_test_util.h" #include "components/invalidation/public/invalidation_util.h" #include "components/invalidation/public/invalidator_state.h"
diff --git a/components/invalidation/impl/fcm_invalidation_service_unittest.cc b/components/invalidation/impl/fcm_invalidation_service_unittest.cc index df33346f..f8047c0 100644 --- a/components/invalidation/impl/fcm_invalidation_service_unittest.cc +++ b/components/invalidation/impl/fcm_invalidation_service_unittest.cc
@@ -22,11 +22,8 @@ #include "components/invalidation/impl/fcm_invalidation_listener.h" #include "components/invalidation/impl/fcm_network_handler.h" #include "components/invalidation/impl/fcm_sync_network_channel.h" -#include "components/invalidation/impl/gcm_invalidation_bridge.h" #include "components/invalidation/impl/invalidation_prefs.h" #include "components/invalidation/impl/invalidation_service_test_template.h" -#include "components/invalidation/impl/invalidation_state_tracker.h" -#include "components/invalidation/impl/invalidator.h" #include "components/invalidation/impl/profile_identity_provider.h" #include "components/invalidation/public/topic_invalidation_map.h" #include "components/prefs/pref_registry_simple.h" @@ -106,11 +103,17 @@ const std::map<std::string, std::string>& options, std::set<Flags> flags, GetTokenCallback& callback)); - MOCK_METHOD4(ValidateToken, + void ValidateToken(const std::string& authorized_entity, + const std::string& scope, + const std::string& token, + ValidateTokenCallback callback) override { + ValidateToken_(authorized_entity, scope, token, callback); + } + MOCK_METHOD4(ValidateToken_, void(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback)); + ValidateTokenCallback& callback)); protected: void DeleteTokenImpl(const std::string& authorized_entity,
diff --git a/components/invalidation/impl/fcm_network_handler_unittests.cc b/components/invalidation/impl/fcm_network_handler_unittests.cc index bcdb759..78458092 100644 --- a/components/invalidation/impl/fcm_network_handler_unittests.cc +++ b/components/invalidation/impl/fcm_network_handler_unittests.cc
@@ -77,11 +77,17 @@ const std::map<std::string, std::string>& options, std::set<Flags> flags, GetTokenCallback& callback)); - MOCK_METHOD4(ValidateToken, + void ValidateToken(const std::string& authorized_entity, + const std::string& scope, + const std::string& token, + ValidateTokenCallback callback) override { + ValidateToken_(authorized_entity, scope, token, callback); + } + MOCK_METHOD4(ValidateToken_, void(const std::string& authorized_entity, const std::string& scope, const std::string& token, - const ValidateTokenCallback& callback)); + ValidateTokenCallback& callback)); protected: void DeleteTokenImpl(const std::string& authorized_entity, @@ -112,11 +118,17 @@ &test_url_loader_factory_)) {} ~MockGCMDriver() override = default; - MOCK_METHOD4(ValidateRegistration, + void ValidateRegistration(const std::string& app_id, + const std::vector<std::string>& sender_ids, + const std::string& registration_id, + ValidateRegistrationCallback callback) override { + ValidateRegistration_(app_id, sender_ids, registration_id, callback); + } + MOCK_METHOD4(ValidateRegistration_, void(const std::string& app_id, const std::vector<std::string>& sender_ids, const std::string& registration_id, - const ValidateRegistrationCallback& callback)); + ValidateRegistrationCallback& callback)); MOCK_METHOD0(OnSignedIn, void()); MOCK_METHOD0(OnSignedOut, void()); MOCK_METHOD1(AddConnectionObserver, @@ -438,7 +450,7 @@ EXPECT_CALL(*mock_instance_id(), GetToken_(_, _, _, _, _)) .WillOnce( InvokeCallbackArgument<4>("token", InstanceID::Result::SUCCESS)); - EXPECT_CALL(*mock_instance_id(), ValidateToken(_, _, _, _)).Times(0); + EXPECT_CALL(*mock_instance_id(), ValidateToken_(_, _, _, _)).Times(0); EXPECT_CALL(mock_on_token_callback, Run("token")).Times(1); handler->StartListening(); testing::Mock::VerifyAndClearExpectations(mock_instance_id()); @@ -469,7 +481,7 @@ EXPECT_CALL(*mock_instance_id(), GetToken_(_, _, _, _, _)) .WillOnce( InvokeCallbackArgument<4>("token", InstanceID::Result::SUCCESS)); - EXPECT_CALL(*mock_instance_id(), ValidateToken(_, _, _, _)).Times(0); + EXPECT_CALL(*mock_instance_id(), ValidateToken_(_, _, _, _)).Times(0); EXPECT_CALL(mock_on_token_callback, Run("token")).Times(1); handler->StartListening(); testing::Mock::VerifyAndClearExpectations(mock_instance_id());
diff --git a/components/invalidation/impl/gcm_invalidation_bridge.h b/components/invalidation/impl/gcm_invalidation_bridge.h index f6dc891d..ef664b9 100644 --- a/components/invalidation/impl/gcm_invalidation_bridge.h +++ b/components/invalidation/impl/gcm_invalidation_bridge.h
@@ -35,6 +35,8 @@ // Core lives on IO thread. Core implements GCMNetworkChannelDelegate and posts // all function calls to GCMInvalidationBridge which does actual work to perform // them. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class GCMInvalidationBridge : public gcm::GCMAppHandler, public gcm::GCMConnectionObserver { public:
diff --git a/components/invalidation/impl/gcm_network_channel.h b/components/invalidation/impl/gcm_network_channel.h index c126f46..bbc60498 100644 --- a/components/invalidation/impl/gcm_network_channel.h +++ b/components/invalidation/impl/gcm_network_channel.h
@@ -50,6 +50,8 @@ // GCMNetworkChannel is an implementation of SyncNetworkChannel that routes // messages through GCMService. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT GCMNetworkChannel : public SyncNetworkChannel, public network::NetworkConnectionTracker::NetworkConnectionObserver {
diff --git a/components/invalidation/impl/gcm_network_channel_delegate.h b/components/invalidation/impl/gcm_network_channel_delegate.h index 218ac663..05c1f182 100644 --- a/components/invalidation/impl/gcm_network_channel_delegate.h +++ b/components/invalidation/impl/gcm_network_channel_delegate.h
@@ -22,6 +22,8 @@ // in HTTP message to server. // GCMNetworkChannel lives on IO thread therefore calls will be made on IO // thread and callbacks should be invoked there as well. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class GCMNetworkChannelDelegate { public: typedef base::Callback<void(const GoogleServiceAuthError& error,
diff --git a/components/invalidation/impl/invalidation_listener.h b/components/invalidation/impl/invalidation_listener.h index 2a55e79..39cf124 100644 --- a/components/invalidation/impl/invalidation_listener.h +++ b/components/invalidation/impl/invalidation_listener.h
@@ -9,7 +9,7 @@ namespace syncer { -// Handlers registration and message recieving events. +// Handlers registration and message receiving events. class InvalidationListener { public: virtual ~InvalidationListener() {}
diff --git a/components/invalidation/impl/invalidation_notifier.h b/components/invalidation/impl/invalidation_notifier.h index b5bfd6a3..789ccf98f 100644 --- a/components/invalidation/impl/invalidation_notifier.h +++ b/components/invalidation/impl/invalidation_notifier.h
@@ -31,6 +31,8 @@ namespace syncer { // This class must live on the IO thread. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT InvalidationNotifier : public Invalidator, public SyncInvalidationListener::Delegate {
diff --git a/components/invalidation/impl/invalidation_service_android.h b/components/invalidation/impl/invalidation_service_android.h index 4b2da84..209e449a 100644 --- a/components/invalidation/impl/invalidation_service_android.h +++ b/components/invalidation/impl/invalidation_service_android.h
@@ -26,6 +26,8 @@ // This InvalidationService is used to deliver invalidations on Android. The // Android operating system has its own mechanisms for delivering invalidations. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class InvalidationServiceAndroid : public InvalidationService { public: explicit InvalidationServiceAndroid();
diff --git a/components/invalidation/impl/invalidation_state_tracker.h b/components/invalidation/impl/invalidation_state_tracker.h index 175ea59..8d8dda2 100644 --- a/components/invalidation/impl/invalidation_state_tracker.h +++ b/components/invalidation/impl/invalidation_state_tracker.h
@@ -25,6 +25,8 @@ namespace syncer { +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT InvalidationStateTracker { public: InvalidationStateTracker();
diff --git a/components/invalidation/impl/invalidation_switches.cc b/components/invalidation/impl/invalidation_switches.cc index 6642cd0..c5a0044 100644 --- a/components/invalidation/impl/invalidation_switches.cc +++ b/components/invalidation/impl/invalidation_switches.cc
@@ -7,14 +7,6 @@ namespace invalidation { namespace switches { -#if defined(OS_CHROMEOS) -// Device invalidation service should use GCM network channel. -const char kInvalidationUseGCMChannel[] = "invalidation-use-gcm-channel"; -#endif // OS_CHROMEOS - -// Overrides the default host:port used for notifications. -const char kSyncNotificationHostPort[] = "sync-notification-host-port"; - const base::Feature kFCMInvalidationsConservativeEnabling = { "FCMInvalidationsConservativeEnabling", base::FEATURE_ENABLED_BY_DEFAULT};
diff --git a/components/invalidation/impl/invalidation_switches.h b/components/invalidation/impl/invalidation_switches.h index 4e1a1f1..cedc4c1 100644 --- a/components/invalidation/impl/invalidation_switches.h +++ b/components/invalidation/impl/invalidation_switches.h
@@ -6,16 +6,10 @@ #define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SWITCHES_H #include "base/feature_list.h" -#include "build/build_config.h" namespace invalidation { namespace switches { -#if defined(OS_CHROMEOS) -extern const char kInvalidationUseGCMChannel[]; -#endif // OS_CHROMEOS - -extern const char kSyncNotificationHostPort[]; extern const base::Feature kFCMInvalidationsConservativeEnabling; extern const base::Feature kFCMInvalidationsStartOnceActiveAccountAvailable; extern const base::Feature kFCMInvalidationsForSyncDontCheckVersion;
diff --git a/components/invalidation/impl/invalidator.h b/components/invalidation/impl/invalidator.h index 95186be..6b31745 100644 --- a/components/invalidation/impl/invalidator.h +++ b/components/invalidation/impl/invalidator.h
@@ -20,6 +20,8 @@ namespace syncer { class InvalidationHandler; +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT Invalidator { public: Invalidator();
diff --git a/components/invalidation/impl/invalidator_storage.h b/components/invalidation/impl/invalidator_storage.h index 238dbab..52abc707 100644 --- a/components/invalidation/impl/invalidator_storage.h +++ b/components/invalidation/impl/invalidator_storage.h
@@ -22,6 +22,8 @@ // Wraps PrefService in an InvalidationStateTracker to allow SyncNotifiers // to use PrefService as persistence for invalidation state. It is not thread // safe, and lives on the UI thread. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class InvalidatorStorage : public syncer::InvalidationStateTracker { public: // |pref_service| may not be NULL and must outlive |this|.
diff --git a/components/invalidation/impl/logger.cc b/components/invalidation/impl/logger.cc deleted file mode 100644 index ad936d86..0000000 --- a/components/invalidation/impl/logger.cc +++ /dev/null
@@ -1,50 +0,0 @@ -// Copyright 2018 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. - -#include "components/invalidation/impl/logger.h" - -#include "base/logging.h" -#include "base/strings/stringprintf.h" - -namespace syncer { - -Logger::Logger() {} -Logger::~Logger() {} - -void Logger::Log(LogLevel level, - const char* file, - int line, - const char* format, - ...) { - logging::LogSeverity log_severity = -2; // VLOG(2) - bool emit_log = false; - switch (level) { - case FINE_LEVEL: - log_severity = -2; // VLOG(2) - emit_log = VLOG_IS_ON(2); - break; - case INFO_LEVEL: - log_severity = -1; // VLOG(1) - emit_log = VLOG_IS_ON(1); - break; - case WARNING_LEVEL: - log_severity = logging::LOG_WARNING; - emit_log = LOG_IS_ON(WARNING); - break; - case SEVERE_LEVEL: - log_severity = logging::LOG_ERROR; - emit_log = LOG_IS_ON(ERROR); - break; - } - if (emit_log) { - va_list ap; - va_start(ap, format); - std::string result; - base::StringAppendV(&result, format, ap); - logging::LogMessage(file, line, log_severity).stream() << result; - va_end(ap); - } -} - -} // namespace syncer
diff --git a/components/invalidation/impl/logger.h b/components/invalidation/impl/logger.h deleted file mode 100644 index bea86f2..0000000 --- a/components/invalidation/impl/logger.h +++ /dev/null
@@ -1,30 +0,0 @@ -// Copyright 2018 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. - -#ifndef COMPONENTS_INVALIDATION_IMPL_LOGGER_H_ -#define COMPONENTS_INVALIDATION_IMPL_LOGGER_H_ - -#include <string> - -#define TLOG(logger, level, str, ...) \ - logger->Log(Logger::level##_LEVEL, __FILE__, __LINE__, str, ##__VA_ARGS__); - -namespace syncer { - -// Forward logging messages to the approppriate channel. -class Logger { - public: - enum LogLevel { FINE_LEVEL, INFO_LEVEL, WARNING_LEVEL, SEVERE_LEVEL }; - - Logger(); - - ~Logger(); - - // invalidation::Logger implementation. - void Log(LogLevel level, const char* file, int line, const char* format, ...); -}; - -} // namespace syncer - -#endif // COMPONENTS_INVALIDATION_IMPL_LOGGER_H_
diff --git a/components/invalidation/impl/non_blocking_invalidator.h b/components/invalidation/impl/non_blocking_invalidator.h index a8ec2cc..8ce8637 100644 --- a/components/invalidation/impl/non_blocking_invalidator.h +++ b/components/invalidation/impl/non_blocking_invalidator.h
@@ -42,6 +42,8 @@ using NetworkChannelCreator = base::Callback<std::unique_ptr<SyncNetworkChannel>(void)>; +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT NonBlockingInvalidator : public Invalidator, public InvalidationStateTracker {
diff --git a/components/invalidation/impl/push_client_channel.h b/components/invalidation/impl/push_client_channel.h index fb6ee09a..a85bbcac 100644 --- a/components/invalidation/impl/push_client_channel.h +++ b/components/invalidation/impl/push_client_channel.h
@@ -24,6 +24,8 @@ // A PushClientChannel is an implementation of NetworkChannel that // routes messages through a PushClient. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT PushClientChannel : public SyncNetworkChannel, public notifier::PushClientObserver {
diff --git a/components/invalidation/impl/registration_manager.h b/components/invalidation/impl/registration_manager.h index ebb6ec57c..2f442ca7 100644 --- a/components/invalidation/impl/registration_manager.h +++ b/components/invalidation/impl/registration_manager.h
@@ -33,6 +33,8 @@ // implementations include the syncer thread (both versions) and XMPP // retries. The most sophisticated one is URLRequestThrottler; making // that generic should work for everyone. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT RegistrationManager { public: // Constants for exponential backoff (used by tests).
diff --git a/components/invalidation/impl/state_writer.h b/components/invalidation/impl/state_writer.h index 269098e..429b283 100644 --- a/components/invalidation/impl/state_writer.h +++ b/components/invalidation/impl/state_writer.h
@@ -13,6 +13,8 @@ namespace syncer { +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT StateWriter { public: virtual ~StateWriter() {}
diff --git a/components/invalidation/impl/sync_invalidation_listener.h b/components/invalidation/impl/sync_invalidation_listener.h index cb0b1547..96007f6 100644 --- a/components/invalidation/impl/sync_invalidation_listener.h +++ b/components/invalidation/impl/sync_invalidation_listener.h
@@ -32,6 +32,8 @@ // SyncInvalidationListener is not thread-safe and lives on the sync // thread. +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class INVALIDATION_EXPORT SyncInvalidationListener : public invalidation::InvalidationListener, public StateWriter,
diff --git a/components/invalidation/impl/sync_system_resources.h b/components/invalidation/impl/sync_system_resources.h index f9870b5..296754d 100644 --- a/components/invalidation/impl/sync_system_resources.h +++ b/components/invalidation/impl/sync_system_resources.h
@@ -31,6 +31,9 @@ class SharedURLLoaderFactoryInfo; } // namespace network +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. + namespace syncer { class GCMNetworkChannelDelegate;
diff --git a/components/invalidation/impl/ticl_invalidation_service.h b/components/invalidation/impl/ticl_invalidation_service.h index 9ca604ae..ef93b5d 100644 --- a/components/invalidation/impl/ticl_invalidation_service.h +++ b/components/invalidation/impl/ticl_invalidation_service.h
@@ -44,6 +44,8 @@ // This InvalidationService wraps the C++ Invalidation Client (TICL) library. // It provides invalidations for desktop platforms (Win, Mac, Linux). +// TODO(crbug.com/1029481): Part of the legacy implementation of invalidations, +// scheduled for deletion. class TiclInvalidationService : public InvalidationService, public IdentityProvider::Observer, public syncer::InvalidationHandler {
diff --git a/components/invalidation/public/BUILD.gn b/components/invalidation/public/BUILD.gn index aa76520..fafda47 100644 --- a/components/invalidation/public/BUILD.gn +++ b/components/invalidation/public/BUILD.gn
@@ -36,16 +36,3 @@ "//base:i18n", ] } - -source_set("unit_tests") { - testonly = true - sources = [ - "invalidation_util_unittest.cc", - ] - deps = [ - ":public", - "//base", - "//base/test:test_support", - "//testing/gtest", - ] -}
diff --git a/components/invalidation/public/invalidation_util.cc b/components/invalidation/public/invalidation_util.cc index 04ce11d..b3462546 100644 --- a/components/invalidation/public/invalidation_util.cc +++ b/components/invalidation/public/invalidation_util.cc
@@ -15,7 +15,6 @@ #include "components/invalidation/public/invalidation_handler.h" #include "components/invalidation/public/invalidation_object_id.h" #include "google/cacheinvalidation/include/types.h" -#include "google/cacheinvalidation/types.pb.h" namespace {
diff --git a/components/invalidation/public/invalidation_util.h b/components/invalidation/public/invalidation_util.h index eda0cba..601945c 100644 --- a/components/invalidation/public/invalidation_util.h +++ b/components/invalidation/public/invalidation_util.h
@@ -99,26 +99,6 @@ const invalidation::InvalidationObjectId& rhs) const; }; -typedef std::set<invalidation::InvalidationObjectId, - InvalidationObjectIdLessThan> - InvalidationObjectIdSet; - -typedef std:: - map<invalidation::InvalidationObjectId, int, InvalidationObjectIdLessThan> - InvalidationObjectIdCountMap; - -std::unique_ptr<base::DictionaryValue> InvalidationObjectIdToValue( - const invalidation::InvalidationObjectId& object_id); - -// TODO(melandory): figure out the security implications for such serialization. -std::string SerializeInvalidationObjectId( - const invalidation::InvalidationObjectId& object_id); -bool DeserializeInvalidationObjectId(const std::string& serialized, - invalidation::InvalidationObjectId* id); - -INVALIDATION_EXPORT std::string InvalidationObjectIdToString( - const invalidation::InvalidationObjectId& object_id); - ObjectIdSet ConvertTopicsToIds(TopicSet topics); ObjectIdSet ConvertTopicsToIds(Topics topics); invalidation::ObjectId ConvertTopicToId(const Topic& topic);
diff --git a/components/invalidation/public/invalidation_util_unittest.cc b/components/invalidation/public/invalidation_util_unittest.cc deleted file mode 100644 index c56f5d14..0000000 --- a/components/invalidation/public/invalidation_util_unittest.cc +++ /dev/null
@@ -1,27 +0,0 @@ -// Copyright 2018 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. - -#include "components/invalidation/public/invalidation_util.h" - -#include "components/invalidation/public/invalidation_object_id.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace syncer { - -class InvalidationObjectIdSerializationTest : public testing::Test { - public: - InvalidationObjectIdSerializationTest() : kObjectId_(10, "ASDF") {} - - const invalidation::InvalidationObjectId kObjectId_; -}; - -TEST_F(InvalidationObjectIdSerializationTest, - ShouldCorrectlyDeserializeSerialized) { - std::string serialized = SerializeInvalidationObjectId(kObjectId_); - invalidation::InvalidationObjectId id; - DeserializeInvalidationObjectId(serialized, &id); - EXPECT_EQ(kObjectId_, id); -} - -} // namespace syncer
diff --git a/components/password_manager/core/browser/mock_password_feature_manager.h b/components/password_manager/core/browser/mock_password_feature_manager.h index 623639ab..c6ddca5 100644 --- a/components/password_manager/core/browser/mock_password_feature_manager.h +++ b/components/password_manager/core/browser/mock_password_feature_manager.h
@@ -17,6 +17,10 @@ MOCK_CONST_METHOD0(IsGenerationEnabled, bool()); MOCK_CONST_METHOD0(ShouldCheckReuseOnLeakDetection, bool()); + + MOCK_CONST_METHOD0(IsOptedInForAccountStorage, bool()); + MOCK_CONST_METHOD0(ShouldShowAccountStorageOptIn, bool()); + MOCK_METHOD1(SetAccountStorageOptIn, void(bool)); }; } // namespace password_manager
diff --git a/components/password_manager/core/browser/password_autofill_manager.cc b/components/password_manager/core/browser/password_autofill_manager.cc index a7f243d..f3a1b8e 100644 --- a/components/password_manager/core/browser/password_autofill_manager.cc +++ b/components/password_manager/core/browser/password_autofill_manager.cc
@@ -31,14 +31,18 @@ #include "components/autofill/core/common/autofill_util.h" #include "components/favicon/core/favicon_util.h" #include "components/password_manager/core/browser/android_affiliation/affiliation_utils.h" +#include "components/password_manager/core/browser/password_feature_manager.h" #include "components/password_manager/core/browser/password_manager_client.h" #include "components/password_manager/core/browser/password_manager_driver.h" #include "components/password_manager/core/browser/password_manager_metrics_recorder.h" #include "components/password_manager/core/browser/password_manager_metrics_util.h" #include "components/password_manager/core/browser/password_manager_util.h" #include "components/password_manager/core/common/password_manager_features.h" +#include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/security_state/core/security_state.h" #include "components/strings/grit/components_strings.h" +#include "components/sync/driver/sync_service.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" @@ -206,7 +210,8 @@ int identifier) { ClearPreviewedForm(); if (identifier == autofill::POPUP_ITEM_ID_ALL_SAVED_PASSWORDS_ENTRY || - identifier == autofill::POPUP_ITEM_ID_GENERATE_PASSWORD_ENTRY) + identifier == autofill::POPUP_ITEM_ID_GENERATE_PASSWORD_ENTRY || + identifier == autofill::POPUP_ITEM_ID_PASSWORD_SYNC_OPTIN) return; bool success = PreviewSuggestion(GetUsernameFromSuggestion(value)); DCHECK(success); @@ -231,12 +236,14 @@ PasswordDropdownSelectedOption::kShowAll, password_client_->IsIncognito()); - if (password_client_ && password_client_->GetMetricsRecorder()) { + if (password_client_->GetMetricsRecorder()) { using UserAction = password_manager::PasswordManagerMetricsRecorder::PageLevelUserAction; password_client_->GetMetricsRecorder()->RecordPageLevelUserAction( UserAction::kShowAllPasswordsWhileSomeAreSuggested); } + } else if (identifier == autofill::POPUP_ITEM_ID_PASSWORD_SYNC_OPTIN) { + password_client_->GetPasswordFeatureManager()->SetAccountStorageOptIn(true); } else { metrics_util::LogPasswordDropdownItemSelected( PasswordDropdownSelectedOption::kPassword, @@ -307,16 +314,24 @@ const base::string16& typed_username, int options, const gfx::RectF& bounds) { - std::vector<autofill::Suggestion> suggestions; - if (!fill_data_) { + bool show_account_storage_optin = false; + if (password_client_) { + show_account_storage_optin = password_client_->GetPasswordFeatureManager() + ->ShouldShowAccountStorageOptIn(); + } + + if (!fill_data_ && !show_account_storage_optin) { // Probably the credential was deleted in the mean time. return; } - GetSuggestions(*fill_data_, typed_username, page_favicon_, - (options & autofill::SHOW_ALL) != 0, - (options & autofill::IS_PASSWORD_FIELD) != 0, &suggestions); + std::vector<autofill::Suggestion> suggestions; + if (fill_data_) { + GetSuggestions(*fill_data_, typed_username, page_favicon_, + (options & autofill::SHOW_ALL) != 0, + (options & autofill::IS_PASSWORD_FIELD) != 0, &suggestions); + } - if (suggestions.empty()) { + if (suggestions.empty() && !show_account_storage_optin) { autofill_client_->HideAutofillPopup(); return; } @@ -332,6 +347,14 @@ metrics_util::SHOW_ALL_SAVED_PASSWORDS_CONTEXT_PASSWORD); } + if (show_account_storage_optin) { + // TODO(crbug.com/1024332): Add proper (translated) string. + autofill::Suggestion suggestion( + base::ASCIIToUTF16("Use passwords stored in your Google account")); + suggestion.frontend_id = autofill::POPUP_ITEM_ID_PASSWORD_SYNC_OPTIN; + suggestions.push_back(suggestion); + } + metrics_util::LogPasswordDropdownShown( metrics_util::PasswordDropdownState::kStandard, password_client_->IsIncognito());
diff --git a/components/password_manager/core/browser/password_feature_manager.h b/components/password_manager/core/browser/password_feature_manager.h index 384492ea..1f63ab8 100644 --- a/components/password_manager/core/browser/password_feature_manager.h +++ b/components/password_manager/core/browser/password_feature_manager.h
@@ -22,6 +22,20 @@ // string. virtual bool ShouldCheckReuseOnLeakDetection() const = 0; + // Whether the current signed-in user (aka unconsented primary account) has + // opted in to use the Google account storage for passwords (as opposed to + // local/profile storage). + virtual bool IsOptedInForAccountStorage() const = 0; + + // Whether it makes sense to ask the user to opt-in for account-based + // password storage. This is true if the opt-in doesn't exist yet, but all + // other requirements are met (i.e. there is a signed-in user etc). + virtual bool ShouldShowAccountStorageOptIn() const = 0; + + // Sets or clears the opt-in to using account storage for passwords for the + // current signed-in user (unconsented primary account). + virtual void SetAccountStorageOptIn(bool opt_in) = 0; + private: DISALLOW_COPY_AND_ASSIGN(PasswordFeatureManager); };
diff --git a/components/password_manager/core/browser/password_feature_manager_impl.cc b/components/password_manager/core/browser/password_feature_manager_impl.cc index 3e59f4ae..8adeb56ce 100644 --- a/components/password_manager/core/browser/password_feature_manager_impl.cc +++ b/components/password_manager/core/browser/password_feature_manager_impl.cc
@@ -10,8 +10,9 @@ namespace password_manager { PasswordFeatureManagerImpl::PasswordFeatureManagerImpl( + PrefService* pref_service, const syncer::SyncService* sync_service) - : sync_service_(sync_service) {} + : pref_service_(pref_service), sync_service_(sync_service) {} bool PasswordFeatureManagerImpl::IsGenerationEnabled() const { switch (password_manager_util::GetPasswordSyncState(sync_service_)) { @@ -38,4 +39,19 @@ } } +bool PasswordFeatureManagerImpl::IsOptedInForAccountStorage() const { + return password_manager_util::IsOptedInForAccountStorage(pref_service_, + sync_service_); +} + +bool PasswordFeatureManagerImpl::ShouldShowAccountStorageOptIn() const { + return password_manager_util::ShouldShowAccountStorageOptIn(pref_service_, + sync_service_); +} + +void PasswordFeatureManagerImpl::SetAccountStorageOptIn(bool opt_in) { + password_manager_util::SetAccountStorageOptIn(pref_service_, sync_service_, + opt_in); +} + } // namespace password_manager
diff --git a/components/password_manager/core/browser/password_feature_manager_impl.h b/components/password_manager/core/browser/password_feature_manager_impl.h index a481814..70fd659 100644 --- a/components/password_manager/core/browser/password_feature_manager_impl.h +++ b/components/password_manager/core/browser/password_feature_manager_impl.h
@@ -12,20 +12,28 @@ class SyncService; } // namespace syncer +class PrefService; + namespace password_manager { // Keeps track of which feature of PasswordManager is enabled for a given // profile. class PasswordFeatureManagerImpl : public PasswordFeatureManager { public: - PasswordFeatureManagerImpl(const syncer::SyncService* sync_service); + PasswordFeatureManagerImpl(PrefService* pref_service, + const syncer::SyncService* sync_service); ~PasswordFeatureManagerImpl() override = default; bool IsGenerationEnabled() const override; bool ShouldCheckReuseOnLeakDetection() const override; + bool IsOptedInForAccountStorage() const override; + bool ShouldShowAccountStorageOptIn() const override; + void SetAccountStorageOptIn(bool opt_in) override; + private: + PrefService* const pref_service_; const syncer::SyncService* const sync_service_; DISALLOW_COPY_AND_ASSIGN(PasswordFeatureManagerImpl); };
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc index a3fd24b..5473a611 100644 --- a/components/password_manager/core/browser/password_manager.cc +++ b/components/password_manager/core/browser/password_manager.cc
@@ -177,6 +177,8 @@ registry->RegisterBooleanPref(prefs::kWasOnboardingFeatureCheckedBefore, false); + registry->RegisterDictionaryPref(prefs::kAccountStorageOptedInAccounts); + #if defined(OS_MACOSX) registry->RegisterIntegerPref(prefs::kKeychainMigrationStatus, 4 /* MIGRATED_DELETED */);
diff --git a/components/password_manager/core/browser/password_manager_client.cc b/components/password_manager/core/browser/password_manager_client.cc index bf63573..882dddb 100644 --- a/components/password_manager/core/browser/password_manager_client.cc +++ b/components/password_manager/core/browser/password_manager_client.cc
@@ -76,6 +76,12 @@ static_cast<const PasswordManagerClient*>(this)->GetPasswordManager()); } +PasswordFeatureManager* PasswordManagerClient::GetPasswordFeatureManager() { + return const_cast<PasswordFeatureManager*>( + static_cast<const PasswordManagerClient*>(this) + ->GetPasswordFeatureManager()); +} + HttpAuthManager* PasswordManagerClient::GetHttpAuthManager() { return nullptr; }
diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h index aa0ce43..cd64108 100644 --- a/components/password_manager/core/browser/password_manager_client.h +++ b/components/password_manager/core/browser/password_manager_client.h
@@ -250,6 +250,7 @@ PasswordManager* GetPasswordManager(); virtual const PasswordManager* GetPasswordManager() const; + PasswordFeatureManager* GetPasswordFeatureManager(); virtual const PasswordFeatureManager* GetPasswordFeatureManager() const = 0; // Returns the HttpAuthManager associated with this client.
diff --git a/components/password_manager/core/browser/password_manager_util.cc b/components/password_manager/core/browser/password_manager_util.cc index 6c5dba4..dd6b5268 100644 --- a/components/password_manager/core/browser/password_manager_util.cc +++ b/components/password_manager/core/browser/password_manager_util.cc
@@ -9,10 +9,12 @@ #include <string> #include <utility> +#include "base/base64.h" #include "base/bind.h" #include "base/metrics/histogram_functions.h" #include "base/stl_util.h" #include "base/time/time.h" +#include "base/values.h" #include "build/build_config.h" #include "components/autofill/core/browser/logging/log_manager.h" #include "components/autofill/core/browser/ui/popup_item_ids.h" @@ -32,8 +34,11 @@ #include "components/password_manager/core/common/password_manager_features.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h" +#include "crypto/sha2.h" +#include "google_apis/gaia/core_account_id.h" using autofill::PasswordForm; @@ -60,6 +65,13 @@ std::make_pair(!rhs->is_public_suffix_match, rhs->date_last_used); } +std::string GetAccountHash(const CoreAccountId& account_id) { + std::string account_hash; + base::Base64Encode(crypto::SHA256HashString(account_id.ToString()), + &account_hash); + return account_hash; +} + } // namespace // Update |credential| to reflect usage. @@ -340,4 +352,47 @@ return result; } +bool IsOptedInForAccountStorage(const PrefService* pref_service, + const syncer::SyncService* sync_service) { + DCHECK(pref_service); + DCHECK(sync_service); + + CoreAccountId account_id = sync_service->GetAuthenticatedAccountId(); + const base::DictionaryValue* dict = pref_service->GetDictionary( + password_manager::prefs::kAccountStorageOptedInAccounts); + if (!dict) + return false; + + base::Optional<bool> opted_in = dict->FindBoolKey(GetAccountHash(account_id)); + return opted_in.value_or(false); +} + +bool ShouldShowAccountStorageOptIn(const PrefService* pref_service, + const syncer::SyncService* sync_service) { + DCHECK(pref_service); + DCHECK(sync_service); + + // Only show the opt-in if: + // - Sync transport is enabled (i.e. user is signed in, Sync is not disabled + // by policy etc) - otherwise there's no point in asking. + // - Sync feature is NOT enabled - Sync feature doesn't depend on this opt-in. + // - Not already opted in. + return sync_service->GetTransportState() != + syncer::SyncService::TransportState::DISABLED && + !sync_service->IsSyncFeatureEnabled() && + !IsOptedInForAccountStorage(pref_service, sync_service); +} + +void SetAccountStorageOptIn(PrefService* pref_service, + const syncer::SyncService* sync_service, + bool opt_in) { + DCHECK(pref_service); + DCHECK(sync_service); + + CoreAccountId account_id = sync_service->GetAuthenticatedAccountId(); + DictionaryPrefUpdate update( + pref_service, password_manager::prefs::kAccountStorageOptedInAccounts); + update->SetBoolean(GetAccountHash(account_id), opt_in); +} + } // namespace password_manager_util
diff --git a/components/password_manager/core/browser/password_manager_util.h b/components/password_manager/core/browser/password_manager_util.h index 4473085..37fef9b 100644 --- a/components/password_manager/core/browser/password_manager_util.h +++ b/components/password_manager/core/browser/password_manager_util.h
@@ -141,6 +141,27 @@ autofill::PasswordForm MakeNormalizedBlacklistedForm( password_manager::PasswordStore::FormDigest digest); +// Whether the current signed-in user (aka unconsented primary account) has +// opted in to use the Google account storage for passwords (as opposed to +// local/profile storage). +// |pref_service| and |sync_service| must not be null. +bool IsOptedInForAccountStorage(const PrefService* pref_service, + const syncer::SyncService* sync_service); + +// Whether it makes sense to ask the user to opt-in for account-based +// password storage. This is true if the opt-in doesn't exist yet, but all +// other requirements are met (i.e. there is a signed-in user etc). +// |pref_service| and |sync_service| must not be null. +bool ShouldShowAccountStorageOptIn(const PrefService* pref_service, + const syncer::SyncService* sync_service); + +// Sets or clears the opt-in to using account storage for passwords for the +// current signed-in user (unconsented primary account). +// |pref_service| and |sync_service| must not be null. +void SetAccountStorageOptIn(PrefService* pref_service, + const syncer::SyncService* sync_service, + bool opt_in); + } // namespace password_manager_util #endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_MANAGER_UTIL_H_
diff --git a/components/password_manager/core/browser/sync/password_model_type_controller.cc b/components/password_manager/core/browser/sync/password_model_type_controller.cc index 07485b3..4d4885b6 100644 --- a/components/password_manager/core/browser/sync/password_model_type_controller.cc +++ b/components/password_manager/core/browser/sync/password_model_type_controller.cc
@@ -6,6 +6,9 @@ #include <utility> +#include "components/password_manager/core/browser/password_manager_util.h" +#include "components/password_manager/core/common/password_manager_pref_names.h" +#include "components/prefs/pref_service.h" #include "components/sync/base/model_type.h" #include "components/sync/driver/sync_client.h" #include "components/sync/driver/sync_service.h" @@ -18,13 +21,21 @@ delegate_for_full_sync_mode, std::unique_ptr<syncer::ModelTypeControllerDelegate> delegate_for_transport_mode, + PrefService* pref_service, syncer::SyncService* sync_service, const base::RepeatingClosure& state_changed_callback) : ModelTypeController(syncer::PASSWORDS, std::move(delegate_for_full_sync_mode), std::move(delegate_for_transport_mode)), + pref_service_(pref_service), sync_service_(sync_service), - state_changed_callback_(state_changed_callback) {} + state_changed_callback_(state_changed_callback) { + pref_registrar_.Init(pref_service_); + pref_registrar_.Add( + prefs::kAccountStorageOptedInAccounts, + base::BindRepeating(&PasswordModelTypeController::OnOptInPrefChanged, + base::Unretained(this))); +} PasswordModelTypeController::~PasswordModelTypeController() = default; @@ -61,9 +72,24 @@ state_changed_callback_.Run(); } +syncer::DataTypeController::PreconditionState +PasswordModelTypeController::GetPreconditionState() const { + if (sync_mode_ == syncer::SyncMode::kFull) + return PreconditionState::kPreconditionsMet; + return password_manager_util::IsOptedInForAccountStorage(pref_service_, + sync_service_) + ? PreconditionState::kPreconditionsMet + : PreconditionState::kMustStopAndClearData; +} + void PasswordModelTypeController::OnStateChanged(syncer::SyncService* sync) { DCHECK(CalledOnValidThread()); + sync_service_->DataTypePreconditionChanged(syncer::PASSWORDS); state_changed_callback_.Run(); } +void PasswordModelTypeController::OnOptInPrefChanged() { + sync_service_->DataTypePreconditionChanged(syncer::PASSWORDS); +} + } // namespace password_manager
diff --git a/components/password_manager/core/browser/sync/password_model_type_controller.h b/components/password_manager/core/browser/sync/password_model_type_controller.h index 8c6f8af..d11b84e 100644 --- a/components/password_manager/core/browser/sync/password_model_type_controller.h +++ b/components/password_manager/core/browser/sync/password_model_type_controller.h
@@ -9,9 +9,12 @@ #include "base/callback.h" #include "base/macros.h" +#include "components/prefs/pref_change_registrar.h" #include "components/sync/driver/model_type_controller.h" #include "components/sync/driver/sync_service_observer.h" +class PrefService; + namespace syncer { class ModelTypeControllerDelegate; class SyncService; @@ -28,6 +31,7 @@ delegate_for_full_sync_mode, std::unique_ptr<syncer::ModelTypeControllerDelegate> delegate_for_transport_mode, + PrefService* pref_service, syncer::SyncService* sync_service, const base::RepeatingClosure& state_changed_callback); ~PasswordModelTypeController() override; @@ -37,14 +41,20 @@ const ModelLoadCallback& model_load_callback) override; void Stop(syncer::ShutdownReason shutdown_reason, StopCallback callback) override; + PreconditionState GetPreconditionState() const override; // SyncServiceObserver overrides. void OnStateChanged(syncer::SyncService* sync) override; private: + void OnOptInPrefChanged(); + + PrefService* const pref_service_; syncer::SyncService* const sync_service_; const base::RepeatingClosure state_changed_callback_; + PrefChangeRegistrar pref_registrar_; + // Passed in to LoadModels(), and cached here for later use in Stop(). syncer::SyncMode sync_mode_ = syncer::SyncMode::kFull;
diff --git a/components/password_manager/core/common/password_manager_pref_names.cc b/components/password_manager/core/common/password_manager_pref_names.cc index 2ff5030..c781642d 100644 --- a/components/password_manager/core/common/password_manager_pref_names.cc +++ b/components/password_manager/core/common/password_manager_pref_names.cc
@@ -41,6 +41,9 @@ const char kSignInPasswordPromoRevive[] = "profile.sign_in_password_promo_revive"; +const char kAccountStorageOptedInAccounts[] = + "profile.password_account_storage_opted_in_accounts"; + const char kSyncPasswordHash[] = "profile.sync_password_hash"; const char kSyncPasswordLengthAndHashSalt[] =
diff --git a/components/password_manager/core/common/password_manager_pref_names.h b/components/password_manager/core/common/password_manager_pref_names.h index e0fccad..ce2b929 100644 --- a/components/password_manager/core/common/password_manager_pref_names.h +++ b/components/password_manager/core/common/password_manager_pref_names.h
@@ -67,6 +67,10 @@ // Safe to remove for M82. extern const char kSignInPasswordPromoRevive[]; +// Dictionary of accounts that have opted in to use the Google account storage +// for passwords (map from hash of Gaia ID to bool). +extern const char kAccountStorageOptedInAccounts[]; + // String that represents the sync password hash. extern const char kSyncPasswordHash[];
diff --git a/components/prefs/pref_notifier_impl.cc b/components/prefs/pref_notifier_impl.cc index 9c753e71..33eb9e9 100644 --- a/components/prefs/pref_notifier_impl.cc +++ b/components/prefs/pref_notifier_impl.cc
@@ -66,6 +66,8 @@ void PrefNotifierImpl::AddPrefObserver(const std::string& path, PrefObserver* obs) { + DCHECK(thread_checker_.CalledOnValidThread()); + // Get the pref observer list associated with the path. PrefObserverList* observer_list = nullptr; auto observer_iterator = pref_observers_.find(path);
diff --git a/components/quirks/quirks_client.cc b/components/quirks/quirks_client.cc index 6978eaa..e439241d 100644 --- a/components/quirks/quirks_client.cc +++ b/components/quirks/quirks_client.cc
@@ -55,11 +55,11 @@ QuirksClient::QuirksClient(int64_t product_id, const std::string& display_name, - const RequestFinishedCallback& on_request_finished, + RequestFinishedCallback on_request_finished, QuirksManager* manager) : product_id_(product_id), display_name_(display_name), - on_request_finished_(on_request_finished), + on_request_finished_(std::move(on_request_finished)), manager_(manager), icc_path_(manager->delegate()->GetDisplayProfileDirectory().Append( IdToFileName(product_id))), @@ -164,13 +164,14 @@ base::PostTaskAndReplyWithResult( manager_->task_runner(), FROM_HERE, - base::Bind(&WriteIccFile, icc_path_, data), - base::Bind(&QuirksClient::Shutdown, weak_ptr_factory_.GetWeakPtr())); + base::BindOnce(&WriteIccFile, icc_path_, data), + base::BindOnce(&QuirksClient::Shutdown, weak_ptr_factory_.GetWeakPtr())); } void QuirksClient::Shutdown(bool success) { DCHECK(thread_checker_.CalledOnValidThread()); - on_request_finished_.Run(success ? icc_path_ : base::FilePath(), true); + std::move(on_request_finished_) + .Run(success ? icc_path_ : base::FilePath(), true); manager_->ClientFinished(this); }
diff --git a/components/quirks/quirks_client.h b/components/quirks/quirks_client.h index 0b15c88..61b291a 100644 --- a/components/quirks/quirks_client.h +++ b/components/quirks/quirks_client.h
@@ -23,14 +23,14 @@ // See declaration in quirks_manager.h. using RequestFinishedCallback = - base::Callback<void(const base::FilePath&, bool)>; + base::OnceCallback<void(const base::FilePath&, bool)>; // Handles downloading icc and other display data files from Quirks Server. class QuirksClient { public: QuirksClient(int64_t product_id, const std::string& display_name, - const RequestFinishedCallback& on_request_finished, + RequestFinishedCallback on_request_finished, QuirksManager* manager); ~QuirksClient(); @@ -57,7 +57,7 @@ const std::string display_name_; // Callback supplied by caller. - const RequestFinishedCallback on_request_finished_; + RequestFinishedCallback on_request_finished_; // Weak pointer owned by manager, guaranteed to outlive this client object. QuirksManager* manager_;
diff --git a/components/quirks/quirks_manager.cc b/components/quirks/quirks_manager.cc index afd756c..0772ac5 100644 --- a/components/quirks/quirks_manager.cc +++ b/components/quirks/quirks_manager.cc
@@ -120,29 +120,29 @@ void QuirksManager::RequestIccProfilePath( int64_t product_id, const std::string& display_name, - const RequestFinishedCallback& on_request_finished) { + RequestFinishedCallback on_request_finished) { DCHECK(thread_checker_.CalledOnValidThread()); if (!QuirksEnabled()) { VLOG(1) << "Quirks Client disabled."; - on_request_finished.Run(base::FilePath(), false); + std::move(on_request_finished).Run(base::FilePath(), false); return; } if (!product_id) { VLOG(1) << "Could not determine display information (product id = 0)"; - on_request_finished.Run(base::FilePath(), false); + std::move(on_request_finished).Run(base::FilePath(), false); return; } std::string name = IdToFileName(product_id); base::PostTaskAndReplyWithResult( task_runner_.get(), FROM_HERE, - base::Bind(&CheckForIccFile, - delegate_->GetDisplayProfileDirectory().Append(name)), - base::Bind(&QuirksManager::OnIccFilePathRequestCompleted, - weak_ptr_factory_.GetWeakPtr(), product_id, display_name, - on_request_finished)); + base::BindOnce(&CheckForIccFile, + delegate_->GetDisplayProfileDirectory().Append(name)), + base::BindOnce(&QuirksManager::OnIccFilePathRequestCompleted, + weak_ptr_factory_.GetWeakPtr(), product_id, display_name, + std::move(on_request_finished))); } void QuirksManager::ClientFinished(QuirksClient* client) { @@ -156,13 +156,13 @@ void QuirksManager::OnIccFilePathRequestCompleted( int64_t product_id, const std::string& display_name, - const RequestFinishedCallback& on_request_finished, + RequestFinishedCallback on_request_finished, base::FilePath path) { DCHECK(thread_checker_.CalledOnValidThread()); // If we found a file, just inform requester. if (!path.empty()) { - on_request_finished.Run(path, false); + std::move(on_request_finished).Run(path, false); // TODO(glevin): If Quirks files are ever modified on the server, we'll need // to modify this logic to check for updates. See crbug.com/595024. return; @@ -180,13 +180,13 @@ VLOG(2) << time_since.InDays() << " days since last Quirks Server check for display " << IdToHexString(product_id); - on_request_finished.Run(base::FilePath(), false); + std::move(on_request_finished).Run(base::FilePath(), false); return; } // Create and start a client to download file. - QuirksClient* client = - new QuirksClient(product_id, display_name, on_request_finished, this); + QuirksClient* client = new QuirksClient(product_id, display_name, + std::move(on_request_finished), this); clients_.insert(base::WrapUnique(client)); if (!waiting_for_login_) client->StartDownload();
diff --git a/components/quirks/quirks_manager.h b/components/quirks/quirks_manager.h index 5cd96ed..4529be3 100644 --- a/components/quirks/quirks_manager.h +++ b/components/quirks/quirks_manager.h
@@ -33,7 +33,7 @@ // First parameter - path found, or empty if no file. // Second parameter - true if file was just downloaded. using RequestFinishedCallback = - base::Callback<void(const base::FilePath&, bool)>; + base::OnceCallback<void(const base::FilePath&, bool)>; // Format int as hex string for filename. QUIRKS_EXPORT std::string IdToHexString(int64_t product_id); @@ -80,10 +80,9 @@ void OnLoginCompleted(); // Entry point into manager. Finds or downloads icc file. - void RequestIccProfilePath( - int64_t product_id, - const std::string& display_name, - const RequestFinishedCallback& on_request_finished); + void RequestIccProfilePath(int64_t product_id, + const std::string& display_name, + RequestFinishedCallback on_request_finished); void ClientFinished(QuirksClient* client); @@ -112,7 +111,7 @@ void OnIccFilePathRequestCompleted( int64_t product_id, const std::string& display_name, - const RequestFinishedCallback& on_request_finished, + RequestFinishedCallback on_request_finished, base::FilePath path); // Whether downloads allowed by cmd line flag and device policy.
diff --git a/components/sync/driver/glue/sync_engine_impl_unittest.cc b/components/sync/driver/glue/sync_engine_impl_unittest.cc index 0a85c4a..b23a716 100644 --- a/components/sync/driver/glue/sync_engine_impl_unittest.cc +++ b/components/sync/driver/glue/sync_engine_impl_unittest.cc
@@ -23,7 +23,6 @@ #include "build/build_config.h" #include "components/invalidation/impl/invalidation_logger.h" #include "components/invalidation/impl/invalidation_switches.h" -#include "components/invalidation/impl/invalidator_storage.h" #include "components/invalidation/impl/profile_invalidation_provider.h" #include "components/invalidation/public/invalidation_service.h" #include "components/invalidation/public/invalidator_state.h"
diff --git a/components/sync/driver/sync_service.cc b/components/sync/driver/sync_service.cc index b5a6b1f..d76205b 100644 --- a/components/sync/driver/sync_service.cc +++ b/components/sync/driver/sync_service.cc
@@ -4,6 +4,7 @@ #include "components/sync/driver/sync_service.h" +#include "components/signin/public/identity_manager/account_info.h" #include "components/sync/driver/sync_user_settings.h" #include "components/sync/engine/cycle/sync_cycle_snapshot.h" @@ -16,6 +17,10 @@ on_destroy_.Run(); } +CoreAccountId SyncService::GetAuthenticatedAccountId() const { + return GetAuthenticatedAccountInfo().account_id; +} + bool SyncService::HasCompletedSyncCycle() const { // Stats on the last Sync cycle are only available in internal "for debugging" // information. Better to access that here than making clients do it.
diff --git a/components/sync/driver/sync_service.h b/components/sync/driver/sync_service.h index 18899912..a35f0ea 100644 --- a/components/sync/driver/sync_service.h +++ b/components/sync/driver/sync_service.h
@@ -18,6 +18,7 @@ #include "components/sync/base/user_demographics.h" #include "components/sync/driver/sync_service_observer.h" +struct CoreAccountId; struct CoreAccountInfo; class GoogleServiceAuthError; class GURL; @@ -218,6 +219,7 @@ virtual bool IsLocalSyncEnabled() const = 0; // Information about the currently signed in user. + CoreAccountId GetAuthenticatedAccountId() const; virtual CoreAccountInfo GetAuthenticatedAccountInfo() const = 0; // Whether the currently signed in user is the "primary" browser account (see // IdentityManager). If this is false, then IsSyncFeatureEnabled will also be
diff --git a/components/sync/engine_impl/model_type_worker.cc b/components/sync/engine_impl/model_type_worker.cc index 5938332..2a10504f 100644 --- a/components/sync/engine_impl/model_type_worker.cc +++ b/components/sync/engine_impl/model_type_worker.cc
@@ -6,7 +6,6 @@ #include <stdint.h> -#include <algorithm> #include <map> #include <utility> #include <vector> @@ -36,31 +35,6 @@ namespace { -bool ContainsDuplicate(std::vector<std::string> values) { - std::sort(values.begin(), values.end()); - return std::adjacent_find(values.begin(), values.end()) != values.end(); -} - -bool ContainsDuplicateClientTagHash(const UpdateResponseDataList& updates) { - std::vector<std::string> raw_client_tag_hashes; - for (const std::unique_ptr<UpdateResponseData>& update : updates) { - DCHECK(update); - if (!update->entity->client_tag_hash.value().empty()) { - raw_client_tag_hashes.push_back(update->entity->client_tag_hash.value()); - } - } - return ContainsDuplicate(std::move(raw_client_tag_hashes)); -} - -bool ContainsDuplicateServerID(const UpdateResponseDataList& updates) { - std::vector<std::string> server_ids; - for (const std::unique_ptr<UpdateResponseData>& update : updates) { - DCHECK(update); - server_ids.push_back(update->entity->id); - } - return ContainsDuplicate(std::move(server_ids)); -} - // Enumeration of possible values for the positioning schemes used in Sync // entities. Used in UMA metrics. Do not re-order or delete these entries; they // are used in a UMA histogram. Please edit SyncPositioningScheme in enums.xml @@ -482,19 +456,16 @@ << base::StringPrintf("Delivering %" PRIuS " applicable updates.", pending_updates_.size()); - // Having duplicates should be rare, so only do the de-duping if - // we've actually detected one. + // Deduplicate updates first based on server ids, which is the only legit + // source of duplicates, specially due to pagination. + DeduplicatePendingUpdatesBasedOnServerId(); - // Deduplicate updates first based on server ids. - if (ContainsDuplicateServerID(pending_updates_)) { - DeduplicatePendingUpdatesBasedOnServerId(); - } - - // Check for duplicate client tag hashes after removing duplicate server - // ids, and deduplicate updates based on client tag hashes if necessary. - if (ContainsDuplicateClientTagHash(pending_updates_)) { - DeduplicatePendingUpdatesBasedOnClientTagHash(); - } + // As extra precaution, and although it shouldn't be necessary without a + // misbehaving server, deduplicate based on client tags and originator item + // IDs. This allows further code to use DCHECKs without relying on external + // behavior. + DeduplicatePendingUpdatesBasedOnClientTagHash(); + DeduplicatePendingUpdatesBasedOnOriginatorClientItemId(); int num_updates_applied = pending_updates_.size(); model_type_processor_->OnUpdateReceived(model_type_state_, @@ -690,6 +661,7 @@ void ModelTypeWorker::DeduplicatePendingUpdatesBasedOnServerId() { UpdateResponseDataList candidates; pending_updates_.swap(candidates); + pending_updates_.reserve(candidates.size()); std::map<std::string, size_t> id_to_index; for (std::unique_ptr<UpdateResponseData>& candidate : candidates) { @@ -716,6 +688,7 @@ void ModelTypeWorker::DeduplicatePendingUpdatesBasedOnClientTagHash() { UpdateResponseDataList candidates; pending_updates_.swap(candidates); + pending_updates_.reserve(candidates.size()); std::map<ClientTagHash, size_t> tag_to_index; for (std::unique_ptr<UpdateResponseData>& candidate : candidates) { @@ -741,6 +714,36 @@ } } +void ModelTypeWorker::DeduplicatePendingUpdatesBasedOnOriginatorClientItemId() { + UpdateResponseDataList candidates; + pending_updates_.swap(candidates); + pending_updates_.reserve(candidates.size()); + + std::map<std::string, size_t> id_to_index; + for (std::unique_ptr<UpdateResponseData>& candidate : candidates) { + DCHECK(candidate); + // Items with empty item ID just get passed through (which is the case for + // all datatypes except bookmarks). + if (candidate->entity->originator_client_item_id.empty()) { + pending_updates_.push_back(std::move(candidate)); + continue; + } + // Try to insert. If we already saw an item with the same originator item + // ID, this will fail but give us its iterator. + auto it_and_success = id_to_index.emplace( + candidate->entity->originator_client_item_id, pending_updates_.size()); + if (it_and_success.second) { + // New item ID, append at the end. Note that we already inserted the + // correct index (|pending_updates_.size()|) above. + pending_updates_.push_back(std::move(candidate)); + } else { + // Duplicate! Overwrite the existing item. + size_t existing_index = it_and_success.first->second; + pending_updates_[existing_index] = std::move(candidate); + } + } +} + // static bool ModelTypeWorker::DecryptSpecifics(const Cryptographer& cryptographer, const sync_pb::EntitySpecifics& in,
diff --git a/components/sync/engine_impl/model_type_worker.h b/components/sync/engine_impl/model_type_worker.h index cbaf303..82bf8dc2 100644 --- a/components/sync/engine_impl/model_type_worker.h +++ b/components/sync/engine_impl/model_type_worker.h
@@ -205,6 +205,11 @@ // tag hash. It discards all of them except the last one. void DeduplicatePendingUpdatesBasedOnClientTagHash(); + // Filters our duplicate updates from |pending_updates_| based on the + // originator item ID (in practice used for bookmarks only). It discards all + // of them except the last one. + void DeduplicatePendingUpdatesBasedOnOriginatorClientItemId(); + ModelType type_; DataTypeDebugInfoEmitter* debug_info_emitter_;
diff --git a/components/sync/engine_impl/model_type_worker_unittest.cc b/components/sync/engine_impl/model_type_worker_unittest.cc index 44be2fbf..169fe72 100644 --- a/components/sync/engine_impl/model_type_worker_unittest.cc +++ b/components/sync/engine_impl/model_type_worker_unittest.cc
@@ -864,11 +864,10 @@ EXPECT_EQ(kValue3, result[2]->entity->specifics.preference().value()); } +// Covers the scenario where two updates have the same client tag hash but +// different server IDs. This scenario is considered a bug on the server. TEST_F(ModelTypeWorkerTest, ReceiveUpdates_DuplicateClientTagHashesForDistinctServerIds) { - // This is testing that in a a scenario where two updates are having the same - // client tag hashes and different server ids, the proper UMA metrics are - // emitted. This scenario is considered a bug on the server. NormalInitialize(); // First create two entities with different tags, so they get assigned @@ -897,6 +896,44 @@ EXPECT_EQ(entity2.id_string(), result[0]->entity->id); } +// Covers the scenario where two updates have the same originator client item ID +// but different server IDs. This scenario is considered a bug on the server. +TEST_F(ModelTypeWorkerTest, + ReceiveUpdates_DuplicateOriginatorClientIdForDistinctServerIds) { + const std::string kOriginatorClientItemId = "itemid"; + const std::string kURL1 = "http://url1"; + const std::string kURL2 = "http://url2"; + const std::string kServerId1 = "serverid1"; + const std::string kServerId2 = "serverid2"; + + NormalInitialize(); + + sync_pb::SyncEntity entity1; + sync_pb::SyncEntity entity2; + + // Generate two entities with the same originator client item ID. + entity1.set_id_string(kServerId1); + entity2.set_id_string(kServerId2); + entity1.mutable_specifics()->mutable_bookmark()->set_url(kURL1); + entity2.mutable_specifics()->mutable_bookmark()->set_url(kURL2); + entity1.set_originator_client_item_id(kOriginatorClientItemId); + entity2.set_originator_client_item_id(kOriginatorClientItemId); + + worker()->ProcessGetUpdatesResponse( + server()->GetProgress(), server()->GetContext(), {&entity1, &entity2}, + status_controller()); + + ApplyUpdates(); + + // Make sure the first update has been discarded. + ASSERT_EQ(1u, processor()->GetNumUpdateResponses()); + std::vector<const UpdateResponseData*> result = + processor()->GetNthUpdateResponse(0); + ASSERT_EQ(1u, result.size()); + ASSERT_TRUE(result[0]); + EXPECT_EQ(kURL2, result[0]->entity->specifics.bookmark().url()); +} + // Test that an update download coming in multiple parts gets accumulated into // one call to the processor. TEST_F(ModelTypeWorkerTest, ReceiveMultiPartUpdates) { @@ -1902,6 +1939,7 @@ sync_pb::SyncEntity entity; entity.mutable_specifics()->mutable_bookmark()->set_url("www.foo.com"); entity.mutable_specifics()->mutable_bookmark()->set_title("Title"); + entity.set_id_string("testserverid"); entity.set_originator_client_item_id(kGuid1); *entity.mutable_unique_position() = UniquePosition::InitialPosition(UniquePosition::RandomSuffix()).ToProto(); @@ -1950,6 +1988,7 @@ sync_pb::SyncEntity entity; entity.mutable_specifics()->mutable_bookmark()->set_url("www.foo.com"); entity.mutable_specifics()->mutable_bookmark()->set_title("Title"); + entity.set_id_string("testserverid"); entity.set_originator_client_item_id(kInvalidOCII); *entity.mutable_unique_position() = UniquePosition::InitialPosition(UniquePosition::RandomSuffix()).ToProto(); @@ -1996,6 +2035,7 @@ // Generate specifics without a GUID. sync_pb::SyncEntity entity; entity.mutable_specifics()->mutable_bookmark(); + entity.set_id_string("testserverid"); entity.set_originator_client_item_id(kGuid1); *entity.mutable_unique_position() = UniquePosition::InitialPosition(UniquePosition::RandomSuffix()).ToProto(); @@ -2037,6 +2077,7 @@ // originator_client_item_id. sync_pb::SyncEntity entity; entity.mutable_specifics()->mutable_bookmark(); + entity.set_id_string("testserverid"); entity.set_originator_client_item_id(kInvalidOCII); *entity.mutable_unique_position() = UniquePosition::InitialPosition(UniquePosition::RandomSuffix()).ToProto();
diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc index dfd19a2..eae153ef 100644 --- a/components/sync_bookmarks/bookmark_model_merger.cc +++ b/components/sync_bookmarks/bookmark_model_merger.cc
@@ -60,6 +60,26 @@ syncer::UpdateResponseDataList, base::StringPieceHash>; +// Gets the bookmark node corresponding to a permanent folder identified by +// |server_defined_unique_tag|. |bookmark_model| must not be null. +const bookmarks::BookmarkNode* GetPermanentFolder( + const bookmarks::BookmarkModel* bookmark_model, + const std::string& server_defined_unique_tag) { + DCHECK(bookmark_model); + + if (server_defined_unique_tag == kBookmarkBarTag) { + return bookmark_model->bookmark_bar_node(); + } + if (server_defined_unique_tag == kOtherBookmarksTag) { + return bookmark_model->other_node(); + } + if (server_defined_unique_tag == kMobileBookmarksTag) { + return bookmark_model->mobile_node(); + } + + return nullptr; +} + // Canonicalize |title| similar to legacy client's implementation by truncating // up to |kTitleLimitBytes| and the appending ' ' in some cases. std::string CanonicalizeTitle(const std::string& title) { @@ -97,6 +117,53 @@ return local_node->url() == GURL(specifics.url()); } +// Goes through remote updates to detect duplicate GUIDs (should be extremely +// rare) and resolve them by ignoring (clearing) all occurrences except one, +// which if possible will be the one that also matches the originator client +// item ID. +// TODO(crbug.com/978430): Remove this logic and deprecate proto field. +void ResolveDuplicateRemoteGUIDs(syncer::UpdateResponseDataList* updates) { + std::set<std::string> known_guids; + // In a first pass we process |originator_client_item_id| which is more + // authoritative and cannot run into duplicates. + for (const std::unique_ptr<UpdateResponseData>& update : *updates) { + DCHECK(update); + DCHECK(update->entity); + + // |originator_client_item_id| is empty for permanent nodes. + if (update->entity->is_deleted() || + update->entity->originator_client_item_id.empty()) { + continue; + } + + bool success = + known_guids.insert(update->entity->originator_client_item_id).second; + DCHECK(success); + } + + // In a second pass, detect if GUIDs in specifics conflict with each other or + // with |originator_client_item_id| values processed earlier. + for (std::unique_ptr<UpdateResponseData>& update : *updates) { + DCHECK(update); + DCHECK(update->entity); + + const std::string& guid_in_specifics = + update->entity->specifics.bookmark().guid(); + if (guid_in_specifics.empty() || + guid_in_specifics == update->entity->originator_client_item_id) { + continue; + } + + bool success = known_guids.insert(guid_in_specifics).second; + if (!success) { + // This GUID conflicts with another one, so let's ignore it for the + // purpose of merging. This mimics the data produced by old clients, + // without the GUID being populated. + update->entity->specifics.mutable_bookmark()->clear_guid(); + } + } +} + // Groups all valid updates by the server ID of their parent and moves them away // from |*updates|. |updates| must not be null. UpdatesPerParentId GroupValidUpdatesByParentId( @@ -172,7 +239,10 @@ const std::string& guid = entity().specifics.bookmark().guid(); if (!guid.empty()) { DCHECK(base::IsValidGUID(guid)); - guid_to_remote_node_map->emplace(guid, this); + + // Duplicate GUIDs have been sorted out before. + bool success = guid_to_remote_node_map->emplace(guid, this).second; + DCHECK(success); } for (const RemoteTreeNode& child : children_) { @@ -267,7 +337,7 @@ // Associate permanent folders. for (const auto& tree_tag_and_root : remote_forest_) { const bookmarks::BookmarkNode* permanent_folder = - GetPermanentFolder(tree_tag_and_root.first); + GetPermanentFolder(bookmark_model_, tree_tag_and_root.first); if (!permanent_folder) { continue; } @@ -279,6 +349,8 @@ // static BookmarkModelMerger::RemoteForest BookmarkModelMerger::BuildRemoteForest( syncer::UpdateResponseDataList updates) { + ResolveDuplicateRemoteGUIDs(&updates); + // Filter out invalid remote updates and group the valid ones by the server ID // of their parent. UpdatesPerParentId updates_per_parent_id = @@ -312,9 +384,6 @@ bookmarks::BookmarkModel* bookmark_model) { DCHECK(bookmark_model); - // TODO(crbug.com/978430): Handle potential duplicate GUIDs within remote - // updates. - if (!base::FeatureList::IsEnabled(switches::kMergeBookmarksUsingGUIDs)) { return {}; } @@ -336,10 +405,6 @@ const bookmarks::BookmarkNode* const node = iterator.Next(); DCHECK(base::IsValidGUID(node->guid())); - if (node->is_permanent_node()) { - continue; - } - const auto remote_it = guid_to_remote_node_map.find(node->guid()); if (remote_it == guid_to_remote_node_map.end()) { continue; @@ -347,13 +412,24 @@ const RemoteTreeNode* const remote_node = remote_it->second; const syncer::EntityData& remote_entity = remote_node->entity(); + + // Permanent nodes don't match by GUID but by |server_defined_unique_tag|. + // As extra precaution, specially with remote GUIDs in mind, let's ignore + // them explicitly here. + if (node->is_permanent_node() || + GetPermanentFolder(bookmark_model, + remote_entity.server_defined_unique_tag) != + nullptr) { + continue; + } + if (node->is_folder() != remote_entity.is_folder || (node->is_url() && node->url() != remote_entity.specifics.bookmark().url())) { // If local node and its remote node match are conflicting in node type or // URL, replace local GUID with a random GUID. // TODO(crbug.com/978430): Local GUIDs should also be reassigned if they - // match a remote originator_item_id. + // match a remote originator_client_item_id. ReplaceBookmarkNodeGUID(node, base::GenerateGUID(), bookmark_model); continue; } @@ -440,7 +516,12 @@ return nullptr; } - return local_parent->children()[local_index].get(); + // The child at |local_index| has matched by semantics, which also means it + // does not match by GUID to any other remote node. + const bookmarks::BookmarkNode* matching_local_node_by_semantics = + local_parent->children()[local_index].get(); + DCHECK(!FindMatchingRemoteNodeByGUID(matching_local_node_by_semantics)); + return matching_local_node_by_semantics; } const bookmarks::BookmarkNode* @@ -457,21 +538,33 @@ const sync_pb::BookmarkSpecifics& specifics = remote_update_entity.specifics.bookmark(); - // If the nodes were matched by GUID, we update the BookmarkNode semantics - // accordingly. - if (local_node->guid() == specifics.guid()) { - UpdateBookmarkNodeFromSpecifics(specifics, local_node, bookmark_model_, - favicon_service_); + // Update the local GUID if necessary for semantic matches (it's obviously not + // needed for GUID-based matches). + const bookmarks::BookmarkNode* possibly_replaced_local_node = local_node; + if (!specifics.guid().empty() && specifics.guid() != local_node->guid()) { + // If it's a semantic match, neither of the nodes should be involved in any + // GUID-based match. + DCHECK(!FindMatchingLocalNodeByGUID(remote_node)); + DCHECK(!FindMatchingRemoteNodeByGUID(local_node)); + + possibly_replaced_local_node = + ReplaceBookmarkNodeGUID(local_node, specifics.guid(), bookmark_model_); + + // Update |guid_to_match_map_| to avoid pointing to a deleted node. This + // should not be required in practice, because the algorithm processes each + // GUID once, but let's update nevertheless to avoid future issues. + const auto it = + guid_to_match_map_.find(possibly_replaced_local_node->guid()); + if (it != guid_to_match_map_.end() && it->second.local_node == local_node) { + it->second.local_node = possibly_replaced_local_node; + } } - // If the nodes were matched by semantics, the local GUID is replaced by its - // remote counterpart, unless it is empty, in which case we keep the local - // GUID unchanged. - if (specifics.guid().empty() || FindMatchingLocalNodeByGUID(remote_node)) { - return local_node; - } - DCHECK(base::IsValidGUID(specifics.guid())); - return ReplaceBookmarkNodeGUID(local_node, specifics.guid(), bookmark_model_); + // Update all fields, where no-op changes are handled well. + UpdateBookmarkNodeFromSpecifics(specifics, possibly_replaced_local_node, + bookmark_model_, favicon_service_); + + return possibly_replaced_local_node; } void BookmarkModelMerger::ProcessRemoteCreation( @@ -576,20 +669,6 @@ } } -const bookmarks::BookmarkNode* BookmarkModelMerger::GetPermanentFolder( - const std::string& server_defined_unique_tag) const { - if (server_defined_unique_tag == kBookmarkBarTag) { - return bookmark_model_->bookmark_bar_node(); - } - if (server_defined_unique_tag == kOtherBookmarksTag) { - return bookmark_model_->other_node(); - } - if (server_defined_unique_tag == kMobileBookmarksTag) { - return bookmark_model_->mobile_node(); - } - return nullptr; -} - size_t BookmarkModelMerger::FindMatchingChildBySemanticsStartingAt( const RemoteTreeNode& remote_node, const bookmarks::BookmarkNode* local_parent, @@ -616,6 +695,7 @@ return nullptr; } + DCHECK_EQ(it->second.local_node, local_node); return it->second.remote_node; } @@ -628,6 +708,7 @@ return nullptr; } + DCHECK_EQ(it->second.remote_node, &remote_node); return it->second.local_node; }
diff --git a/components/sync_bookmarks/bookmark_model_merger.h b/components/sync_bookmarks/bookmark_model_merger.h index 1874492..9b592000 100644 --- a/components/sync_bookmarks/bookmark_model_merger.h +++ b/components/sync_bookmarks/bookmark_model_merger.h
@@ -107,11 +107,6 @@ void ProcessLocalCreation(const bookmarks::BookmarkNode* parent, size_t index); - // Gets the bookmark node corresponding to a permanent folder identified by - // |server_defined_unique_tag|. - const bookmarks::BookmarkNode* GetPermanentFolder( - const std::string& server_defined_unique_tag) const; - // Looks for a local node under |local_parent| that matches |remote_node|, // starting at index |local_child_start_index|. First attempts to find a match // by GUID and otherwise attempts to find one by semantics. If no match is
diff --git a/components/sync_bookmarks/bookmark_model_merger_unittest.cc b/components/sync_bookmarks/bookmark_model_merger_unittest.cc index 5d7aca091..cba854b 100644 --- a/components/sync_bookmarks/bookmark_model_merger_unittest.cc +++ b/components/sync_bookmarks/bookmark_model_merger_unittest.cc
@@ -23,6 +23,7 @@ using testing::_; using testing::Eq; +using testing::Ne; using testing::NotNull; using testing::UnorderedElementsAre; @@ -64,6 +65,7 @@ auto data = std::make_unique<syncer::EntityData>(); data->id = server_id; + data->originator_client_item_id = *guid; data->parent_id = parent_id; data->unique_position = unique_position.ToProto(); @@ -1255,4 +1257,149 @@ EXPECT_THAT(tracker->GetEntityForBookmarkNode(bookmark), NotNull()); } +// Tests that the GUID-based matching algorithm does not match two remote nodes +// with the same local node, even if the remote data contains duplicate GUIDs. +TEST(BookmarkModelMergerTest, ShouldIgnoreRemoteDuplicateGUID) { + base::test::ScopedFeatureList override_features; + override_features.InitAndEnableFeature(switches::kMergeBookmarksUsingGUIDs); + + const std::string kId1 = "Id1"; + const std::string kId2 = "Id2"; + const std::string kTitle1 = "Title1"; + const std::string kTitle2 = "Title2"; + const std::string kLocalTitle = "LocalTitle"; + const std::string kUrl = "http://www.foo.com/"; + const std::string kGuid = base::GenerateGUID(); + + std::unique_ptr<bookmarks::BookmarkModel> bookmark_model = + bookmarks::TestBookmarkClient::CreateModel(); + + // -------- The local model -------- + // | - bookmark(kGuid/kUrl/kLocalTitle) + const bookmarks::BookmarkNode* bookmark_bar_node = + bookmark_model->bookmark_bar_node(); + const bookmarks::BookmarkNode* bookmark = bookmark_model->AddURL( + /*parent=*/bookmark_bar_node, /*index=*/0, base::UTF8ToUTF16(kLocalTitle), + GURL(kUrl), nullptr, base::Time::Now(), kGuid); + ASSERT_TRUE(bookmark); + ASSERT_THAT(bookmark_bar_node->children(), ElementRawPointersAre(bookmark)); + + // -------- The remote model -------- + // bookmark_bar + // | - bookmark (kGuid/kUrl/kTitle1) + // | - bookmark (kGuid/kUrl/kTitle2) + const std::string suffix = syncer::UniquePosition::RandomSuffix(); + syncer::UniquePosition position1 = + syncer::UniquePosition::InitialPosition(suffix); + syncer::UniquePosition position2 = + syncer::UniquePosition::After(position1, suffix); + + syncer::UpdateResponseDataList updates; + updates.push_back(CreateBookmarkBarNodeUpdateData()); + updates.push_back(CreateUpdateResponseData( + /*server_id=*/kId1, /*parent_id=*/kBookmarkBarId, kTitle1, + /*url=*/kUrl, + /*is_folder=*/false, /*unique_position=*/position1, + /*guid=*/kGuid)); + updates.push_back(CreateUpdateResponseData( + /*server_id=*/kId2, /*parent_id=*/kBookmarkBarId, kTitle2, + /*url=*/kUrl, + /*is_folder=*/false, /*unique_position=*/position2, + /*guid=*/kGuid)); + + // |originator_client_item_id| cannot itself be duplicated because + // ModelTypeWorker guarantees otherwise. + updates.back()->entity->originator_client_item_id = base::GenerateGUID(); + + std::unique_ptr<SyncedBookmarkTracker> tracker = + Merge(std::move(updates), bookmark_model.get()); + + // -------- The merged model -------- + // | - bookmark (kGuid/kUrl/kTitle1) + // | - bookmark (<some-other-guid>/kUrl/kTitle2) + + // Both remote nodes should be present in the merged tree. + ASSERT_EQ(bookmark_bar_node->children().size(), 2u); + const bookmarks::BookmarkNode* bookmark1 = + bookmark_model->bookmark_bar_node()->children()[0].get(); + const bookmarks::BookmarkNode* bookmark2 = + bookmark_model->bookmark_bar_node()->children()[1].get(); + EXPECT_THAT(bookmark1->guid(), Eq(kGuid)); + EXPECT_THAT(bookmark2->guid(), Ne(kGuid)); + + EXPECT_THAT(tracker->GetEntityForBookmarkNode(bookmark1), NotNull()); + EXPECT_THAT(tracker->GetEntityForBookmarkNode(bookmark2), NotNull()); +} + +// Same as previous test but in addition all nodes match semantically. +TEST(BookmarkModelMergerTest, ShouldIgnoreRemoteDuplicateGUIDAndSemanticMatch) { + base::test::ScopedFeatureList override_features; + override_features.InitAndEnableFeature(switches::kMergeBookmarksUsingGUIDs); + + const std::string kId1 = "Id1"; + const std::string kId2 = "Id2"; + const std::string kTitle = "Title"; + const std::string kUrl = "http://www.foo.com/"; + const std::string kGuid = base::GenerateGUID(); + + std::unique_ptr<bookmarks::BookmarkModel> bookmark_model = + bookmarks::TestBookmarkClient::CreateModel(); + + // -------- The local model -------- + // | - bookmark(kGuid/kUrl/kTitle) + const bookmarks::BookmarkNode* bookmark_bar_node = + bookmark_model->bookmark_bar_node(); + const bookmarks::BookmarkNode* bookmark = bookmark_model->AddURL( + /*parent=*/bookmark_bar_node, /*index=*/0, base::UTF8ToUTF16(kTitle), + GURL(kUrl), nullptr, base::Time::Now(), kGuid); + ASSERT_TRUE(bookmark); + ASSERT_THAT(bookmark_bar_node->children(), ElementRawPointersAre(bookmark)); + + // -------- The remote model -------- + // bookmark_bar + // | - bookmark (kGuid/kUrl/kTitle) + // | - bookmark (kGuid/kUrl/kTitle) + const std::string suffix = syncer::UniquePosition::RandomSuffix(); + syncer::UniquePosition position1 = + syncer::UniquePosition::InitialPosition(suffix); + syncer::UniquePosition position2 = + syncer::UniquePosition::After(position1, suffix); + + syncer::UpdateResponseDataList updates; + updates.push_back(CreateBookmarkBarNodeUpdateData()); + updates.push_back(CreateUpdateResponseData( + /*server_id=*/kId1, /*parent_id=*/kBookmarkBarId, kTitle, + /*url=*/kUrl, + /*is_folder=*/false, /*unique_position=*/position1, + /*guid=*/kGuid)); + updates.push_back(CreateUpdateResponseData( + /*server_id=*/kId2, /*parent_id=*/kBookmarkBarId, kTitle, + /*url=*/kUrl, + /*is_folder=*/false, /*unique_position=*/position2, + /*guid=*/kGuid)); + + // |originator_client_item_id| cannot itself be duplicated because + // ModelTypeWorker guarantees otherwise. + updates.back()->entity->originator_client_item_id = base::GenerateGUID(); + + std::unique_ptr<SyncedBookmarkTracker> tracker = + Merge(std::move(updates), bookmark_model.get()); + + // -------- The merged model -------- + // | - bookmark (kGuid/kUrl/kTitle) + // | - bookmark (<some-other-guid>/kUrl/kTitle) + + // Both remote nodes should be present in the merged tree. + ASSERT_EQ(bookmark_bar_node->children().size(), 2u); + const bookmarks::BookmarkNode* bookmark1 = + bookmark_model->bookmark_bar_node()->children()[0].get(); + const bookmarks::BookmarkNode* bookmark2 = + bookmark_model->bookmark_bar_node()->children()[1].get(); + EXPECT_THAT(bookmark1->guid(), Eq(kGuid)); + EXPECT_THAT(bookmark2->guid(), Ne(kGuid)); + + EXPECT_THAT(tracker->GetEntityForBookmarkNode(bookmark1), NotNull()); + EXPECT_THAT(tracker->GetEntityForBookmarkNode(bookmark2), NotNull()); +} + } // namespace sync_bookmarks
diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc index f509e0e1..805f654 100644 --- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc +++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.cc
@@ -13,6 +13,7 @@ #include "base/optional.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_task_runner_handle.h" +#include "base/trace_event/memory_dump_manager.h" #include "base/trace_event/trace_event.h" #include "components/viz/common/features.h" #include "components/viz/common/frame_sinks/copy_output_request.h" @@ -36,6 +37,7 @@ #include "gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h" #include "gpu/command_buffer/service/gr_shader_cache.h" #include "gpu/command_buffer/service/mailbox_manager.h" +#include "gpu/command_buffer/service/memory_tracking.h" #include "gpu/command_buffer/service/scheduler.h" #include "gpu/command_buffer/service/service_utils.h" #include "gpu/command_buffer/service/shared_image_factory.h" @@ -44,6 +46,7 @@ #include "gpu/command_buffer/service/texture_base.h" #include "gpu/command_buffer/service/texture_manager.h" #include "gpu/config/gpu_preferences.h" +#include "gpu/ipc/common/command_buffer_id.h" #include "gpu/ipc/common/gpu_client_ids.h" #include "gpu/ipc/common/gpu_surface_lookup.h" #include "gpu/vulkan/buildflags.h" @@ -112,6 +115,42 @@ gfx::Rect result_rect; }; +class SharedImageSubMemoryTracker : public gpu::MemoryTracker { + public: + SharedImageSubMemoryTracker(gpu::CommandBufferId command_buffer_id, + uint64_t client_tracing_id, + Observer* observer) + : command_buffer_id_(command_buffer_id), + client_tracing_id_(client_tracing_id), + observer_(observer) {} + SharedImageSubMemoryTracker(const SharedImageSubMemoryTracker&) = delete; + SharedImageSubMemoryTracker& operator=(const SharedImageSubMemoryTracker&) = + delete; + ~SharedImageSubMemoryTracker() override { DCHECK(!size_); } + + // MemoryTracker implementation: + void TrackMemoryAllocatedChange(uint64_t delta) override { + uint64_t old_size = size_; + size_ += delta; + DCHECK(observer_); + observer_->OnMemoryAllocatedChange(command_buffer_id_, old_size, size_); + } + uint64_t GetSize() const override { return size_; } + uint64_t ClientTracingId() const override { return client_tracing_id_; } + int ClientId() const override { + return gpu::ChannelIdFromCommandBufferId(command_buffer_id_); + } + uint64_t ContextGroupTracingId() const override { + return command_buffer_id_.GetUnsafeValue(); + } + + private: + gpu::CommandBufferId command_buffer_id_; + const uint64_t client_tracing_id_; + MemoryTracker::Observer* const observer_; + uint64_t size_ = 0; +}; + class CopyOutputResultYUV : public CopyOutputResult { public: CopyOutputResultYUV(const gfx::Rect& rect, @@ -282,10 +321,11 @@ } std::unique_ptr<gpu::SharedImageRepresentationFactory> -CreateSharedImageRepresentationFactory(SkiaOutputSurfaceDependency* deps) { +CreateSharedImageRepresentationFactory(SkiaOutputSurfaceDependency* deps, + gpu::MemoryTracker* memory_tracker) { // TODO(https://crbug.com/899905): Use a real MemoryTracker, not nullptr. return std::make_unique<gpu::SharedImageRepresentationFactory>( - deps->GetSharedImageManager(), nullptr); + deps->GetSharedImageManager(), memory_tracker); } class ScopedSurfaceToTexture { @@ -417,6 +457,7 @@ gpu::SharedContextState* context_state, gpu::MailboxManager* mailbox_manager, gpu::SharedImageManager* shared_image_manager, + gpu::MemoryTracker* memory_tracker, scoped_refptr<gpu::SyncPointClientState> sync_point_client_state) : shared_image_manager_(shared_image_manager), shared_image_factory_(gpu_preferences, @@ -426,7 +467,7 @@ mailbox_manager, shared_image_manager, nullptr /* image_factory */, - nullptr /* memory_tracker */, + memory_tracker, true /* is_using_skia_renderer */), sync_point_client_state_(sync_point_client_state) {} @@ -658,8 +699,14 @@ feature_info_(std::move(feature_info)), sync_point_client_state_( CreateSyncPointClientState(dependency_, sequence_id)), + memory_tracker_(std::make_unique<SharedImageSubMemoryTracker>( + sync_point_client_state_->command_buffer_id(), + base::trace_event::MemoryDumpManager::GetInstance() + ->GetTracingProcessId(), + dependency_->GetSharedContextState()->memory_tracker())), shared_image_representation_factory_( - CreateSharedImageRepresentationFactory(dependency_)), + CreateSharedImageRepresentationFactory(dependency_, + memory_tracker_.get())), vulkan_context_provider_(dependency_->GetVulkanContextProvider()), dawn_context_provider_(dependency_->GetDawnContextProvider()), renderer_settings_(renderer_settings), @@ -1021,6 +1068,7 @@ gpu_preferences_, dependency_->GetGpuDriverBugWorkarounds(), dependency_->GetGpuFeatureInfo(), context_state_.get(), dependency_->GetMailboxManager(), dependency_->GetSharedImageManager(), + memory_tracker_.get(), CreateSyncPointClientState(dependency_, sequence_id_)); context_provider_ = base::MakeRefCounted<DirectContextProvider>( context_state_->context(), gl_surface_, supports_alpha_,
diff --git a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.h b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.h index 611e3e52..03f0eed9 100644 --- a/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.h +++ b/components/viz/service/display_embedder/skia_output_surface_impl_on_gpu.h
@@ -265,6 +265,7 @@ SkiaOutputSurfaceDependency* const dependency_; scoped_refptr<gpu::gles2::FeatureInfo> feature_info_; scoped_refptr<gpu::SyncPointClientState> sync_point_client_state_; + std::unique_ptr<gpu::MemoryTracker> memory_tracker_; std::unique_ptr<gpu::SharedImageRepresentationFactory> shared_image_representation_factory_; VulkanContextProvider* const vulkan_context_provider_;
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index c3f03cc..5c2b54a 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn
@@ -95,6 +95,7 @@ "//content/browser/notifications:notification_proto", "//content/browser/payments:payment_app_proto", "//content/browser/process_internals:mojo_bindings", + "//content/browser/resources/media:media_internals_resources", "//content/browser/service_worker:service_worker_proto", "//content/browser/speech/proto", "//content/browser/webrtc/resources",
diff --git a/content/browser/back_forward_cache_browsertest.cc b/content/browser/back_forward_cache_browsertest.cc index d48d0af..c9bbf6c9 100644 --- a/content/browser/back_forward_cache_browsertest.cc +++ b/content/browser/back_forward_cache_browsertest.cc
@@ -6,6 +6,7 @@ #include "base/hash/hash.h" #include "base/metrics/metrics_hashes.h" #include "base/optional.h" +#include "base/strings/string_piece_forward.h" #include "base/system/sys_info.h" #include "base/task/post_task.h" #include "base/test/bind_test_util.h" @@ -18,6 +19,8 @@ #include "content/browser/frame_host/frame_tree_node.h" #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" +#include "content/public/browser/back_forward_cache.h" +#include "content/public/browser/global_routing_id.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/site_isolation_policy.h" @@ -4382,6 +4385,50 @@ FROM_HERE); } +IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, + EvictIfCachedIsNoopIfNotCached) { + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url_a(embedded_test_server()->GetURL("a.com", "/title1.html")); + GURL url_b(embedded_test_server()->GetURL("b.com", "/title1.html")); + + // 1) Navigate to A. + EXPECT_TRUE(NavigateToURL(shell(), url_a)); + EXPECT_FALSE(BackForwardCache::EvictIfCached( + current_frame_host()->GetGlobalFrameRoutingId(), kDisabledReasonForTest)); + + // 2) Navigate to B. + EXPECT_TRUE(NavigateToURL(shell(), url_b)); + + // 3) Go back to A. + web_contents()->GetController().GoBack(); + EXPECT_TRUE(WaitForLoadStop(shell()->web_contents())); + ExpectOutcome(BackForwardCacheMetrics::HistoryNavigationOutcome::kRestored, + FROM_HERE); +} + +IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, EvictIfCachedDoesEvict) { + ASSERT_TRUE(embedded_test_server()->Start()); + GURL url_a(embedded_test_server()->GetURL("a.com", "/title1.html")); + GURL url_b(embedded_test_server()->GetURL("b.com", "/title1.html")); + + // 1) Navigate to A. + EXPECT_TRUE(NavigateToURL(shell(), url_a)); + RenderFrameDeletedObserver delete_observer_rfh_a(current_frame_host()); + GlobalFrameRoutingId id_a = current_frame_host()->GetGlobalFrameRoutingId(); + + // 2) Navigate to B. + EXPECT_TRUE(NavigateToURL(shell(), url_b)); + EXPECT_TRUE(BackForwardCache::EvictIfCached(id_a, kDisabledReasonForTest)); + + // 3) Go back to A. + web_contents()->GetController().GoBack(); + EXPECT_TRUE(WaitForLoadStop(shell()->web_contents())); + ExpectDisabledWithReason(kDisabledReasonForTest, FROM_HERE); + ExpectNotRestored({BackForwardCacheMetrics::NotRestoredReason:: + kDisableForRenderFrameHostCalled}, + FROM_HERE); +} + // Test for functionality of memory controls in back-forward cache for low // memory devices. class BackForwardCacheBrowserTestForLowMemoryDevices
diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc index 3bd8012..80c7984 100644 --- a/content/browser/browser_interface_binders.cc +++ b/content/browser/browser_interface_binders.cc
@@ -42,6 +42,7 @@ #include "device/gamepad/public/mojom/gamepad.mojom.h" #include "device/vr/public/mojom/vr_service.mojom.h" #include "media/capture/mojom/image_capture.mojom.h" +#include "media/mojo/mojom/interface_factory.mojom-forward.h" #include "media/mojo/mojom/video_decode_perf_history.mojom.h" #include "media/mojo/services/video_decode_perf_history.h" #include "services/device/public/mojom/constants.mojom.h" @@ -572,6 +573,10 @@ map->Add<media::mojom::ImageCapture>( base::BindRepeating(&ImageCaptureImpl::Create)); + map->Add<media::mojom::InterfaceFactory>(base::BindRepeating( + &RenderFrameHostImpl::BindMediaInterfaceFactoryReceiver, + base::Unretained(host))); + #if BUILDFLAG(ENABLE_MEDIA_REMOTING) map->Add<media::mojom::RemoterFactory>( base::BindRepeating(&RenderFrameHostImpl::BindMediaRemoterFactoryReceiver,
diff --git a/content/browser/frame_host/back_forward_cache_impl.cc b/content/browser/frame_host/back_forward_cache_impl.cc index afab8bc..8131161 100644 --- a/content/browser/frame_host/back_forward_cache_impl.cc +++ b/content/browser/frame_host/back_forward_cache_impl.cc
@@ -440,6 +440,20 @@ rfh->DisableBackForwardCache(reason); } +// static +bool BackForwardCache::EvictIfCached(GlobalFrameRoutingId id, + base::StringPiece reason) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + auto* rfh = RenderFrameHostImpl::FromID(id); + if (rfh && rfh->is_in_back_forward_cache()) { + BackForwardCacheCanStoreDocumentResult can_store; + can_store.NoDueToDisableForRenderFrameHostCalled({reason.as_string()}); + rfh->EvictFromBackForwardCacheWithReasons(can_store); + return true; + } + return false; +} + void BackForwardCacheImpl::DisableForTesting(DisableForTestingReason reason) { is_disabled_for_testing_ = true;
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc index 113f440c..1990a96c 100644 --- a/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -4630,10 +4630,6 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() { auto* command_line = base::CommandLine::ForCurrentProcess(); - registry_->AddInterface<media::mojom::InterfaceFactory>(base::BindRepeating( - &RenderFrameHostImpl::BindMediaInterfaceFactoryRequest, - base::Unretained(this))); - registry_->AddInterface( base::BindRepeating(&RenderFrameHostImpl::CreateAudioInputStreamFactory, base::Unretained(this))); @@ -6438,7 +6434,7 @@ this, audio_system, media_stream_manager, std::move(receiver)); } -void RenderFrameHostImpl::BindMediaInterfaceFactoryRequest( +void RenderFrameHostImpl::BindMediaInterfaceFactoryReceiver( mojo::PendingReceiver<media::mojom::InterfaceFactory> receiver) { DCHECK(!media_interface_proxy_); media_interface_proxy_.reset(new MediaInterfaceProxy(
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h index be08d852..9903e55f 100644 --- a/content/browser/frame_host/render_frame_host_impl.h +++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -57,7 +57,7 @@ #include "content/public/common/javascript_dialog_type.h" #include "content/public/common/previews_state.h" #include "content/public/common/transferrable_url_loader.mojom.h" -#include "media/mojo/mojom/interface_factory.mojom.h" +#include "media/mojo/mojom/interface_factory.mojom-forward.h" #include "media/mojo/services/media_metrics_provider.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/associated_remote.h" @@ -1167,6 +1167,9 @@ void CreateWebSocketConnector( mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver); + void BindMediaInterfaceFactoryReceiver( + mojo::PendingReceiver<media::mojom::InterfaceFactory> receiver); + #if BUILDFLAG(ENABLE_MEDIA_REMOTING) void BindMediaRemoterFactoryReceiver( mojo::PendingReceiver<media::mojom::RemoterFactory> receiver); @@ -1677,9 +1680,6 @@ void CreateAudioOutputStreamFactory( mojo::PendingReceiver<mojom::RendererAudioOutputStreamFactory> receiver); - void BindMediaInterfaceFactoryRequest( - mojo::PendingReceiver<media::mojom::InterfaceFactory> receiver); - // Callback for connection error on the media::mojom::InterfaceFactory client. void OnMediaInterfaceFactoryConnectionError();
diff --git a/content/browser/indexed_db/indexed_db_blob_info.cc b/content/browser/indexed_db/indexed_db_blob_info.cc index 64d6ccb..d96dd372 100644 --- a/content/browser/indexed_db/indexed_db_blob_info.cc +++ b/content/browser/indexed_db/indexed_db_blob_info.cc
@@ -105,15 +105,15 @@ } void IndexedDBBlobInfo::set_mark_used_callback( - const base::Closure& mark_used_callback) { - DCHECK(mark_used_callback_.is_null()); - mark_used_callback_ = mark_used_callback; + base::RepeatingClosure mark_used_callback) { + DCHECK(!mark_used_callback_); + mark_used_callback_ = std::move(mark_used_callback); } void IndexedDBBlobInfo::set_release_callback( - const base::RepeatingClosure& release_callback) { - DCHECK(release_callback_.is_null()); - release_callback_ = release_callback; + base::RepeatingClosure release_callback) { + DCHECK(!release_callback_); + release_callback_ = std::move(release_callback); } } // namespace content
diff --git a/content/browser/indexed_db/indexed_db_blob_info.h b/content/browser/indexed_db/indexed_db_blob_info.h index 126c1d5..64be7db 100644 --- a/content/browser/indexed_db/indexed_db_blob_info.h +++ b/content/browser/indexed_db/indexed_db_blob_info.h
@@ -68,8 +68,8 @@ void set_file_path(const base::FilePath& file_path); void set_last_modified(const base::Time& time); void set_key(int64_t key); - void set_mark_used_callback(const base::RepeatingClosure& mark_used_callback); - void set_release_callback(const base::RepeatingClosure& release_callback); + void set_mark_used_callback(base::RepeatingClosure mark_used_callback); + void set_release_callback(base::RepeatingClosure release_callback); private: bool is_file_;
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc index c255a684..674e2f8 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc
@@ -14,6 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "base/test/bind_test_util.h" +#include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/test_simple_task_runner.h" #include "base/threading/thread.h" @@ -43,6 +44,7 @@ #include "third_party/blink/public/mojom/indexeddb/indexeddb.mojom.h" #include "url/origin.h" +using base::test::RunClosure; using blink::IndexedDBDatabaseMetadata; using blink::IndexedDBIndexKeys; using blink::IndexedDBKey; @@ -65,10 +67,6 @@ *out = std::move(*::testing::get<k>(args)); } -ACTION_P(RunClosure, closure) { - closure.Run(); -} - ACTION_P(QuitLoop, run_loop) { run_loop->Quit(); } @@ -84,8 +82,6 @@ return arg.Equals(key); } -typedef void (base::Closure::*ClosureRunFcn)() const &; - static const char kDatabaseName[] = "db"; static const char kOrigin[] = "https://www.example.com"; static const int kFakeProcessId = 2; @@ -141,11 +137,11 @@ DISALLOW_COPY_AND_ASSIGN(TestDatabaseConnection); }; -void StatusCallback(const base::Closure& callback, +void StatusCallback(base::OnceClosure callback, blink::mojom::IDBStatus* status_out, blink::mojom::IDBStatus status) { *status_out = status; - callback.Run(); + std::move(callback).Run(); } class TestIndexedDBObserver : public IndexedDBContextImpl::Observer { @@ -1051,7 +1047,8 @@ { ::testing::InSequence dummy; base::RunLoop loop; - base::Closure quit_closure = base::BarrierClosure(2, loop.QuitClosure()); + base::RepeatingClosure quit_closure = + base::BarrierClosure(2, loop.QuitClosure()); EXPECT_CALL(*connection1.connection_callbacks, Complete(kTransactionId1)) .Times(1) @@ -1107,7 +1104,8 @@ { ::testing::InSequence dummy; base::RunLoop loop; - base::Closure quit_closure = base::BarrierClosure(2, loop.QuitClosure()); + base::RepeatingClosure quit_closure = + base::BarrierClosure(2, loop.QuitClosure()); EXPECT_CALL(*connection2.connection_callbacks, Complete(kTransactionId2)) .Times(1) @@ -1159,7 +1157,8 @@ { ::testing::InSequence dummy; base::RunLoop loop; - base::Closure quit_closure = base::BarrierClosure(2, loop.QuitClosure()); + base::RepeatingClosure quit_closure = + base::BarrierClosure(2, loop.QuitClosure()); EXPECT_CALL(*connection3.connection_callbacks, Complete(kTransactionId3)) .Times(1)
diff --git a/content/browser/loader/loader_browsertest.cc b/content/browser/loader/loader_browsertest.cc index 363ce80..39e4516 100644 --- a/content/browser/loader/loader_browsertest.cc +++ b/content/browser/loader/loader_browsertest.cc
@@ -755,12 +755,12 @@ base::AutoLock auto_lock(requests_lock_); requests_.push_back(data); if (requests_closure_) - requests_closure_.Run(); + std::move(requests_closure_).Run(); } base::Lock requests_lock_; std::vector<RequestData> requests_; - base::Closure requests_closure_; + base::OnceClosure requests_closure_; std::unique_ptr<URLLoaderInterceptor> interceptor_; };
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc index f71df26..3f50c7b 100644 --- a/content/browser/loader/navigation_url_loader_impl.cc +++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -1137,7 +1137,7 @@ GlobalRequestID global_request_id_; net::RedirectInfo redirect_info_; int redirect_limit_ = net::URLRequest::kMaxRedirects; - base::Callback<WebContents*()> web_contents_getter_; + base::RepeatingCallback<WebContents*()> web_contents_getter_; std::unique_ptr<NavigationUIData> navigation_ui_data_; scoped_refptr<network::SharedURLLoaderFactory> network_loader_factory_;
diff --git a/content/browser/media/media_internals_ui.cc b/content/browser/media/media_internals_ui.cc index f3e1eef..9268d0cf 100644 --- a/content/browser/media/media_internals_ui.cc +++ b/content/browser/media/media_internals_ui.cc
@@ -6,7 +6,7 @@ #include "base/command_line.h" #include "content/browser/media/media_internals_handler.h" -#include "content/grit/content_resources.h" +#include "content/browser/resources/media/grit/media_internals_resources.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h"
diff --git a/content/browser/net/network_errors_listing_ui.cc b/content/browser/net/network_errors_listing_ui.cc index df437d5..9f731d8 100644 --- a/content/browser/net/network_errors_listing_ui.cc +++ b/content/browser/net/network_errors_listing_ui.cc
@@ -61,17 +61,16 @@ return path == kNetworkErrorDataFile; } -void HandleWebUIRequestCallback( - BrowserContext* current_context, - const std::string& path, - const WebUIDataSource::GotDataCallback& callback) { +void HandleWebUIRequestCallback(BrowserContext* current_context, + const std::string& path, + WebUIDataSource::GotDataCallback callback) { DCHECK(ShouldHandleWebUIRequestCallback(path)); base::DictionaryValue data; data.Set(kErrorCodesDataName, GetNetworkErrorData()); std::string json_string; base::JSONWriter::Write(data, &json_string); - callback.Run(base::RefCountedString::TakeString(&json_string)); + std::move(callback).Run(base::RefCountedString::TakeString(&json_string)); } } // namespace
diff --git a/content/browser/network_service_browsertest.cc b/content/browser/network_service_browsertest.cc index dddc660..edded212 100644 --- a/content/browser/network_service_browsertest.cc +++ b/content/browser/network_service_browsertest.cc
@@ -79,14 +79,13 @@ std::string GetSource() override { return "webui"; } - void StartDataRequest( - const GURL& url, - const WebContents::Getter& wc_getter, - const URLDataSource::GotDataCallback& callback) override { + void StartDataRequest(const GURL& url, + const WebContents::Getter& wc_getter, + URLDataSource::GotDataCallback callback) override { std::string dummy_html = "<html><body>Foo</body></html>"; scoped_refptr<base::RefCountedString> response = base::RefCountedString::TakeString(&dummy_html); - callback.Run(response.get()); + std::move(callback).Run(response.get()); } std::string GetMimeType(const std::string& path) override {
diff --git a/content/browser/network_service_client.cc b/content/browser/network_service_client.cc index ca5c603..cf2db23 100644 --- a/content/browser/network_service_client.cc +++ b/content/browser/network_service_client.cc
@@ -78,7 +78,7 @@ #if defined(OS_ANDROID) DCHECK(!net::NetworkChangeNotifier::CreateIfNeeded()); GetNetworkService()->GetNetworkChangeManager( - mojo::MakeRequest(&network_change_manager_)); + network_change_manager_.BindNewPipeAndPassReceiver()); net::NetworkChangeNotifier::AddConnectionTypeObserver(this); net::NetworkChangeNotifier::AddMaxBandwidthObserver(this); net::NetworkChangeNotifier::AddIPAddressObserver(this);
diff --git a/content/browser/network_service_client.h b/content/browser/network_service_client.h index c7b6639..a7afe28 100644 --- a/content/browser/network_service_client.h +++ b/content/browser/network_service_client.h
@@ -16,6 +16,7 @@ #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" +#include "mojo/public/cpp/bindings/remote.h" #include "net/cert/cert_database.h" #include "services/network/public/mojom/network_service.mojom.h" #include "url/gurl.h" @@ -101,7 +102,7 @@ #if defined(OS_ANDROID) std::unique_ptr<base::android::ApplicationStatusListener> app_status_listener_; - network::mojom::NetworkChangeManagerPtr network_change_manager_; + mojo::Remote<network::mojom::NetworkChangeManager> network_change_manager_; #endif DISALLOW_COPY_AND_ASSIGN(NetworkServiceClient);
diff --git a/content/browser/notifications/notification_storage_unittest.cc b/content/browser/notifications/notification_storage_unittest.cc index 6f3c14e..2bdf7bd 100644 --- a/content/browser/notifications/notification_storage_unittest.cc +++ b/content/browser/notifications/notification_storage_unittest.cc
@@ -118,7 +118,7 @@ void WriteNotificationDataSynchronous(const NotificationDatabaseData& data) { base::RunLoop run_loop; storage_->WriteNotificationData( - data, base::Bind( + data, base::BindOnce( &NotificationStorageTest::DidWriteNotificationDataSynchronous, base::Unretained(this), run_loop.QuitClosure())); run_loop.Run(); @@ -140,9 +140,10 @@ base::RunLoop run_loop; storage_->ReadNotificationDataAndRecordInteraction( service_worker_registration_id, notification_id, interaction, - base::Bind(&NotificationStorageTest:: - DidReadNotificationDataAndRecordInteractionSynchronous, - base::Unretained(this), run_loop.QuitClosure())); + base::BindOnce( + &NotificationStorageTest:: + DidReadNotificationDataAndRecordInteractionSynchronous, + base::Unretained(this), run_loop.QuitClosure())); run_loop.Run(); return out_data_; }
diff --git a/content/browser/payments/payment_app_browsertest.cc b/content/browser/payments/payment_app_browsertest.cc index 1b9c703f..d0c7e45 100644 --- a/content/browser/payments/payment_app_browsertest.cc +++ b/content/browser/payments/payment_app_browsertest.cc
@@ -34,25 +34,25 @@ using ::payments::mojom::PaymentRequestEventData; using ::payments::mojom::PaymentRequestEventDataPtr; -void GetAllPaymentAppsCallback(const base::Closure& done_callback, +void GetAllPaymentAppsCallback(base::OnceClosure done_callback, PaymentAppProvider::PaymentApps* out_apps, PaymentAppProvider::PaymentApps apps) { *out_apps = std::move(apps); - done_callback.Run(); + std::move(done_callback).Run(); } -void PaymentEventResultCallback(const base::Closure& done_callback, +void PaymentEventResultCallback(base::OnceClosure done_callback, bool* out_payment_event_result, bool payment_event_result) { *out_payment_event_result = payment_event_result; - done_callback.Run(); + std::move(done_callback).Run(); } -void InvokePaymentAppCallback(const base::Closure& done_callback, +void InvokePaymentAppCallback(base::OnceClosure done_callback, PaymentHandlerResponsePtr* out_response, PaymentHandlerResponsePtr response) { *out_response = std::move(response); - done_callback.Run(); + std::move(done_callback).Run(); } } // namespace
diff --git a/content/browser/payments/payment_app_installer.cc b/content/browser/payments/payment_app_installer.cc index 7d5827e..0e4d4941 100644 --- a/content/browser/payments/payment_app_installer.cc +++ b/content/browser/payments/payment_app_installer.cc
@@ -64,9 +64,11 @@ ->GetServiceWorkerContext()); service_worker_watcher_ = new ServiceWorkerContextWatcher( service_worker_context, - base::Bind(&SelfDeleteInstaller::onServiceWorkerRegistration, this), - base::Bind(&SelfDeleteInstaller::onServiceWorkerVersionUpdate, this), - base::Bind(&SelfDeleteInstaller::onServiceWorkerError, this)); + base::BindRepeating(&SelfDeleteInstaller::OnServiceWorkerRegistration, + this), + base::BindRepeating(&SelfDeleteInstaller::OnServiceWorkerVersionUpdate, + this), + base::BindRepeating(&SelfDeleteInstaller::OnServiceWorkerError, this)); service_worker_watcher_->Start(); blink::mojom::ServiceWorkerRegistrationOptions option; @@ -81,7 +83,7 @@ this)); } - void onServiceWorkerRegistration( + void OnServiceWorkerRegistration( const std::vector<ServiceWorkerRegistrationInfo>& info) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -91,7 +93,7 @@ } } - void onServiceWorkerVersionUpdate( + void OnServiceWorkerVersionUpdate( const std::vector<ServiceWorkerVersionInfo>& info) { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -104,7 +106,7 @@ } } - void onServiceWorkerError( + void OnServiceWorkerError( int64_t registration_id, int64_t version_id, const ServiceWorkerContextCoreObserver::ErrorInfo& error_info) {
diff --git a/content/browser/permissions/permission_controller_impl_unittest.cc b/content/browser/permissions/permission_controller_impl_unittest.cc index 2685e749..571e4d8 100644 --- a/content/browser/permissions/permission_controller_impl_unittest.cc +++ b/content/browser/permissions/permission_controller_impl_unittest.cc
@@ -300,7 +300,7 @@ TEST_F(PermissionControllerImplTest, NotifyChangedSubscriptionsCallsOnChangeOnly) { using PermissionStatusCallback = - base::Callback<void(blink::mojom::PermissionStatus)>; + base::RepeatingCallback<void(blink::mojom::PermissionStatus)>; GURL kUrl = GURL(kTestUrl); url::Origin kTestOrigin = url::Origin::Create(kUrl);
diff --git a/content/browser/portal/portal_browsertest.cc b/content/browser/portal/portal_browsertest.cc index 1d5c43e..35adc693a0 100644 --- a/content/browser/portal/portal_browsertest.cc +++ b/content/browser/portal/portal_browsertest.cc
@@ -5,6 +5,7 @@ #include <memory> #include "base/bind.h" +#include "base/bind_helpers.h" #include "base/callback.h" #include "base/test/bind_test_util.h" #include "base/test/scoped_feature_list.h" @@ -572,8 +573,8 @@ PortalActivatedObserver activated_observer(portal); std::unique_ptr<SyntheticTapGesture> gesture = std::make_unique<SyntheticTapGesture>(params); - render_widget_host->QueueSyntheticGesture( - std::move(gesture), base::BindOnce([](SyntheticGesture::Result) {})); + render_widget_host->QueueSyntheticGesture(std::move(gesture), + base::DoNothing()); activated_observer.WaitForActivate(); EXPECT_EQ(portal_contents, shell()->web_contents()); @@ -627,8 +628,8 @@ { PortalActivatedObserver activated_observer(portal); PortalCreatedObserver adoption_observer(portal_frame); - render_widget_host->QueueSyntheticGesture( - std::move(gesture), base::BindOnce([](SyntheticGesture::Result) {})); + render_widget_host->QueueSyntheticGesture(std::move(gesture), + base::DoNothing()); activated_observer.WaitForActivate(); EXPECT_EQ(portal_contents, shell()->web_contents()); // Wait for predecessor to be adopted. @@ -688,8 +689,8 @@ [&](Portal* portal) { predecessor_activated.emplace(portal); })); PortalActivatedObserver activated_observer(portal); - render_widget_host->QueueSyntheticGesture( - std::move(gesture), base::BindOnce([](SyntheticGesture::Result) {})); + render_widget_host->QueueSyntheticGesture(std::move(gesture), + base::DoNothing()); activated_observer.WaitForActivate(); EXPECT_EQ(portal_contents, shell()->web_contents()); @@ -766,8 +767,8 @@ render_widget_host, blink::WebInputEvent::Type::kTouchStart); std::unique_ptr<SyntheticTapGesture> gesture = std::make_unique<SyntheticTapGesture>(params); - render_widget_host->QueueSyntheticGesture( - std::move(gesture), base::BindOnce([](SyntheticGesture::Result) {})); + render_widget_host->QueueSyntheticGesture(std::move(gesture), + base::DoNothing()); // Waits for touch to be acked. If touch state wasn't cleared before initial // activation, a DCHECK will be hit before the ack is sent. input_event_ack_waiter.Wait(); @@ -833,8 +834,8 @@ InputEventAckWaiter input_event_ack_waiter( render_widget_host, blink::WebInputEvent::Type::kGestureTap); auto gesture = std::make_unique<SyntheticTapGesture>(params); - render_widget_host->QueueSyntheticGesture( - std::move(gesture), base::BindOnce([](SyntheticGesture::Result) {})); + render_widget_host->QueueSyntheticGesture(std::move(gesture), + base::DoNothing()); // Wait for the tap gesture ack. If the initial gesture wasn't cleaned up, the // new gesture created will cause an error in the gesture validator. input_event_ack_waiter.Wait();
diff --git a/content/browser/presentation/presentation_service_impl.cc b/content/browser/presentation/presentation_service_impl.cc index bb1200c3..f8ffc4c 100644 --- a/content/browser/presentation/presentation_service_impl.cc +++ b/content/browser/presentation/presentation_service_impl.cc
@@ -165,8 +165,9 @@ presentation_receiver_remote_.set_disconnect_handler(base::BindOnce( &PresentationServiceImpl::OnConnectionError, base::Unretained(this))); receiver_delegate_->RegisterReceiverConnectionAvailableCallback( - base::Bind(&PresentationServiceImpl::OnReceiverConnectionAvailable, - weak_factory_.GetWeakPtr())); + base::BindRepeating( + &PresentationServiceImpl::OnReceiverConnectionAvailable, + weak_factory_.GetWeakPtr())); } void PresentationServiceImpl::ListenForScreenAvailability(const GURL& url) { @@ -292,8 +293,8 @@ if (controller_delegate_) { controller_delegate_->ListenForConnectionStateChange( render_process_id_, render_frame_id_, connection, - base::Bind(&PresentationServiceImpl::OnConnectionStateChanged, - weak_factory_.GetWeakPtr(), connection)); + base::BindRepeating(&PresentationServiceImpl::OnConnectionStateChanged, + weak_factory_.GetWeakPtr(), connection)); } } @@ -373,9 +374,9 @@ presentation_urls, render_frame_host_->GetLastCommittedOrigin()); controller_delegate_->SetDefaultPresentationUrls( - request, - base::Bind(&PresentationServiceImpl::OnDefaultPresentationStarted, - weak_factory_.GetWeakPtr())); + request, base::BindRepeating( + &PresentationServiceImpl::OnDefaultPresentationStarted, + weak_factory_.GetWeakPtr())); } void PresentationServiceImpl::CloseConnection(
diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc index 6e63b19c..2be315a 100644 --- a/content/browser/push_messaging/push_messaging_manager.cc +++ b/content/browser/push_messaging/push_messaging_manager.cc
@@ -462,10 +462,10 @@ ->RequestPermission( PermissionType::NOTIFICATIONS, render_frame_host, data.requesting_origin, data.user_gesture, - base::Bind(&PushMessagingManager::Core:: - DidRequestPermissionInIncognito, - weak_factory_ui_to_ui_.GetWeakPtr(), - base::Passed(&data))); + base::BindOnce(&PushMessagingManager::Core:: + DidRequestPermissionInIncognito, + weak_factory_ui_to_ui_.GetWeakPtr(), + base::Passed(&data))); } } } @@ -480,13 +480,13 @@ push_service->SubscribeFromDocument( requesting_origin, registration_id, render_process_id_, render_frame_id_, std::move(options), data.user_gesture, - base::Bind(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(), - base::Passed(&data))); + base::BindOnce(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(), + base::Passed(&data))); } else { push_service->SubscribeFromWorker( requesting_origin, registration_id, std::move(options), - base::Bind(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(), - base::Passed(&data))); + base::BindOnce(&Core::DidRegister, weak_factory_ui_to_ui_.GetWeakPtr(), + base::Passed(&data))); } } @@ -681,9 +681,9 @@ push_service->Unsubscribe( blink::mojom::PushUnregistrationReason::JAVASCRIPT_API, requesting_origin, service_worker_registration_id, sender_id, - base::Bind(&Core::DidUnregisterFromService, - weak_factory_ui_to_ui_.GetWeakPtr(), base::Passed(&callback), - service_worker_registration_id)); + base::BindOnce(&Core::DidUnregisterFromService, + weak_factory_ui_to_ui_.GetWeakPtr(), + base::Passed(&callback), service_worker_registration_id)); } void PushMessagingManager::Core::DidUnregisterFromService( @@ -787,14 +787,14 @@ RunOrPostTaskOnThread( FROM_HERE, BrowserThread::UI, - base::BindOnce(&Core::GetSubscriptionInfoOnUI, - base::Unretained(ui_core_.get()), origin, - service_worker_registration_id, application_server_key, - push_subscription_id, - base::Bind(&Core::GetSubscriptionDidGetInfoOnUI, - ui_core_weak_ptr_, base::Passed(&callback), - origin, service_worker_registration_id, - application_server_key))); + base::BindOnce( + &Core::GetSubscriptionInfoOnUI, base::Unretained(ui_core_.get()), + origin, service_worker_registration_id, application_server_key, + push_subscription_id, + base::BindOnce(&Core::GetSubscriptionDidGetInfoOnUI, + ui_core_weak_ptr_, base::Passed(&callback), origin, + service_worker_registration_id, + application_server_key))); return; } @@ -888,13 +888,13 @@ blink::mojom::PushGetRegistrationStatus status = blink::mojom::PushGetRegistrationStatus::STORAGE_CORRUPT; - push_service->Unsubscribe(blink::mojom::PushUnregistrationReason:: - GET_SUBSCRIPTION_STORAGE_CORRUPT, - origin, service_worker_registration_id, - application_server_key, - base::Bind(&Core::GetSubscriptionDidUnsubscribe, - weak_factory_ui_to_ui_.GetWeakPtr(), - base::Passed(&callback), status)); + push_service->Unsubscribe( + blink::mojom::PushUnregistrationReason:: + GET_SUBSCRIPTION_STORAGE_CORRUPT, + origin, service_worker_registration_id, application_server_key, + base::BindOnce(&Core::GetSubscriptionDidUnsubscribe, + weak_factory_ui_to_ui_.GetWeakPtr(), + base::Passed(&callback), status)); RecordGetRegistrationStatus(status); }
diff --git a/content/browser/push_messaging/push_messaging_router.cc b/content/browser/push_messaging/push_messaging_router.cc index d77cf06..bb29237 100644 --- a/content/browser/push_messaging/push_messaging_router.cc +++ b/content/browser/push_messaging/push_messaging_router.cc
@@ -25,13 +25,14 @@ namespace { void RunDeliverCallback( - const PushMessagingRouter::DeliverMessageCallback& deliver_message_callback, + PushMessagingRouter::DeliverMessageCallback deliver_message_callback, blink::mojom::PushDeliveryStatus delivery_status) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); // Use PostTask() instead of RunOrPostTaskOnThread() to ensure the callback // is called asynchronously. - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(deliver_message_callback, delivery_status)); + base::PostTask( + FROM_HERE, {BrowserThread::UI}, + base::BindOnce(std::move(deliver_message_callback), delivery_status)); } } // namespace @@ -43,7 +44,7 @@ int64_t service_worker_registration_id, const std::string& message_id, base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback) { + DeliverMessageCallback deliver_message_callback) { DCHECK_CURRENTLY_ON(BrowserThread::UI); StoragePartition* partition = BrowserContext::GetStoragePartitionForSite(browser_context, origin); @@ -60,7 +61,7 @@ std::move(service_worker_context), std::move(devtools_context), origin, service_worker_registration_id, message_id, - std::move(payload), deliver_message_callback)); + std::move(payload), std::move(deliver_message_callback))); } // static @@ -71,7 +72,7 @@ int64_t service_worker_registration_id, const std::string& message_id, base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback) { + DeliverMessageCallback deliver_message_callback) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); // Try to acquire the registration from storage. If it's already live we'll // receive it right away. If not, it will be revived from storage. @@ -80,7 +81,7 @@ base::BindOnce( &PushMessagingRouter::FindServiceWorkerRegistrationCallback, std::move(devtools_context), message_id, std::move(payload), - deliver_message_callback)); + std::move(deliver_message_callback))); } // static @@ -88,19 +89,19 @@ scoped_refptr<DevToolsBackgroundServicesContextImpl> devtools_context, const std::string& message_id, base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback, + DeliverMessageCallback deliver_message_callback, blink::ServiceWorkerStatusCode service_worker_status, scoped_refptr<ServiceWorkerRegistration> service_worker_registration) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); UMA_HISTOGRAM_ENUMERATION("PushMessaging.DeliveryStatus.FindServiceWorker", service_worker_status); if (service_worker_status == blink::ServiceWorkerStatusCode::kErrorNotFound) { - RunDeliverCallback(deliver_message_callback, + RunDeliverCallback(std::move(deliver_message_callback), blink::mojom::PushDeliveryStatus::NO_SERVICE_WORKER); return; } if (service_worker_status != blink::ServiceWorkerStatusCode::kOk) { - RunDeliverCallback(deliver_message_callback, + RunDeliverCallback(std::move(deliver_message_callback), blink::mojom::PushDeliveryStatus::SERVICE_WORKER_ERROR); return; } @@ -118,7 +119,7 @@ base::WrapRefCounted(version), std::move(service_worker_registration), std::move(devtools_context), message_id, - std::move(payload), deliver_message_callback)); + std::move(payload), std::move(deliver_message_callback))); } // static @@ -128,14 +129,14 @@ scoped_refptr<DevToolsBackgroundServicesContextImpl> devtools_context, const std::string& message_id, base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback, + DeliverMessageCallback deliver_message_callback, blink::ServiceWorkerStatusCode start_worker_status) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); if (start_worker_status != blink::ServiceWorkerStatusCode::kOk) { DeliverMessageEnd(std::move(service_worker), std::move(service_worker_registration), std::move(devtools_context), message_id, - deliver_message_callback, start_worker_status); + std::move(deliver_message_callback), start_worker_status); return; } @@ -143,7 +144,7 @@ ServiceWorkerMetrics::EventType::PUSH, base::BindOnce(&PushMessagingRouter::DeliverMessageEnd, service_worker, std::move(service_worker_registration), devtools_context, - message_id, deliver_message_callback), + message_id, std::move(deliver_message_callback)), base::TimeDelta::FromSeconds(blink::mojom::kPushEventTimeoutSeconds), ServiceWorkerVersion::KILL_ON_TIMEOUT); @@ -168,7 +169,7 @@ scoped_refptr<ServiceWorkerRegistration> service_worker_registration, scoped_refptr<DevToolsBackgroundServicesContextImpl> devtools_context, const std::string& message_id, - const DeliverMessageCallback& deliver_message_callback, + DeliverMessageCallback deliver_message_callback, blink::ServiceWorkerStatusCode service_worker_status) { DCHECK_CURRENTLY_ON(ServiceWorkerContext::GetCoreThreadId()); UMA_HISTOGRAM_ENUMERATION("PushMessaging.DeliveryStatus.ServiceWorkerEvent", @@ -215,7 +216,7 @@ delivery_status = blink::mojom::PushDeliveryStatus::SERVICE_WORKER_ERROR; break; } - RunDeliverCallback(deliver_message_callback, delivery_status); + RunDeliverCallback(std::move(deliver_message_callback), delivery_status); if (devtools_context->IsRecording( DevToolsBackgroundService::kPushMessaging) &&
diff --git a/content/browser/push_messaging/push_messaging_router.h b/content/browser/push_messaging/push_messaging_router.h index 13b1f10..9b34fda 100644 --- a/content/browser/push_messaging/push_messaging_router.h +++ b/content/browser/push_messaging/push_messaging_router.h
@@ -31,18 +31,17 @@ class PushMessagingRouter { public: using DeliverMessageCallback = - base::Callback<void(blink::mojom::PushDeliveryStatus)>; + base::OnceCallback<void(blink::mojom::PushDeliveryStatus)>; // Delivers a push message with |data| to the Service Worker identified by // |origin| and |service_worker_registration_id|. Must be called on the UI // thread. - static void DeliverMessage( - BrowserContext* browser_context, - const GURL& origin, - int64_t service_worker_registration_id, - const std::string& message_id, - base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback); + static void DeliverMessage(BrowserContext* browser_context, + const GURL& origin, + int64_t service_worker_registration_id, + const std::string& message_id, + base::Optional<std::string> payload, + DeliverMessageCallback deliver_message_callback); private: // Attempts to find a Service Worker registration so that a push event can be @@ -54,7 +53,7 @@ int64_t service_worker_registration_id, const std::string& message_id, base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback); + DeliverMessageCallback deliver_message_callback); // If a registration was successfully retrieved, dispatches a push event with // |data| on the Service Worker identified by |service_worker_registration|. @@ -63,7 +62,7 @@ scoped_refptr<DevToolsBackgroundServicesContextImpl> devtools_context, const std::string& message_id, base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback, + DeliverMessageCallback deliver_message_callback, blink::ServiceWorkerStatusCode service_worker_status, scoped_refptr<ServiceWorkerRegistration> service_worker_registration); @@ -75,7 +74,7 @@ scoped_refptr<DevToolsBackgroundServicesContextImpl> devtools_context, const std::string& message_id, base::Optional<std::string> payload, - const DeliverMessageCallback& deliver_message_callback, + DeliverMessageCallback deliver_message_callback, blink::ServiceWorkerStatusCode start_worker_status); // Gets called asynchronously after the Service Worker has dispatched the push @@ -85,7 +84,7 @@ scoped_refptr<ServiceWorkerRegistration> service_worker_registration, scoped_refptr<DevToolsBackgroundServicesContextImpl> devtools_context, const std::string& message_id, - const DeliverMessageCallback& deliver_message_callback, + DeliverMessageCallback deliver_message_callback, blink::ServiceWorkerStatusCode service_worker_status); DISALLOW_IMPLICIT_CONSTRUCTORS(PushMessagingRouter);
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc index 2cfbad9..f32a494 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager.cc
@@ -11,8 +11,10 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/metrics/histogram_macros.h" +#include "base/strings/stringprintf.h" #include "base/task/post_task.h" #include "build/build_config.h" +#include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "media/audio/audio_input_ipc.h" @@ -21,6 +23,7 @@ #include "media/base/channel_layout.h" #include "media/base/media_switches.h" #include "third_party/blink/public/common/mediastream/media_stream_request.h" +#include "third_party/blink/public/mojom/mediastream/media_stream.mojom-shared.h" #if defined(OS_CHROMEOS) #include "chromeos/audio/cras_audio_handler.h" @@ -37,6 +40,50 @@ } #endif +void SendAudioLogMessage(const std::string& message) { + MediaStreamManager::SendMessageToNativeLog("AIDM::" + message); +} + +const char* TypeToString(blink::mojom::MediaStreamType type) { + DCHECK(blink::IsAudioInputMediaType(type)); + switch (type) { + case blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE: + return "DEVICE_AUDIO_CAPTURE"; + case blink::mojom::MediaStreamType::GUM_TAB_AUDIO_CAPTURE: + return "GUM_TAB_AUDIO_CAPTURE"; + case blink::mojom::MediaStreamType::GUM_DESKTOP_AUDIO_CAPTURE: + return "GUM_DESKTOP_AUDIO_CAPTURE"; + case blink::mojom::MediaStreamType::DISPLAY_AUDIO_CAPTURE: + return "DISPLAY_AUDIO_CAPTURE"; + default: + NOTREACHED(); + } + return "INVALID"; +} + +std::string GetOpenLogString(const base::UnguessableToken& session_id, + const blink::MediaStreamDevice& device) { + std::string str = base::StringPrintf("Open({session_id=%s}, ", + session_id.ToString().c_str()); + base::StringAppendF(&str, "{device=[type: %s, ", TypeToString(device.type)); + base::StringAppendF(&str, "id: %s, ", device.id.c_str()); + if (device.group_id.has_value()) { + base::StringAppendF(&str, "group_id: %s, ", + device.group_id.value().c_str()); + } + if (device.matched_output_device_id.has_value()) { + base::StringAppendF(&str, "matched_output_device_id: %s, ", + device.matched_output_device_id.value().c_str()); + } + base::StringAppendF(&str, "name: %s", device.name.c_str()); + if (blink::IsAudioInputMediaType(device.type)) { + base::StringAppendF(&str, ", parameters: [%s", + device.input.AsHumanReadableString().c_str()); + } + str += "]]})"; + return str; +} + } // namespace AudioInputDeviceManager::AudioInputDeviceManager( @@ -80,6 +127,7 @@ DCHECK_CURRENTLY_ON(BrowserThread::IO); // Generate a new id for this device. auto session_id = base::UnguessableToken::Create(); + SendAudioLogMessage(GetOpenLogString(session_id, device)); // base::Unretained(this) is safe, because AudioInputDeviceManager is // destroyed not earlier than on the IO message loop destruction. @@ -113,6 +161,7 @@ void AudioInputDeviceManager::Close(const base::UnguessableToken& session_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); + SendAudioLogMessage("Close({session_id=" + session_id.ToString() + "})"); auto device = GetDevice(session_id); if (device == devices_.end()) return; @@ -193,6 +242,7 @@ UMA_HISTOGRAM_TIMES("Media.AudioInputDeviceManager.OpenOnDeviceThreadTime", base::TimeTicks::Now() - start_time); + SendAudioLogMessage("Opened({session_id=" + session_id.ToString() + "})"); blink::MediaStreamDevice media_stream_device(device.type, device.id, device.name); @@ -213,6 +263,7 @@ blink::mojom::MediaStreamType stream_type, const base::UnguessableToken& session_id) { DCHECK_CURRENTLY_ON(BrowserThread::IO); + SendAudioLogMessage("Closed({session_id=" + session_id.ToString() + "})"); for (auto& listener : listeners_) listener.Closed(stream_type, session_id); }
diff --git a/content/browser/renderer_host/media/media_devices_manager.cc b/content/browser/renderer_host/media/media_devices_manager.cc index 03d2830..1847e34 100644 --- a/content/browser/renderer_host/media/media_devices_manager.cc +++ b/content/browser/renderer_host/media/media_devices_manager.cc
@@ -63,13 +63,27 @@ // Frame rates for sources with no support for capability enumeration. const uint16_t kFallbackVideoFrameRates[] = {30, 60}; +const char* DeviceTypeToString(blink::MediaDeviceType device_type) { + switch (device_type) { + case blink::MEDIA_DEVICE_TYPE_AUDIO_INPUT: + return "AUDIO_INPUT"; + case blink::MEDIA_DEVICE_TYPE_VIDEO_INPUT: + return "VIDEO_INPUT"; + case blink::MEDIA_DEVICE_TYPE_AUDIO_OUTPUT: + return "AUDIO_OUTPUT"; + default: + NOTREACHED(); + } + return "UNKNOWN"; +} + // Private helper method to generate a string for the log message that lists the // human readable names of |devices|. std::string GetLogMessageString( blink::MediaDeviceType device_type, const blink::WebMediaDeviceInfoArray& device_infos) { - std::string output_string = - base::StringPrintf("Getting devices of type %d:\n", device_type); + std::string output_string = base::StringPrintf( + "Getting devices of type %s:\n", DeviceTypeToString(device_type)); if (device_infos.empty()) return output_string + "No devices found."; for (const auto& device_info : device_infos)
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index 0ad75a52..e9e372a 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -486,6 +486,7 @@ // static void MediaStreamManager::SendMessageToNativeLog(const std::string& message) { + DVLOG(1) << message; if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { base::PostTask( FROM_HERE, {BrowserThread::IO},
diff --git a/content/browser/resources/media/BUILD.gn b/content/browser/resources/media/BUILD.gn new file mode 100644 index 0000000..208bd609 --- /dev/null +++ b/content/browser/resources/media/BUILD.gn
@@ -0,0 +1,18 @@ +# Copyright 2019 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. + +import("//tools/grit/grit_rule.gni") + +grit("media_internals_resources") { + source = "media_internals_resources.grd" + + outputs = [ + "grit/media_internals_resources.h", + "grit/media_internals_resources_map.cc", + "grit/media_internals_resources_map.h", + "media_internals_resources.pak", + ] + output_dir = "$root_gen_dir/content/browser/resources/media" + depfile_dir = target_gen_dir +}
diff --git a/content/browser/resources/media/media_internals_resources.grd b/content/browser/resources/media/media_internals_resources.grd new file mode 100644 index 0000000..cd3f569 --- /dev/null +++ b/content/browser/resources/media/media_internals_resources.grd
@@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grit latest_public_release="0" + current_release="1" + output_all_resource_defines="false"> + <outputs> + <output filename="grit/media_internals_resources_map.cc" + type="resource_file_map_source" /> + <output filename="grit/media_internals_resources_map.h" + type="resource_map_header" /> + <output filename="grit/media_internals_resources.h" type="rc_header"> + <emit emit_type="prepend"></emit> + </output> + <output filename="media_internals_resources.pak" type="data_package" /> + </outputs> + <release seq="1"> + <includes> + <include name="IDR_MEDIA_INTERNALS_HTML" + file="media_internals.html" + flattenhtml="true" + allowexternalscript="true" + compress="gzip" + type="BINDATA" /> + <include name="IDR_MEDIA_INTERNALS_JS" + file="media_internals.js" + flattenhtml="true" + compress="gzip" + type="BINDATA" /> + <include name="IDR_MEDIA_INTERNALS_JS_DISABLED" + file="media_internals_disabled.js" + flattenhtml="true" + compress="gzip" + type="BINDATA" /> + </includes> + </release> +</grit>
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index 3980614..5214880 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc
@@ -43,7 +43,7 @@ namespace content { namespace { -void OnGotCategories(const WebUIDataSource::GotDataCallback& callback, +void OnGotCategories(WebUIDataSource::GotDataCallback callback, const std::set<std::string>& categorySet) { base::ListValue category_list; for (auto it = categorySet.begin(); it != categorySet.end(); it++) { @@ -52,34 +52,35 @@ scoped_refptr<base::RefCountedString> res(new base::RefCountedString()); base::JSONWriter::Write(category_list, &res->data()); - callback.Run(res); + std::move(callback).Run(res); } -void OnRecordingEnabledAck(const WebUIDataSource::GotDataCallback& callback); +void OnRecordingEnabledAck(WebUIDataSource::GotDataCallback callback); bool BeginRecording(const std::string& data64, - const WebUIDataSource::GotDataCallback& callback) { + WebUIDataSource::GotDataCallback callback) { base::trace_event::TraceConfig trace_config("", ""); if (!TracingUI::GetTracingOptions(data64, &trace_config)) return false; return TracingController::GetInstance()->StartTracing( - trace_config, base::BindOnce(&OnRecordingEnabledAck, callback)); + trace_config, + base::BindOnce(&OnRecordingEnabledAck, std::move(callback))); } -void OnRecordingEnabledAck(const WebUIDataSource::GotDataCallback& callback) { - callback.Run( +void OnRecordingEnabledAck(WebUIDataSource::GotDataCallback callback) { + std::move(callback).Run( scoped_refptr<base::RefCountedMemory>(new base::RefCountedString())); } -void OnTraceBufferUsageResult(const WebUIDataSource::GotDataCallback& callback, +void OnTraceBufferUsageResult(WebUIDataSource::GotDataCallback callback, float percent_full, size_t approximate_event_count) { std::string str = base::NumberToString(percent_full); - callback.Run(base::RefCountedString::TakeString(&str)); + std::move(callback).Run(base::RefCountedString::TakeString(&str)); } -void OnTraceBufferStatusResult(const WebUIDataSource::GotDataCallback& callback, +void OnTraceBufferStatusResult(WebUIDataSource::GotDataCallback callback, float percent_full, size_t approximate_event_count) { base::DictionaryValue status; @@ -91,45 +92,44 @@ base::RefCountedString* status_base64 = new base::RefCountedString(); base::Base64Encode(status_json, &status_base64->data()); - callback.Run(status_base64); + std::move(callback).Run(status_base64); } -void TracingCallbackWrapperBase64( - const WebUIDataSource::GotDataCallback& callback, - std::unique_ptr<std::string> data) { +void TracingCallbackWrapperBase64(WebUIDataSource::GotDataCallback callback, + std::unique_ptr<std::string> data) { base::RefCountedString* data_base64 = new base::RefCountedString(); base::Base64Encode(*data, &data_base64->data()); - callback.Run(data_base64); + std::move(callback).Run(data_base64); } bool OnBeginJSONRequest(const std::string& path, - const WebUIDataSource::GotDataCallback& callback) { + WebUIDataSource::GotDataCallback* callback) { if (path == "json/categories") { return TracingController::GetInstance()->GetCategories( - base::BindOnce(OnGotCategories, callback)); + base::BindOnce(OnGotCategories, std::move(*callback))); } const char kBeginRecordingPath[] = "json/begin_recording?"; if (base::StartsWith(path, kBeginRecordingPath, base::CompareCase::SENSITIVE)) { std::string data = path.substr(strlen(kBeginRecordingPath)); - return BeginRecording(data, callback); + return BeginRecording(data, std::move(*callback)); } if (path == "json/get_buffer_percent_full") { return TracingController::GetInstance()->GetTraceBufferUsage( - base::BindOnce(OnTraceBufferUsageResult, callback)); + base::BindOnce(OnTraceBufferUsageResult, std::move(*callback))); } if (path == "json/get_buffer_status") { return TracingController::GetInstance()->GetTraceBufferUsage( - base::BindOnce(OnTraceBufferStatusResult, callback)); + base::BindOnce(OnTraceBufferStatusResult, std::move(*callback))); } if (path == "json/end_recording_compressed") { if (!TracingController::GetInstance()->IsTracing()) return false; scoped_refptr<TracingController::TraceDataEndpoint> data_endpoint = TracingControllerImpl::CreateCompressedStringEndpoint( - TracingControllerImpl::CreateCallbackEndpoint( - base::Bind(TracingCallbackWrapperBase64, callback)), + TracingControllerImpl::CreateCallbackEndpoint(base::BindOnce( + TracingCallbackWrapperBase64, std::move(*callback))), false /* compress_with_background_priority */); return TracingController::GetInstance()->StopTracing(data_endpoint); } @@ -143,11 +143,13 @@ } void OnTracingRequest(const std::string& path, - const WebUIDataSource::GotDataCallback& callback) { + WebUIDataSource::GotDataCallback callback) { DCHECK(OnShouldHandleRequest(path)); - if (!OnBeginJSONRequest(path, callback)) { + if (!OnBeginJSONRequest(path, &callback)) { + // OnBeginJSONRequest only consumes |callback| if it returns true. + DCHECK(callback); std::string error("##ERROR##"); - callback.Run(base::RefCountedString::TakeString(&error)); + std::move(callback).Run(base::RefCountedString::TakeString(&error)); } }
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc index c767ebf..e2754d8b 100644 --- a/content/browser/web_contents/web_contents_android.cc +++ b/content/browser/web_contents/web_contents_android.cc
@@ -657,10 +657,10 @@ const uint32_t preferred_size = 0; return web_contents_->DownloadImage( url, is_fav_icon, preferred_size, max_bitmap_size, bypass_cache, - base::Bind(&WebContentsAndroid::OnFinishDownloadImage, - weak_factory_.GetWeakPtr(), - ScopedJavaGlobalRef<jobject>(env, obj), - ScopedJavaGlobalRef<jobject>(env, jcallback))); + base::BindOnce(&WebContentsAndroid::OnFinishDownloadImage, + weak_factory_.GetWeakPtr(), + ScopedJavaGlobalRef<jobject>(env, obj), + ScopedJavaGlobalRef<jobject>(env, jcallback))); } void WebContentsAndroid::SetHasPersistentVideo(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 6c06d0e..ff200c5 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -607,9 +607,8 @@ showing_context_menu_(false), text_autosizer_page_info_({0, 0, 1.f}), had_inner_webcontents_(false) { - frame_tree_.SetFrameRemoveListener( - base::Bind(&WebContentsImpl::OnFrameRemoved, - base::Unretained(this))); + frame_tree_.SetFrameRemoveListener(base::BindRepeating( + &WebContentsImpl::OnFrameRemoved, base::Unretained(this))); #if BUILDFLAG(ENABLE_PLUGINS) pepper_playback_observer_.reset(new PepperPlaybackObserver(this)); #endif @@ -1218,14 +1217,14 @@ } #endif // !defined(OS_ANDROID) -base::Closure WebContentsImpl::AddBindingSet( +base::OnceClosure WebContentsImpl::AddBindingSet( const std::string& interface_name, WebContentsBindingSet* binding_set) { auto result = binding_sets_.insert(std::make_pair(interface_name, binding_set)); DCHECK(result.second); - return base::Bind(&WebContentsImpl::RemoveBindingSet, - weak_factory_.GetWeakPtr(), interface_name); + return base::BindOnce(&WebContentsImpl::RemoveBindingSet, + weak_factory_.GetWeakPtr(), interface_name); } WebContentsBindingSet* WebContentsImpl::GetBindingSet(
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 970ffc6a..4974e93 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h
@@ -271,8 +271,8 @@ // // |binding_set| is not owned and must either outlive this WebContents or be // explicitly removed before being destroyed. - base::Closure AddBindingSet(const std::string& interface_name, - WebContentsBindingSet* binding_set); + base::OnceClosure AddBindingSet(const std::string& interface_name, + WebContentsBindingSet* binding_set); // Accesses a WebContentsBindingSet for a specific interface on this // WebContents. Returns null of there is no registered binder for the
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index 6494d60..6c39c9e 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -2015,7 +2015,7 @@ void DidFirstVisuallyNonEmptyPaint() override { did_fist_visually_non_empty_paint_ = true; - on_did_first_visually_non_empty_paint_.Run(); + std::move(on_did_first_visually_non_empty_paint_).Run(); } void WaitForDidFirstVisuallyNonEmptyPaint() { @@ -2026,7 +2026,7 @@ run_loop.Run(); } - base::Closure on_did_first_visually_non_empty_paint_; + base::OnceClosure on_did_first_visually_non_empty_paint_; bool did_fist_visually_non_empty_paint_; }; @@ -2127,10 +2127,10 @@ private: void GotPageScaleUpdate() { got_page_scale_update_ = true; - on_page_scale_update_.Run(); + std::move(on_page_scale_update_).Run(); } - base::Closure on_page_scale_update_; + base::OnceClosure on_page_scale_update_; bool got_page_scale_update_; }; @@ -2844,7 +2844,7 @@ loop_runner->Run(); } -void ExpectNoValidImageCallback(const base::Closure& quit_closure, +void ExpectNoValidImageCallback(base::OnceClosure quit_closure, int id, int status_code, const GURL& image_url, @@ -2853,7 +2853,7 @@ EXPECT_EQ(200, status_code); EXPECT_TRUE(bitmap.empty()); EXPECT_TRUE(sizes.empty()); - quit_closure.Run(); + std::move(quit_closure).Run(); } void ExpectSingleValidImageCallback(base::OnceClosure quit_closure,
diff --git a/content/browser/web_package/mock_web_bundle_reader_factory.cc b/content/browser/web_package/mock_web_bundle_reader_factory.cc index 2a9692f4..25f7add 100644 --- a/content/browser/web_package/mock_web_bundle_reader_factory.cc +++ b/content/browser/web_package/mock_web_bundle_reader_factory.cc
@@ -184,7 +184,7 @@ base::RunLoop run_loop; reader->ReadMetadata(base::BindOnce( - [](base::Closure quit_closure, + [](base::OnceClosure quit_closure, WebBundleReader::MetadataCallback callback, data_decoder::mojom::BundleMetadataParseErrorPtr error) { std::move(callback).Run(std::move(error)); @@ -207,7 +207,7 @@ base::RunLoop run_loop; reader->ReadResponse( url, base::BindOnce( - [](base::Closure quit_closure, + [](base::OnceClosure quit_closure, WebBundleReader::ResponseCallback callback, data_decoder::mojom::BundleResponsePtr response, data_decoder::mojom::BundleResponseParseErrorPtr error) {
diff --git a/content/browser/web_package/web_bundle_reader_unittest.cc b/content/browser/web_package/web_bundle_reader_unittest.cc index 420f459..2d2f410 100644 --- a/content/browser/web_package/web_bundle_reader_unittest.cc +++ b/content/browser/web_package/web_bundle_reader_unittest.cc
@@ -177,7 +177,7 @@ GetReader()->ReadResponseBody( std::move(response), std::move(producer), base::BindOnce( - [](base::Closure quit_closure, net::Error* callback_result, + [](base::OnceClosure quit_closure, net::Error* callback_result, net::Error result) { *callback_result = result; std::move(quit_closure).Run();
diff --git a/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc b/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc index c6c5ae3..64f77f5 100644 --- a/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc +++ b/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc
@@ -54,7 +54,7 @@ mock_factory_->ReadAndFullfillMetadata( reader_, std::move(metadata), base::BindOnce( - [](base::Closure quit_closure, + [](base::OnceClosure quit_closure, data_decoder::mojom::BundleMetadataParseErrorPtr error) { std::move(quit_closure).Run(); },
diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc index b8e8f5b..00b71de 100644 --- a/content/browser/webui/shared_resources_data_source.cc +++ b/content/browser/webui/shared_resources_data_source.cc
@@ -15,6 +15,8 @@ #include "base/strings/string_util.h" #include "base/task/post_task.h" #include "build/build_config.h" +#include "content/browser/resources/media/grit/media_internals_resources.h" +#include "content/browser/resources/media/grit/media_internals_resources_map.h" #include "content/grit/content_resources.h" #include "content/grit/content_resources_map.h" #include "content/public/browser/browser_task_traits.h" @@ -257,6 +259,9 @@ AddResourcesToMap(result); AddAliasedResourcesToMap(CreateContentResourceIdToAliasMap(), kContentResources, kContentResourcesSize, result); + AddAliasedResourcesToMap(CreateContentResourceIdToAliasMap(), + kMediaInternalsResources, + kMediaInternalsResourcesSize, result); AddAliasedResourcesToMap(CreateMojoResourceIdToAliasMap(), kMojoBindingsResources, kMojoBindingsResourcesSize, result); @@ -294,7 +299,7 @@ void SharedResourcesDataSource::StartDataRequest( const GURL& url, const WebContents::Getter& wc_getter, - const URLDataSource::GotDataCallback& callback) { + URLDataSource::GotDataCallback callback) { const std::string path = URLDataSource::URLToRequestPath(url); std::string updated_path = path; #if defined(OS_CHROMEOS) @@ -321,7 +326,7 @@ bytes = GetContentClient()->GetDataResourceBytes(idr); } - callback.Run(std::move(bytes)); + std::move(callback).Run(std::move(bytes)); } bool SharedResourcesDataSource::AllowCaching() {
diff --git a/content/browser/webui/shared_resources_data_source.h b/content/browser/webui/shared_resources_data_source.h index 07a4fed..8473cf7 100644 --- a/content/browser/webui/shared_resources_data_source.h +++ b/content/browser/webui/shared_resources_data_source.h
@@ -21,10 +21,9 @@ // URLDataSource implementation. std::string GetSource() override; - void StartDataRequest( - const GURL& url, - const WebContents::Getter& wc_getter, - const URLDataSource::GotDataCallback& callback) override; + void StartDataRequest(const GURL& url, + const WebContents::Getter& wc_getter, + URLDataSource::GotDataCallback callback) override; bool AllowCaching() override; std::string GetMimeType(const std::string& path) override; bool ShouldServeMimeTypeAsContentTypeHeader() override;
diff --git a/content/browser/webui/web_ui_browsertest_util.cc b/content/browser/webui/web_ui_browsertest_util.cc index 27e6e4f5..0b2a161 100644 --- a/content/browser/webui/web_ui_browsertest_util.cc +++ b/content/browser/webui/web_ui_browsertest_util.cc
@@ -30,11 +30,11 @@ namespace { void GetResource(const std::string& id, - const WebUIDataSource::GotDataCallback& callback) { + WebUIDataSource::GotDataCallback callback) { base::ScopedAllowBlockingForTesting allow_blocking; if (id == "error") { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } @@ -46,7 +46,7 @@ base::RefCountedString* ref_contents = new base::RefCountedString; ref_contents->data() = contents; - callback.Run(ref_contents); + std::move(callback).Run(ref_contents); } struct WebUIControllerConfig {
diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index ca4eac89..ef62de6 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -67,11 +67,10 @@ std::string GetMimeType(const std::string& path) override { return parent_->GetMimeType(path); } - void StartDataRequest( - const GURL& url, - const WebContents::Getter& wc_getter, - const URLDataSource::GotDataCallback& callback) override { - return parent_->StartDataRequest(url, wc_getter, callback); + void StartDataRequest(const GURL& url, + const WebContents::Getter& wc_getter, + URLDataSource::GotDataCallback callback) override { + return parent_->StartDataRequest(url, wc_getter, std::move(callback)); } bool ShouldReplaceExistingSource() override { return parent_->replace_existing_source_; @@ -275,11 +274,11 @@ void WebUIDataSourceImpl::StartDataRequest( const GURL& url, const WebContents::Getter& wc_getter, - const URLDataSource::GotDataCallback& callback) { + URLDataSource::GotDataCallback callback) { const std::string path = URLDataSource::URLToRequestPath(url); if (!should_handle_request_callback_.is_null() && should_handle_request_callback_.Run(path)) { - filter_callback_.Run(path, callback); + filter_callback_.Run(path, std::move(callback)); return; } @@ -288,7 +287,7 @@ if (use_strings_js_) { bool from_js_module = path == "strings.m.js"; if (from_js_module || path == "strings.js") { - SendLocalizedStringsAsJSON(callback, from_js_module); + SendLocalizedStringsAsJSON(std::move(callback), from_js_module); return; } } @@ -297,15 +296,15 @@ DCHECK_NE(resource_id, -1) << " for " << path; scoped_refptr<base::RefCountedMemory> response( GetContentClient()->GetDataResourceBytes(resource_id)); - callback.Run(response.get()); + std::move(callback).Run(response.get()); } void WebUIDataSourceImpl::SendLocalizedStringsAsJSON( - const URLDataSource::GotDataCallback& callback, + URLDataSource::GotDataCallback callback, bool from_js_module) { std::string template_data; webui::AppendJsonJS(&localized_strings_, &template_data, from_js_module); - callback.Run(base::RefCountedString::TakeString(&template_data)); + std::move(callback).Run(base::RefCountedString::TakeString(&template_data)); } const base::DictionaryValue* WebUIDataSourceImpl::GetLocalizedStrings() const {
diff --git a/content/browser/webui/web_ui_data_source_impl.h b/content/browser/webui/web_ui_data_source_impl.h index f64f9e5..4e2cfa6 100644 --- a/content/browser/webui/web_ui_data_source_impl.h +++ b/content/browser/webui/web_ui_data_source_impl.h
@@ -67,9 +67,8 @@ ~WebUIDataSourceImpl() override; // Completes a request by sending our dictionary of localized strings. - void SendLocalizedStringsAsJSON( - const URLDataSource::GotDataCallback& callback, - bool from_js_module); + void SendLocalizedStringsAsJSON(URLDataSource::GotDataCallback callback, + bool from_js_module); // Protected for testing. virtual const base::DictionaryValue* GetLocalizedStrings() const; @@ -85,7 +84,7 @@ std::string GetMimeType(const std::string& path) const; void StartDataRequest(const GURL& url, const WebContents::Getter& wc_getter, - const URLDataSource::GotDataCallback& callback); + URLDataSource::GotDataCallback callback); int PathToIdrOrDefault(const std::string& path) const;
diff --git a/content/browser/webui/web_ui_data_source_unittest.cc b/content/browser/webui/web_ui_data_source_unittest.cc index d330d4e..795c73d 100644 --- a/content/browser/webui/web_ui_data_source_unittest.cc +++ b/content/browser/webui/web_ui_data_source_unittest.cc
@@ -54,9 +54,9 @@ WebUIDataSourceImpl* source() { return source_.get(); } void StartDataRequest(const std::string& path, - const URLDataSource::GotDataCallback& callback) { + URLDataSource::GotDataCallback callback) { source_->StartDataRequest(GURL("https://any-host/" + path), - WebContents::Getter(), callback); + WebContents::Getter(), std::move(callback)); } std::string GetMimeType(const std::string& path) const { @@ -64,7 +64,7 @@ } void HandleRequest(const std::string& path, - const WebUIDataSourceImpl::GotDataCallback&) { + WebUIDataSourceImpl::GotDataCallback) { request_path_ = path; } @@ -100,12 +100,12 @@ TEST_F(WebUIDataSourceTest, EmptyStrings) { source()->UseStringsJs(); - StartDataRequest("strings.js", base::Bind(&EmptyStringsCallback, false)); + StartDataRequest("strings.js", base::BindOnce(&EmptyStringsCallback, false)); } TEST_F(WebUIDataSourceTest, EmptyModuleStrings) { source()->UseStringsJs(); - StartDataRequest("strings.m.js", base::Bind(&EmptyStringsCallback, true)); + StartDataRequest("strings.m.js", base::BindOnce(&EmptyStringsCallback, true)); } void SomeValuesCallback(scoped_refptr<base::RefCountedMemory> data) { @@ -124,7 +124,7 @@ source()->AddInteger("debt", -456); source()->AddString("planet", base::ASCIIToUTF16("pluto")); source()->AddLocalizedString("button", kDummyStringId); - StartDataRequest("strings.js", base::Bind(&SomeValuesCallback)); + StartDataRequest("strings.js", base::BindOnce(&SomeValuesCallback)); } void DefaultResourceFoobarCallback(scoped_refptr<base::RefCountedMemory> data) { @@ -140,8 +140,9 @@ TEST_F(WebUIDataSourceTest, DefaultResource) { source()->SetDefaultResource(kDummyDefaultResourceId); - StartDataRequest("foobar", base::Bind(&DefaultResourceFoobarCallback)); - StartDataRequest("strings.js", base::Bind(&DefaultResourceStringsCallback)); + StartDataRequest("foobar", base::BindOnce(&DefaultResourceFoobarCallback)); + StartDataRequest("strings.js", + base::BindOnce(&DefaultResourceStringsCallback)); } void NamedResourceFoobarCallback(scoped_refptr<base::RefCountedMemory> data) { @@ -157,8 +158,8 @@ TEST_F(WebUIDataSourceTest, NamedResource) { source()->SetDefaultResource(kDummyDefaultResourceId); source()->AddResourcePath("foobar", kDummyResourceId); - StartDataRequest("foobar", base::Bind(&NamedResourceFoobarCallback)); - StartDataRequest("strings.js", base::Bind(&NamedResourceStringsCallback)); + StartDataRequest("foobar", base::BindOnce(&NamedResourceFoobarCallback)); + StartDataRequest("strings.js", base::BindOnce(&NamedResourceStringsCallback)); } void NamedResourceWithQueryStringCallback( @@ -171,7 +172,7 @@ source()->SetDefaultResource(kDummyDefaultResourceId); source()->AddResourcePath("foobar", kDummyResourceId); StartDataRequest("foobar?query?string", - base::Bind(&NamedResourceWithQueryStringCallback)); + base::BindOnce(&NamedResourceWithQueryStringCallback)); } void WebUIDataSourceTest::RequestFilterQueryStringCallback( @@ -192,8 +193,8 @@ source()->AddResourcePath("foobar", kDummyResourceId); StartDataRequest( "foobar?query?string", - base::Bind(&WebUIDataSourceTest::RequestFilterQueryStringCallback, - base::Unretained(this))); + base::BindOnce(&WebUIDataSourceTest::RequestFilterQueryStringCallback, + base::Unretained(this))); } TEST_F(WebUIDataSourceTest, MimeType) {
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index 74a4aeca..d86c13c 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -62,7 +62,7 @@ // The bindings for the page are generated from a .mojom file. This code looks // up the generated file from disk and returns it. void GetResource(const std::string& id, - const WebUIDataSource::GotDataCallback& callback) { + WebUIDataSource::GotDataCallback callback) { base::ScopedAllowBlockingForTesting allow_blocking; std::string contents; @@ -78,7 +78,7 @@ base::RefCountedString* ref_contents = new base::RefCountedString; ref_contents->data() = contents; - callback.Run(ref_contents); + std::move(callback).Run(ref_contents); } class BrowserTargetImpl : public mojom::BrowserTarget { @@ -124,11 +124,10 @@ WebUIDataSource* data_source = WebUIDataSource::Create("dummy-web-ui"); data_source->SetRequestFilter( base::BindRepeating([](const std::string& path) { return true; }), - base::BindRepeating( - [](const std::string& id, - const WebUIDataSource::GotDataCallback& callback) { - callback.Run(new base::RefCountedString); - })); + base::BindRepeating([](const std::string& id, + WebUIDataSource::GotDataCallback callback) { + std::move(callback).Run(new base::RefCountedString); + })); WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), data_source); }
diff --git a/content/browser/webui/web_ui_url_loader_factory.cc b/content/browser/webui/web_ui_url_loader_factory.cc index 2f67766..42a6c932 100644 --- a/content/browser/webui/web_ui_url_loader_factory.cc +++ b/content/browser/webui/web_ui_url_loader_factory.cc
@@ -184,7 +184,7 @@ // request_start response_start WebContents::Getter wc_getter = - base::Bind(WebContents::FromFrameTreeNodeId, frame_tree_node_id); + base::BindRepeating(WebContents::FromFrameTreeNodeId, frame_tree_node_id); bool replace_in_js = source->source()->ShouldReplaceI18nInJS() && @@ -197,9 +197,9 @@ // To keep the same behavior as the old WebUI code, we call the source to get // the value for |replacements| on the IO thread. Since |replacements| is // owned by |source| keep a reference to it in the callback. - auto data_available_callback = - base::Bind(DataAvailable, resource_response, replacements, replace_in_js, - base::RetainedRef(source), base::Passed(&client_remote)); + URLDataSource::GotDataCallback data_available_callback = base::BindOnce( + DataAvailable, resource_response, replacements, replace_in_js, + base::RetainedRef(source), base::Passed(&client_remote)); // TODO(jam): once we only have this code path for WebUI, and not the // URLLRequestJob one, then we should switch data sources to run on the UI
diff --git a/content/content_resources.grd b/content/content_resources.grd index b45b7878..d3fe02c 100644 --- a/content/content_resources.grd +++ b/content/content_resources.grd
@@ -28,9 +28,6 @@ <include name="IDR_INDEXED_DB_INTERNALS_HTML" file="browser/resources/indexed_db/indexeddb_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" /> <include name="IDR_INDEXED_DB_INTERNALS_JS" file="browser/resources/indexed_db/indexeddb_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" /> <include name="IDR_INDEXED_DB_INTERNALS_CSS" file="browser/resources/indexed_db/indexeddb_internals.css" flattenhtml="true" compress="gzip" type="BINDATA" /> - <include name="IDR_MEDIA_INTERNALS_HTML" file="browser/resources/media/media_internals.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" /> - <include name="IDR_MEDIA_INTERNALS_JS" file="browser/resources/media/media_internals.js" flattenhtml="true" compress="gzip" type="BINDATA" /> - <include name="IDR_MEDIA_INTERNALS_JS_DISABLED" file="browser/resources/media/media_internals_disabled.js" flattenhtml="true" compress="gzip" type="BINDATA" /> <include name="IDR_NETWORK_ERROR_LISTING_HTML" file="browser/resources/net/network_errors_listing.html" flattenhtml="true" allowexternalscript="true" compress="gzip" type="BINDATA" /> <include name="IDR_NETWORK_ERROR_LISTING_JS" file="browser/resources/net/network_errors_listing.js" flattenhtml="true" type="BINDATA" compress="gzip" /> <include name="IDR_NETWORK_ERROR_LISTING_CSS" file="browser/resources/net/network_errors_listing.css" flattenhtml="true" type="BINDATA" compress="gzip" />
diff --git a/content/public/app/content_browser_manifest.cc b/content/public/app/content_browser_manifest.cc index bb1ff6d..8e57d31f 100644 --- a/content/public/app/content_browser_manifest.cc +++ b/content/public/app/content_browser_manifest.cc
@@ -188,7 +188,6 @@ "content.mojom.RendererAudioInputStreamFactory", "content.mojom.RendererAudioOutputStreamFactory", "discardable_memory.mojom.DiscardableSharedMemoryManager", - "media.mojom.InterfaceFactory", "media.mojom.MediaMetricsProvider", "network.mojom.RestrictedCookieManager", "viz.mojom.Gpu"})
diff --git a/content/public/browser/back_forward_cache.h b/content/public/browser/back_forward_cache.h index 379d79f..62f11189 100644 --- a/content/public/browser/back_forward_cache.h +++ b/content/public/browser/back_forward_cache.h
@@ -52,6 +52,19 @@ static void DisableForRenderFrameHost(GlobalFrameRoutingId id, base::StringPiece reason); + // If the RenderFrameHost referenced by |id| is in the BackForwardCache cache + // this method will evict it and return true. A reason can be provided for + // logging and metrics purposes. On the other hand, if the RenderFrameHost is + // not cached or it no longer exists, nothing happens and false is returned. + // + // Calling this method will not prevent this RenderFrameHost from entering the + // back-forward cache in the future as opposed to the + // DisableForRenderFrameHost methods. + // + // This method is useful to gate operations that are not allowed while a + // document is in the cache. + static bool EvictIfCached(GlobalFrameRoutingId id, base::StringPiece reason); + // List of reasons the BackForwardCache was disabled for a specific test. If a // test needs to be disabled for a reason not covered below, please add to // this enum.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index 06b8121..a9e1fd36 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -899,7 +899,7 @@ bool ContentBrowserClient::HandleExternalProtocol( const GURL& url, - WebContents::Getter web_contents_getter, + WebContents::OnceGetter web_contents_getter, int child_id, NavigationUIData* navigation_data, bool is_main_frame,
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index 958c5145..bc4e6588 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -1570,7 +1570,7 @@ // decisions about whether to allow an external application to launch. virtual bool HandleExternalProtocol( const GURL& url, - base::Callback<WebContents*(void)> web_contents_getter, + base::OnceCallback<WebContents*()> web_contents_getter, int child_id, NavigationUIData* navigation_data, bool is_main_frame,
diff --git a/content/public/browser/push_messaging_service.h b/content/public/browser/push_messaging_service.h index 74efe74..8a7586c6 100644 --- a/content/public/browser/push_messaging_service.h +++ b/content/public/browser/push_messaging_service.h
@@ -40,10 +40,10 @@ using UnregisterCallback = base::OnceCallback<void(blink::mojom::PushUnregistrationStatus)>; using SubscriptionInfoCallback = - base::Callback<void(bool is_valid, - const GURL& endpoint, - const std::vector<uint8_t>& p256dh, - const std::vector<uint8_t>& auth)>; + base::OnceCallback<void(bool is_valid, + const GURL& endpoint, + const std::vector<uint8_t>& p256dh, + const std::vector<uint8_t>& auth)>; using StringCallback = base::OnceCallback< void(const std::string& data, bool success, bool not_found)>; @@ -80,12 +80,11 @@ // information to the callback. |sender_id| is also required since an // InstanceID might have multiple tokens associated with different senders, // though in practice Push doesn't yet use that. - virtual void GetSubscriptionInfo( - const GURL& origin, - int64_t service_worker_registration_id, - const std::string& sender_id, - const std::string& subscription_id, - const SubscriptionInfoCallback& callback) = 0; + virtual void GetSubscriptionInfo(const GURL& origin, + int64_t service_worker_registration_id, + const std::string& sender_id, + const std::string& subscription_id, + SubscriptionInfoCallback callback) = 0; // Unsubscribe the given |sender_id| from the push messaging service. Locally // deactivates the subscription, then runs |callback|, then asynchronously
diff --git a/content/public/browser/url_data_source.h b/content/public/browser/url_data_source.h index 9e9d150..9c40fc82 100644 --- a/content/public/browser/url_data_source.h +++ b/content/public/browser/url_data_source.h
@@ -61,8 +61,8 @@ // Used by StartDataRequest so that the child class can return the data when // it's available. - typedef base::Callback<void(scoped_refptr<base::RefCountedMemory>)> - GotDataCallback; + using GotDataCallback = + base::OnceCallback<void(scoped_refptr<base::RefCountedMemory>)>; // Must be called on the task runner specified by TaskRunnerForRequestPath, // or the IO thread if TaskRunnerForRequestPath returns nullptr. @@ -76,7 +76,7 @@ // null. virtual void StartDataRequest(const GURL& url, const WebContents::Getter& wc_getter, - const GotDataCallback& callback) = 0; + GotDataCallback callback) = 0; // The following methods are all called on the IO thread.
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index 01e2904..ecee31b 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h
@@ -264,7 +264,10 @@ // nullptr will be returned instead. // The callback should only run on the UI thread and it should always be // non-null. - using Getter = base::Callback<WebContents*(void)>; + using Getter = base::RepeatingCallback<WebContents*(void)>; + // Use this variant for instances that will only run the callback a single + // time. + using OnceGetter = base::OnceCallback<WebContents*(void)>; // Sets delegate for platform specific screen orientation functionality. CONTENT_EXPORT static void SetScreenOrientationDelegate(
diff --git a/content/public/browser/web_contents_binding_set.cc b/content/public/browser/web_contents_binding_set.cc index 455a5fe..dca3028 100644 --- a/content/public/browser/web_contents_binding_set.cc +++ b/content/public/browser/web_contents_binding_set.cc
@@ -27,7 +27,7 @@ ->AddBindingSet(interface_name, this)) {} WebContentsBindingSet::~WebContentsBindingSet() { - remove_callback_.Run(); + std::move(remove_callback_).Run(); } // static
diff --git a/content/public/browser/web_contents_binding_set.h b/content/public/browser/web_contents_binding_set.h index bfe6fce..5a269244 100644 --- a/content/public/browser/web_contents_binding_set.h +++ b/content/public/browser/web_contents_binding_set.h
@@ -60,7 +60,7 @@ void OnRequestForFrame(RenderFrameHost* render_frame_host, mojo::ScopedInterfaceEndpointHandle handle); - const base::Closure remove_callback_; + base::OnceClosure remove_callback_; Binder* binder_ = nullptr; DISALLOW_COPY_AND_ASSIGN(WebContentsBindingSet);
diff --git a/content/public/browser/web_ui_data_source.h b/content/public/browser/web_ui_data_source.h index d1058746..a8b6147b 100644 --- a/content/public/browser/web_ui_data_source.h +++ b/content/public/browser/web_ui_data_source.h
@@ -80,8 +80,8 @@ // Used as a parameter to GotDataCallback. The caller has to run this callback // with the result for the path that they filtered, passing ownership of the // memory. - typedef base::Callback<void(scoped_refptr<base::RefCountedMemory>)> - GotDataCallback; + using GotDataCallback = + base::OnceCallback<void(scoped_refptr<base::RefCountedMemory>)>; // Used by SetRequestFilter. The string parameter is the path of the request. // The return value indicates if the callee wants to handle the request. Iff @@ -94,9 +94,8 @@ // This callback is only called if a prior call to ShouldHandleRequestCallback // returned true. GotDataCallback should be used to provide the response // bytes. - typedef base::RepeatingCallback<void(const std::string&, - const GotDataCallback&)> - HandleRequestCallback; + using HandleRequestCallback = + base::RepeatingCallback<void(const std::string&, GotDataCallback)>; // Allows a caller to add a filter for URL requests. virtual void SetRequestFilter(
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc index ac6953d4..020b13b9 100644 --- a/content/public/test/test_utils.cc +++ b/content/public/test/test_utils.cc
@@ -249,8 +249,8 @@ RunThisRunLoop(&run_loop_); } -base::RepeatingClosure MessageLoopRunner::QuitClosure() { - return base::BindRepeating(&MessageLoopRunner::Quit, this); +base::OnceClosure MessageLoopRunner::QuitClosure() { + return base::BindOnce(&MessageLoopRunner::Quit, this); } void MessageLoopRunner::Quit() {
diff --git a/content/public/test/test_utils.h b/content/public/test/test_utils.h index 83b223ac..bbeb62a 100644 --- a/content/public/test/test_utils.h +++ b/content/public/test/test_utils.h
@@ -154,7 +154,7 @@ // scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner; // kick_off_some_api(runner->QuitClosure()); // runner->Run(); - base::RepeatingClosure QuitClosure(); + base::OnceClosure QuitClosure(); bool loop_running() const { return loop_running_; }
diff --git a/content/renderer/media/media_factory.cc b/content/renderer/media/media_factory.cc index f3ab1e9..e0f3905 100644 --- a/content/renderer/media/media_factory.cc +++ b/content/renderer/media/media_factory.cc
@@ -636,9 +636,8 @@ #if BUILDFLAG(ENABLE_MOJO_MEDIA) media::mojom::InterfaceFactory* MediaFactory::GetMediaInterfaceFactory() { if (!media_interface_factory_) { - DCHECK(remote_interfaces_); media_interface_factory_.reset( - new MediaInterfaceFactory(remote_interfaces_)); + new MediaInterfaceFactory(render_frame_->GetBrowserInterfaceBroker())); } return media_interface_factory_.get();
diff --git a/content/renderer/media/media_interface_factory.cc b/content/renderer/media/media_interface_factory.cc index b9f20d7..e816e910 100644 --- a/content/renderer/media/media_interface_factory.cc +++ b/content/renderer/media/media_interface_factory.cc
@@ -11,13 +11,13 @@ #include "media/mojo/mojom/renderer.mojom.h" #include "media/mojo/mojom/renderer_extensions.mojom.h" #include "mojo/public/cpp/bindings/interface_request.h" -#include "services/service_manager/public/cpp/interface_provider.h" +#include "third_party/blink/public/common/browser_interface_broker_proxy.h" namespace content { MediaInterfaceFactory::MediaInterfaceFactory( - service_manager::InterfaceProvider* remote_interfaces) - : remote_interfaces_(remote_interfaces) { + blink::BrowserInterfaceBrokerProxy* interface_broker) + : interface_broker_(interface_broker) { task_runner_ = base::ThreadTaskRunnerHandle::Get(); weak_this_ = weak_factory_.GetWeakPtr(); } @@ -171,7 +171,7 @@ DCHECK(task_runner_->BelongsToCurrentThread()); if (!media_interface_factory_) { - remote_interfaces_->GetInterface( + interface_broker_->GetInterface( media_interface_factory_.BindNewPipeAndPassReceiver()); media_interface_factory_.set_disconnect_handler(base::BindOnce( &MediaInterfaceFactory::OnConnectionError, base::Unretained(this)));
diff --git a/content/renderer/media/media_interface_factory.h b/content/renderer/media/media_interface_factory.h index dc996b2..b876ba0 100644 --- a/content/renderer/media/media_interface_factory.h +++ b/content/renderer/media/media_interface_factory.h
@@ -20,8 +20,8 @@ #include "mojo/public/cpp/bindings/remote.h" #include "url/gurl.h" -namespace service_manager { -class InterfaceProvider; +namespace blink { +class BrowserInterfaceBrokerProxy; } namespace content { @@ -33,7 +33,7 @@ : public media::mojom::InterfaceFactory { public: explicit MediaInterfaceFactory( - service_manager::InterfaceProvider* remote_interfaces); + blink::BrowserInterfaceBrokerProxy* interface_broker); ~MediaInterfaceFactory() final; // media::mojom::InterfaceFactory implementation. @@ -78,7 +78,7 @@ media::mojom::InterfaceFactory* GetMediaInterfaceFactory(); void OnConnectionError(); - service_manager::InterfaceProvider* remote_interfaces_; + blink::BrowserInterfaceBrokerProxy* interface_broker_; mojo::Remote<media::mojom::InterfaceFactory> media_interface_factory_; scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc index 53a820bd..44d9e51c 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
@@ -398,10 +398,11 @@ ~VideoSource() final { StopSourceImpl(); } void StartSourceImpl( - const blink::VideoCaptureDeliverFrameCB& frame_callback) final { + blink::VideoCaptureDeliverFrameCB frame_callback, + blink::EncodedVideoFrameCB encoded_frame_callback) final { if (host_) { host_->frame_deliverer_ = - new FrameDeliverer(io_task_runner(), frame_callback); + new FrameDeliverer(io_task_runner(), std::move(frame_callback)); } }
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index b3f42ad2..e82958e70 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn
@@ -537,6 +537,7 @@ sources = [ "$root_gen_dir/content/app/resources/content_resources_100_percent.pak", + "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak", "$root_gen_dir/content/browser/tracing/tracing_resources.pak", "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak", "$root_gen_dir/content/content_resources.pak", @@ -556,6 +557,7 @@ ":resources", "//content:resources", "//content/app/resources", + "//content/browser/resources/media:media_internals_resources", "//content/browser/tracing:resources", "//content/browser/webrtc/resources", "//mojo/public/js:resources",
diff --git a/content/shell/browser/web_test/web_test_push_messaging_service.cc b/content/shell/browser/web_test/web_test_push_messaging_service.cc index b33e05a..762c0f9 100644 --- a/content/shell/browser/web_test/web_test_push_messaging_service.cc +++ b/content/shell/browser/web_test/web_test_push_messaging_service.cc
@@ -101,14 +101,14 @@ int64_t service_worker_registration_id, const std::string& sender_id, const std::string& subscription_id, - const SubscriptionInfoCallback& callback) { + SubscriptionInfoCallback callback) { std::vector<uint8_t> p256dh(kTestP256Key, kTestP256Key + base::size(kTestP256Key)); std::vector<uint8_t> auth(kAuthentication, kAuthentication + base::size(kAuthentication)); const GURL endpoint = CreateEndpoint(subscription_id); - callback.Run(true /* is_valid */, endpoint, p256dh, auth); + std::move(callback).Run(true /* is_valid */, endpoint, p256dh, auth); } bool WebTestPushMessagingService::SupportNonVisibleMessages() {
diff --git a/content/shell/browser/web_test/web_test_push_messaging_service.h b/content/shell/browser/web_test/web_test_push_messaging_service.h index 6988df08..32d3ab6 100644 --- a/content/shell/browser/web_test/web_test_push_messaging_service.h +++ b/content/shell/browser/web_test/web_test_push_messaging_service.h
@@ -37,7 +37,7 @@ int64_t service_worker_registration_id, const std::string& sender_id, const std::string& subscription_id, - const SubscriptionInfoCallback& callback) override; + SubscriptionInfoCallback callback) override; bool SupportNonVisibleMessages() override; void Unsubscribe(blink::mojom::PushUnregistrationReason reason, const GURL& requesting_origin,
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 2463b732..9f090de 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn
@@ -1091,6 +1091,7 @@ "//content/app:both_for_content_tests", "//content/browser:for_content_tests", "//content/browser/background_sync:background_sync_proto", + "//content/browser/resources/media:media_internals_resources_grit", "//content/child:for_content_tests", "//content/gpu", "//content/public/browser",
diff --git a/content/test/webui_resource_browsertest.cc b/content/test/webui_resource_browsertest.cc index 6cc594d..de5be7be 100644 --- a/content/test/webui_resource_browsertest.cc +++ b/content/test/webui_resource_browsertest.cc
@@ -7,6 +7,7 @@ #include "base/macros.h" #include "base/path_service.h" #include "base/threading/thread_restrictions.h" +#include "content/browser/resources/media/grit/media_internals_resources.h" #include "content/grit/content_resources.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_paths.h"
diff --git a/extensions/browser/sandboxed_unpacker_unittest.cc b/extensions/browser/sandboxed_unpacker_unittest.cc index 556e566..c01afc7 100644 --- a/extensions/browser/sandboxed_unpacker_unittest.cc +++ b/extensions/browser/sandboxed_unpacker_unittest.cc
@@ -120,16 +120,16 @@ const SkBitmap& install_icon, const base::Optional<int>& dnr_ruleset_checksum) override { temp_dir_ = temp_dir; - quit_closure_.Run(); + std::move(quit_closure_).Run(); } void OnUnpackFailure(const CrxInstallError& error) override { error_ = error; - quit_closure_.Run(); + std::move(quit_closure_).Run(); } base::Optional<CrxInstallError> error_; - base::Closure quit_closure_; + base::OnceClosure quit_closure_; base::FilePath temp_dir_; bool* deleted_tracker_ = nullptr; };
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc index 83299874..7096b01 100644 --- a/extensions/shell/browser/shell_content_browser_client.cc +++ b/extensions/shell/browser/shell_content_browser_client.cc
@@ -335,7 +335,7 @@ bool ShellContentBrowserClient::HandleExternalProtocol( const GURL& url, - content::WebContents::Getter web_contents_getter, + content::WebContents::OnceGetter web_contents_getter, int child_id, content::NavigationUIData* navigation_data, bool is_main_frame,
diff --git a/extensions/shell/browser/shell_content_browser_client.h b/extensions/shell/browser/shell_content_browser_client.h index 4b8519b1..69f405f4 100644 --- a/extensions/shell/browser/shell_content_browser_client.h +++ b/extensions/shell/browser/shell_content_browser_client.h
@@ -95,7 +95,7 @@ bool* bypass_redirect_checks) override; bool HandleExternalProtocol( const GURL& url, - content::WebContents::Getter web_contents_getter, + content::WebContents::OnceGetter web_contents_getter, int child_id, content::NavigationUIData* navigation_data, bool is_main_frame,
diff --git a/gpu/command_buffer/service/shared_context_state.cc b/gpu/command_buffer/service/shared_context_state.cc index 84fb4cf..2952424 100644 --- a/gpu/command_buffer/service/shared_context_state.cc +++ b/gpu/command_buffer/service/shared_context_state.cc
@@ -48,6 +48,29 @@ } } +SharedContextState::MemoryTracker::MemoryTracker( + gpu::MemoryTracker::Observer* peak_memory_monitor) + : peak_memory_monitor_(peak_memory_monitor) {} + +SharedContextState::MemoryTracker::~MemoryTracker() { + DCHECK(!size_); +} + +void SharedContextState::MemoryTracker::OnMemoryAllocatedChange( + CommandBufferId id, + uint64_t old_size, + uint64_t new_size) { + uint64_t delta = new_size - old_size; + old_size = size_; + size_ += delta; + if (peak_memory_monitor_) + peak_memory_monitor_->OnMemoryAllocatedChange(id, old_size, size_); +} + +uint64_t SharedContextState::MemoryTracker::GetMemoryUsage() const { + return size_; +} + SharedContextState::SharedContextState( scoped_refptr<gl::GLShareGroup> share_group, scoped_refptr<gl::GLSurface> surface, @@ -57,10 +80,12 @@ GrContextType gr_context_type, viz::VulkanContextProvider* vulkan_context_provider, viz::MetalContextProvider* metal_context_provider, - viz::DawnContextProvider* dawn_context_provider) + viz::DawnContextProvider* dawn_context_provider, + gpu::MemoryTracker::Observer* peak_memory_monitor) : use_virtualized_gl_contexts_(use_virtualized_gl_contexts), context_lost_callback_(std::move(context_lost_callback)), gr_context_type_(gr_context_type), + memory_tracker_(peak_memory_monitor), vk_context_provider_(vulkan_context_provider), metal_context_provider_(metal_context_provider), dawn_context_provider_(dawn_context_provider),
diff --git a/gpu/command_buffer/service/shared_context_state.h b/gpu/command_buffer/service/shared_context_state.h index 1d9713b..65adbea 100644 --- a/gpu/command_buffer/service/shared_context_state.h +++ b/gpu/command_buffer/service/shared_context_state.h
@@ -16,6 +16,7 @@ #include "build/build_config.h" #include "gpu/command_buffer/common/skia_utils.h" #include "gpu/command_buffer/service/gl_context_virtual_delegate.h" +#include "gpu/command_buffer/service/memory_tracking.h" #include "gpu/config/gpu_preferences.h" #include "gpu/gpu_gles2_export.h" #include "third_party/skia/include/gpu/GrContext.h" @@ -60,7 +61,8 @@ GrContextType gr_context_type = GrContextType::kGL, viz::VulkanContextProvider* vulkan_context_provider = nullptr, viz::MetalContextProvider* metal_context_provider = nullptr, - viz::DawnContextProvider* dawn_context_provider = nullptr); + viz::DawnContextProvider* dawn_context_provider = nullptr, + gpu::MemoryTracker::Observer* peak_memory_monitor = nullptr); void InitializeGrContext(const GpuDriverBugWorkarounds& workarounds, GrContextOptions::PersistentCache* cache, @@ -90,6 +92,8 @@ void PurgeMemory( base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level); + uint64_t GetMemoryUsage() const { return memory_tracker_.GetMemoryUsage(); } + void PessimisticallyResetGrContext() const; gl::GLShareGroup* share_group() { return share_group_.get(); } @@ -130,6 +134,7 @@ bool support_vulkan_external_object() const { return support_vulkan_external_object_; } + gpu::MemoryTracker::Observer* memory_tracker() { return &memory_tracker_; } // base::trace_event::MemoryDumpProvider implementation. bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, @@ -149,6 +154,28 @@ private: friend class base::RefCounted<SharedContextState>; + // Observer which is notified when SkiaOutputSurfaceImpl takes ownership of a + // shared image, and forward information to both histograms and task manager. + class GPU_GLES2_EXPORT MemoryTracker : public gpu::MemoryTracker::Observer { + public: + MemoryTracker(gpu::MemoryTracker::Observer* peak_memory_monitor); + MemoryTracker(MemoryTracker&) = delete; + MemoryTracker& operator=(MemoryTracker&) = delete; + ~MemoryTracker() override; + + // gpu::MemoryTracker::Observer implementation: + void OnMemoryAllocatedChange(CommandBufferId id, + uint64_t old_size, + uint64_t new_size) override; + + // Reports to GpuServiceImpl::GetVideoMemoryUsageStats() + uint64_t GetMemoryUsage() const; + + private: + uint64_t size_ = 0; + gpu::MemoryTracker::Observer* const peak_memory_monitor_; + }; + ~SharedContextState() override; // gpu::GLContextVirtualDelegate implementation. @@ -175,6 +202,7 @@ bool support_vulkan_external_object_ = false; base::OnceClosure context_lost_callback_; GrContextType gr_context_type_ = GrContextType::kGL; + MemoryTracker memory_tracker_; viz::VulkanContextProvider* const vk_context_provider_; viz::MetalContextProvider* const metal_context_provider_; viz::DawnContextProvider* const dawn_context_provider_;
diff --git a/gpu/ipc/service/gpu_channel_manager.cc b/gpu/ipc/service/gpu_channel_manager.cc index 965a05b..197d049 100644 --- a/gpu/ipc/service/gpu_channel_manager.cc +++ b/gpu/ipc/service/gpu_channel_manager.cc
@@ -286,6 +286,9 @@ .video_memory += size; } + if (shared_context_state_ && !shared_context_state_->context_lost()) + total_size += shared_context_state_->GetMemoryUsage(); + // Assign the total across all processes in the GPU process video_memory_usage_stats->process_map[base::GetCurrentProcId()].video_memory = total_size; @@ -484,7 +487,7 @@ base::BindOnce(&GpuChannelManager::OnContextLost, base::Unretained(this), /*synthetic_loss=*/false), gpu_preferences_.gr_context_type, vulkan_context_provider_, - metal_context_provider_, dawn_context_provider_); + metal_context_provider_, dawn_context_provider_, peak_memory_monitor()); // OOP-R needs GrContext for raster tiles. bool need_gr_context =
diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm index 6f0faa9..eafb2c2d 100644 --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm
@@ -605,8 +605,9 @@ base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); std::string product = base::StringPrintf("Version/%d.%d", major, minor); - command_line->AppendSwitchASCII(switches::kUserAgent, - web::BuildUserAgentFromProduct(product)); + command_line->AppendSwitchASCII( + switches::kUserAgent, + web::BuildUserAgentFromProduct(web::UserAgentType::MOBILE, product)); } // Freeform commandline flags. These are added last, so that any flags added
diff --git a/ios/chrome/browser/passwords/BUILD.gn b/ios/chrome/browser/passwords/BUILD.gn index 66481196..3503e85 100644 --- a/ios/chrome/browser/passwords/BUILD.gn +++ b/ios/chrome/browser/passwords/BUILD.gn
@@ -85,7 +85,7 @@ "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", - "//ios/third_party/material_components_ios:material_components_ios", + "//ios/third_party/material_components_ios", "//ios/web/common", "//ios/web/public/deprecated", "//ios/web/public/js_messaging",
diff --git a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm index 92742663..686a672 100644 --- a/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm +++ b/ios/chrome/browser/passwords/ios_chrome_password_manager_client.mm
@@ -59,7 +59,8 @@ IOSChromePasswordManagerClient::IOSChromePasswordManagerClient( id<PasswordManagerClientDelegate> delegate) : delegate_(delegate), - password_feature_manager_(GetSyncService(delegate_.browserState)), + password_feature_manager_(GetPrefs(), + GetSyncService(delegate_.browserState)), credentials_filter_( this, base::BindRepeating(&GetSyncService, delegate_.browserState)),
diff --git a/ios/chrome/browser/ui/alert_coordinator/BUILD.gn b/ios/chrome/browser/ui/alert_coordinator/BUILD.gn index 70dc733..ca012438 100644 --- a/ios/chrome/browser/ui/alert_coordinator/BUILD.gn +++ b/ios/chrome/browser/ui/alert_coordinator/BUILD.gn
@@ -66,7 +66,6 @@ "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ] libs = [ "UIKit.framework" ]
diff --git a/ios/chrome/browser/ui/alert_view/BUILD.gn b/ios/chrome/browser/ui/alert_view/BUILD.gn new file mode 100644 index 0000000..e7f5e8b --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/BUILD.gn
@@ -0,0 +1,35 @@ +# Copyright 2019 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. + +source_set("alert_view") { + sources = [ + "alert_action.h", + "alert_action.mm", + "alert_consumer.h", + "alert_view_controller.h", + "alert_view_controller.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/presenters", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", + "//ios/chrome/common/ui_util", + ] + libs = [ "UIKit.framework" ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "alert_view_controller_unittest.mm", + ] + deps = [ + ":alert_view", + "//testing/gtest:gtest", + ] +}
diff --git a/ios/chrome/browser/ui/alert_view_controller/OWNERS b/ios/chrome/browser/ui/alert_view/OWNERS similarity index 100% rename from ios/chrome/browser/ui/alert_view_controller/OWNERS rename to ios/chrome/browser/ui/alert_view/OWNERS
diff --git a/ios/chrome/browser/ui/alert_view/alert_action.h b/ios/chrome/browser/ui/alert_view/alert_action.h new file mode 100644 index 0000000..f636793 --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/alert_action.h
@@ -0,0 +1,35 @@ +// Copyright 2019 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. + +#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_ACTION_H_ +#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_ACTION_H_ + +#import <UIKit/UIKit.h> + +// This class is a replacement for UIAlertAction. UIAlertAction doesn't expose +// its handler, rendering it unreusable. +@interface AlertAction : NSObject + +// The title for this action. +@property(nonatomic, readonly) NSString* title; + +// The style for this action. Matches UIAlertAction style. +@property(nonatomic, readonly) UIAlertActionStyle style; + +// The unique identifier for the actions created. +@property(nonatomic, readonly) NSInteger uniqueIdentifier; + +// Block to be called when this action is triggered. +@property(nonatomic, readonly) void (^handler)(AlertAction* action); + +// Initializes an action with |title| and |handler|. ++ (instancetype)actionWithTitle:(NSString*)title + style:(UIAlertActionStyle)style + handler:(void (^)(AlertAction* action))handler; + +- (instancetype)init NS_UNAVAILABLE; + +@end + +#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_ACTION_H_
diff --git a/ios/chrome/browser/ui/alert_view/alert_action.mm b/ios/chrome/browser/ui/alert_view/alert_action.mm new file mode 100644 index 0000000..3ce748c --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/alert_action.mm
@@ -0,0 +1,33 @@ +// Copyright 2019 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. + +#import "ios/chrome/browser/ui/alert_view/alert_action.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +@implementation AlertAction + +- (instancetype)initWithTitle:(NSString*)title + style:(UIAlertActionStyle)style + handler:(void (^)(AlertAction* action))handler { + self = [super init]; + if (self) { + static NSInteger actionIdentifier = 0; + _uniqueIdentifier = ++actionIdentifier; + _title = [title copy]; + _handler = handler; + _style = style; + } + return self; +} + ++ (instancetype)actionWithTitle:(NSString*)title + style:(UIAlertActionStyle)style + handler:(void (^)(AlertAction* action))handler { + return [[AlertAction alloc] initWithTitle:title style:style handler:handler]; +} + +@end
diff --git a/ios/chrome/browser/ui/alert_view/alert_consumer.h b/ios/chrome/browser/ui/alert_view/alert_consumer.h new file mode 100644 index 0000000..6561510 --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/alert_consumer.h
@@ -0,0 +1,35 @@ +// Copyright 2019 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. + +#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_CONSUMER_H_ +#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_CONSUMER_H_ + +#import <Foundation/Foundation.h> + +@class AlertAction; +@class TextFieldConfiguration; + +// AlertConsumer defines methods to set the contents of an alert. +@protocol AlertConsumer <NSObject> + +// Sets the title of the alert. +- (void)setTitle:(NSString*)title; + +// Sets the message of the alert. +- (void)setMessage:(NSString*)message; + +// Sets the text field configurations for this alert. One text field will be +// created for each |TextFieldConfiguration|. +- (void)setTextFieldConfigurations: + (NSArray<TextFieldConfiguration*>*)textFieldConfigurations; + +// Sets the actions for this alert. +- (void)setActions:(NSArray<AlertAction*>*)actions; + +// Sets the accessibility identifier for the alert view. +- (void)setAlertAccessibilityIdentifier:(NSString*)identifier; + +@end + +#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_CONSUMER_H_
diff --git a/ios/chrome/browser/ui/alert_view/alert_view_controller.h b/ios/chrome/browser/ui/alert_view/alert_view_controller.h new file mode 100644 index 0000000..31cf9e1 --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/alert_view_controller.h
@@ -0,0 +1,24 @@ +// Copyright 2019 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. + +#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_VIEW_CONTROLLER_H_ +#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_VIEW_CONTROLLER_H_ + +#import <UIKit/UIKit.h> + +#import "ios/chrome/browser/ui/alert_view/alert_consumer.h" + +// This class is a replacement for UIAlertController that supports custom +// presentation styles, i.e. change modalPresentationStyle, +// modalTransitionStyle, or transitioningDelegate. The style is more similar to +// the rest of Chromium. Current limitations: +// Action Sheet Style is not supported. +@interface AlertViewController : UIViewController <AlertConsumer> + +// The text in the text fields after presentation. +@property(nonatomic, readonly) NSArray<NSString*>* textFieldResults; + +@end + +#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_VIEW_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/alert_view/alert_view_controller.mm b/ios/chrome/browser/ui/alert_view/alert_view_controller.mm new file mode 100644 index 0000000..d33a87d --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/alert_view_controller.mm
@@ -0,0 +1,541 @@ +// Copyright 2019 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. + +#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h" + +#include "base/logging.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/elements/gray_highlight_button.h" +#import "ios/chrome/browser/ui/elements/text_field_configuration.h" +#import "ios/chrome/browser/ui/util/uikit_ui_util.h" +#import "ios/chrome/common/colors/UIColor+cr_semantic_colors.h" +#import "ios/chrome/common/colors/semantic_color_names.h" +#import "ios/chrome/common/ui_util/constraints_ui_util.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +namespace { + +// Properties of the alert shadow. +constexpr CGFloat kShadowOffsetX = 0; +constexpr CGFloat kShadowOffsetY = 15; +constexpr CGFloat kShadowRadius = 13; +constexpr float kShadowOpacity = 0.12; + +// Properties of the alert view. +constexpr CGFloat kCornerRadius = 14; +constexpr CGFloat kAlertWidth = 270; +constexpr CGFloat kAlertWidthAccessibility = 402; +constexpr CGFloat kTextFieldCornerRadius = 5; +constexpr CGFloat kMinimumHeight = 30; +constexpr CGFloat kMinimumMargin = 4; + +// Inset at the top of the alert. Is always present. +constexpr CGFloat kAlertMarginTop = 22; +// Space before the actions and everything else. +constexpr CGFloat kAlertActionsSpacing = 12; + +// Insets for the content in the alert view. +constexpr CGFloat kTitleInsetLeading = 20; +constexpr CGFloat kTitleInsetBottom = 9; +constexpr CGFloat kTitleInsetTrailing = 20; + +constexpr CGFloat kMessageInsetLeading = 20; +constexpr CGFloat kMessageInsetBottom = 6; +constexpr CGFloat kMessageInsetTrailing = 20; + +constexpr CGFloat kButtonInsetTop = 13; +constexpr CGFloat kButtonInsetLeading = 20; +constexpr CGFloat kButtonInsetBottom = 13; +constexpr CGFloat kButtonInsetTrailing = 20; + +constexpr CGFloat kTextfieldStackInsetTop = 12; +constexpr CGFloat kTextfieldStackInsetLeading = 12; +constexpr CGFloat kTextfieldStackInsetTrailing = 12; + +constexpr CGFloat kTextfieldInset = 8; + +// This is how many bits UIViewAnimationCurve needs to be shifted to be in +// UIViewAnimationOptions format. Must match the one in UIView.h. +constexpr NSUInteger kUIViewAnimationCurveToOptionsShift = 16; + +} // namespace + +@interface AlertViewController () <UITextFieldDelegate, + UIGestureRecognizerDelegate> + +// The actions for to this alert. |copy| for safety against mutable objects. +@property(nonatomic, copy) NSArray<AlertAction*>* actions; + +// This maps UIButtons' tags with AlertActions' uniqueIdentifiers. +@property(nonatomic, strong) + NSMutableDictionary<NSNumber*, AlertAction*>* buttonAlertActionsDictionary; + +// This is the view with the shadow, white background and round corners. +// Everything will be added here. +@property(nonatomic, strong) UIView* contentView; + +// The message of the alert, will appear after the title. +@property(nonatomic, copy) NSString* message; + +// Text field configurations for this alert. One text field will be created for +// each |TextFieldConfiguration|. |copy| for safety against mutable objects. +@property(nonatomic, copy) + NSArray<TextFieldConfiguration*>* textFieldConfigurations; + +// The alert view's accessibility identifier. +@property(nonatomic, copy) NSString* alertAccessibilityIdentifier; + +// The text fields that had been added to this alert. +@property(nonatomic, strong) NSArray<UITextField*>* textFields; + +// Recognizer used to dismiss the keyboard when tapping outside the container +// view. +@property(nonatomic, strong) UITapGestureRecognizer* tapRecognizer; + +// Recognizer used to dismiss the keyboard swipping down the alert. +@property(nonatomic, strong) UISwipeGestureRecognizer* swipeRecognizer; + +// This is the last focused text field, the gestures to dismiss the keyboard +// will end up calling |resignFirstResponder| on this. +@property(nonatomic, weak) UITextField* lastFocusedTextField; + +// This holds the text field stack view. A reference is needed because its +// layer.borderColor is manually set. As that is a CGColor, it must be updated +// when the trait collection changes from light to dark mode. +@property(nonatomic, weak) UIView* textFieldStackHolder; + +@end + +@implementation AlertViewController + +#pragma mark - Public + +- (void)traitCollectionDidChange:(UITraitCollection*)previousTraitCollection { + [super traitCollectionDidChange:previousTraitCollection]; + + if (@available(iOS 13, *)) { + if ([self.traitCollection + hasDifferentColorAppearanceComparedToTraitCollection: + previousTraitCollection]) { + self.textFieldStackHolder.layer.borderColor = + UIColor.cr_separatorColor.CGColor; + } + } +} + +- (void)loadView { + [super loadView]; + self.view.backgroundColor = [UIColor colorNamed:kScrimBackgroundColor]; + self.view.accessibilityViewIsModal = YES; + + self.tapRecognizer = [[UITapGestureRecognizer alloc] + initWithTarget:self + action:@selector(dismissKeyboard)]; + self.tapRecognizer.enabled = NO; + self.tapRecognizer.delegate = self; + [self.view addGestureRecognizer:self.tapRecognizer]; + + self.contentView = [[UIView alloc] init]; + self.contentView.accessibilityIdentifier = self.alertAccessibilityIdentifier; + self.contentView.clipsToBounds = YES; + self.contentView.backgroundColor = UIColor.cr_systemBackgroundColor; + self.contentView.layer.cornerRadius = kCornerRadius; + self.contentView.layer.shadowOffset = + CGSizeMake(kShadowOffsetX, kShadowOffsetY); + self.contentView.layer.shadowRadius = kShadowRadius; + self.contentView.layer.shadowOpacity = kShadowOpacity; + self.contentView.translatesAutoresizingMaskIntoConstraints = NO; + [self.view addSubview:self.contentView]; + + self.swipeRecognizer = [[UISwipeGestureRecognizer alloc] + initWithTarget:self + action:@selector(dismissKeyboard)]; + self.swipeRecognizer.direction = UISwipeGestureRecognizerDirectionDown; + self.swipeRecognizer.enabled = NO; + [self.contentView addGestureRecognizer:self.swipeRecognizer]; + + auto GetAlertWidth = ^CGFloat(void) { + BOOL isAccessibilityContentSize = + UIContentSizeCategoryIsAccessibilityCategory( + [UIApplication sharedApplication].preferredContentSizeCategory); + return isAccessibilityContentSize ? kAlertWidthAccessibility : kAlertWidth; + }; + + NSLayoutConstraint* widthConstraint = + [self.contentView.widthAnchor constraintEqualToConstant:GetAlertWidth()]; + widthConstraint.priority = UILayoutPriorityRequired - 1; + + [[NSNotificationCenter defaultCenter] + addObserverForName:UIContentSizeCategoryDidChangeNotification + object:nil + queue:[NSOperationQueue mainQueue] + usingBlock:^(NSNotification* _Nonnull note) { + widthConstraint.constant = GetAlertWidth(); + }]; + [NSLayoutConstraint activateConstraints:@[ + widthConstraint, + + // Centering + [self.contentView.centerXAnchor + constraintEqualToAnchor:self.view.safeAreaLayoutGuide.centerXAnchor], + [self.contentView.centerYAnchor + constraintEqualToAnchor:self.view.safeAreaLayoutGuide.centerYAnchor], + + // Minimum Size + [self.contentView.heightAnchor + constraintGreaterThanOrEqualToConstant:kMinimumHeight], + + // Maximum Size + [self.contentView.topAnchor + constraintGreaterThanOrEqualToAnchor:self.view.safeAreaLayoutGuide + .topAnchor + constant:kMinimumMargin], + [self.contentView.bottomAnchor + constraintLessThanOrEqualToAnchor:self.view.safeAreaLayoutGuide + .bottomAnchor + constant:-kMinimumMargin], + [self.contentView.trailingAnchor + constraintLessThanOrEqualToAnchor:self.view.safeAreaLayoutGuide + .trailingAnchor + constant:-kMinimumMargin], + [self.contentView.leadingAnchor + constraintGreaterThanOrEqualToAnchor:self.view.safeAreaLayoutGuide + .leadingAnchor + constant:kMinimumMargin], + + ]]; + + UIScrollView* scrollView = [[UIScrollView alloc] init]; + scrollView.delaysContentTouches = NO; + scrollView.showsVerticalScrollIndicator = YES; + scrollView.showsHorizontalScrollIndicator = NO; + scrollView.translatesAutoresizingMaskIntoConstraints = NO; + scrollView.scrollEnabled = YES; + scrollView.contentInsetAdjustmentBehavior = + UIScrollViewContentInsetAdjustmentAlways; + [self.contentView addSubview:scrollView]; + AddSameConstraints(scrollView, self.contentView); + + UIStackView* stackView = [[UIStackView alloc] init]; + stackView.axis = UILayoutConstraintAxisVertical; + stackView.translatesAutoresizingMaskIntoConstraints = NO; + stackView.alignment = UIStackViewAlignmentCenter; + [scrollView addSubview:stackView]; + + NSLayoutConstraint* heightConstraint = [scrollView.heightAnchor + constraintEqualToAnchor:scrollView.contentLayoutGuide.heightAnchor + multiplier:1]; + // UILayoutPriorityDefaultHigh is the default priority for content + // compression. Setting this lower avoids compressing the content of the + // scroll view. + heightConstraint.priority = UILayoutPriorityDefaultHigh - 1; + heightConstraint.active = YES; + + ChromeDirectionalEdgeInsets stackViewInsets = + ChromeDirectionalEdgeInsetsMake(kAlertMarginTop, 0, 0, 0); + AddSameConstraintsWithInsets(stackView, scrollView, stackViewInsets); + + if (self.title.length) { + UILabel* titleLabel = [[UILabel alloc] init]; + titleLabel.numberOfLines = 0; + titleLabel.font = + [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]; + titleLabel.adjustsFontForContentSizeCategory = YES; + titleLabel.textAlignment = NSTextAlignmentCenter; + titleLabel.text = self.title; + titleLabel.translatesAutoresizingMaskIntoConstraints = NO; + [stackView addArrangedSubview:titleLabel]; + [stackView setCustomSpacing:kTitleInsetBottom afterView:titleLabel]; + + ChromeDirectionalEdgeInsets titleInsets = ChromeDirectionalEdgeInsetsMake( + 0, kTitleInsetLeading, 0, kTitleInsetTrailing); + AddSameConstraintsToSidesWithInsets( + titleLabel, self.contentView, + LayoutSides::kTrailing | LayoutSides::kLeading, titleInsets); + } + + if (self.message.length) { + UILabel* messageLabel = [[UILabel alloc] init]; + messageLabel.numberOfLines = 0; + messageLabel.font = + [UIFont preferredFontForTextStyle:UIFontTextStyleFootnote]; + messageLabel.adjustsFontForContentSizeCategory = YES; + messageLabel.textAlignment = NSTextAlignmentCenter; + messageLabel.text = self.message; + messageLabel.translatesAutoresizingMaskIntoConstraints = NO; + [stackView addArrangedSubview:messageLabel]; + [stackView setCustomSpacing:kMessageInsetBottom afterView:messageLabel]; + + ChromeDirectionalEdgeInsets messageInsets = ChromeDirectionalEdgeInsetsMake( + 0, kMessageInsetLeading, 0, kMessageInsetTrailing); + AddSameConstraintsToSidesWithInsets( + messageLabel, self.contentView, + LayoutSides::kTrailing | LayoutSides::kLeading, messageInsets); + } + + if (self.textFieldConfigurations.count) { + // |stackHolder| has the background, border and round corners of the stacked + // fields. + UIView* stackHolder = [[UIView alloc] init]; + stackHolder.layer.cornerRadius = kTextFieldCornerRadius; + stackHolder.layer.borderColor = UIColor.cr_separatorColor.CGColor; + if (@available(iOS 13, *)) { + // Use performAsCurrentTraitCollection to get the correct CGColor for the + // given dynamic color and current userInterfaceStyle. + [self.traitCollection performAsCurrentTraitCollection:^{ + stackHolder.layer.borderColor = UIColor.cr_separatorColor.CGColor; + }]; + } + stackHolder.layer.borderWidth = 1.0 / [UIScreen mainScreen].scale; + stackHolder.clipsToBounds = YES; + stackHolder.backgroundColor = UIColor.cr_secondarySystemBackgroundColor; + stackHolder.translatesAutoresizingMaskIntoConstraints = NO; + self.textFieldStackHolder = stackHolder; + + // Updates the custom space before the text fields to account for their + // inset. + UIView* previousView = stackView.arrangedSubviews.lastObject; + if (previousView) { + CGFloat spaceBefore = [stackView customSpacingAfterView:previousView]; + [stackView setCustomSpacing:kTextfieldStackInsetTop + spaceBefore + afterView:previousView]; + } else { + // There should always be a title or message. + NOTREACHED() << "Presenting alert without a title or message."; + } + [stackView addArrangedSubview:stackHolder]; + + ChromeDirectionalEdgeInsets stackHolderContentInsets = + ChromeDirectionalEdgeInsetsMake(0, kTextfieldStackInsetLeading, 0, + kTextfieldStackInsetTrailing); + AddSameConstraintsToSidesWithInsets( + stackHolder, self.contentView, + LayoutSides::kTrailing | LayoutSides::kLeading, + stackHolderContentInsets); + + UIStackView* fieldStack = [[UIStackView alloc] init]; + fieldStack.axis = UILayoutConstraintAxisVertical; + fieldStack.translatesAutoresizingMaskIntoConstraints = NO; + fieldStack.spacing = kTextfieldInset; + fieldStack.alignment = UIStackViewAlignmentCenter; + [stackHolder addSubview:fieldStack]; + ChromeDirectionalEdgeInsets fieldStackContentInsets = + ChromeDirectionalEdgeInsetsMake(kTextfieldInset, 0.0, kTextfieldInset, + 0.0); + AddSameConstraintsWithInsets(fieldStack, stackHolder, + fieldStackContentInsets); + + NSMutableArray<UITextField*>* textFields = [[NSMutableArray alloc] + initWithCapacity:self.textFieldConfigurations.count]; + for (TextFieldConfiguration* textFieldConfiguration in self + .textFieldConfigurations) { + if (textFieldConfiguration != + [self.textFieldConfigurations firstObject]) { + UIView* hairline = [[UIView alloc] init]; + hairline.backgroundColor = UIColor.cr_separatorColor; + hairline.translatesAutoresizingMaskIntoConstraints = NO; + [fieldStack addArrangedSubview:hairline]; + CGFloat pixelHeight = 1.0 / [UIScreen mainScreen].scale; + [hairline.heightAnchor constraintEqualToConstant:pixelHeight].active = + YES; + AddSameConstraintsToSides( + fieldStack, hairline, + LayoutSides::kTrailing | LayoutSides::kLeading); + } + UITextField* textField = [[UITextField alloc] init]; + textField.text = textFieldConfiguration.text; + textField.placeholder = textFieldConfiguration.placeholder; + textField.secureTextEntry = textFieldConfiguration.secureTextEntry; + textField.accessibilityIdentifier = + textFieldConfiguration.accessibilityIdentifier; + textField.translatesAutoresizingMaskIntoConstraints = NO; + textField.delegate = self; + textField.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody]; + textField.adjustsFontForContentSizeCategory = YES; + + [fieldStack addArrangedSubview:textField]; + ChromeDirectionalEdgeInsets fieldInsets = ChromeDirectionalEdgeInsetsMake( + 0.0, kTextfieldInset, 0.0, kTextfieldInset); + AddSameConstraintsToSidesWithInsets( + textField, fieldStack, LayoutSides::kTrailing | LayoutSides::kLeading, + fieldInsets); + [textFields addObject:textField]; + } + self.textFields = textFields; + } + + UIView* lastArrangedView = stackView.arrangedSubviews.lastObject; + if (lastArrangedView) { + [stackView setCustomSpacing:kAlertActionsSpacing + afterView:lastArrangedView]; + } + + self.buttonAlertActionsDictionary = [[NSMutableDictionary alloc] init]; + for (AlertAction* action in self.actions) { + UIView* hairline = [[UIView alloc] init]; + hairline.backgroundColor = UIColor.cr_separatorColor; + hairline.translatesAutoresizingMaskIntoConstraints = NO; + [stackView addArrangedSubview:hairline]; + + GrayHighlightButton* button = [[GrayHighlightButton alloc] init]; + UIFont* font = nil; + UIColor* textColor = nil; + if (action.style == UIAlertActionStyleDefault) { + font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody]; + textColor = [UIColor colorNamed:kBlueColor]; + } else if (action.style == UIAlertActionStyleCancel) { + font = [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]; + textColor = [UIColor colorNamed:kBlueColor]; + } else { // Style is UIAlertActionStyleDestructive + font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody]; + textColor = [UIColor colorNamed:kRedColor]; + } + button.titleLabel.font = font; + button.titleLabel.adjustsFontForContentSizeCategory = YES; + + [button setTitleColor:textColor forState:UIControlStateNormal]; + [button setTitle:action.title forState:UIControlStateNormal]; + + button.contentHorizontalAlignment = + UIControlContentHorizontalAlignmentCenter; + [button addTarget:self + action:@selector(didSelectActionForButton:) + forControlEvents:UIControlEventTouchUpInside]; + button.translatesAutoresizingMaskIntoConstraints = NO; + button.contentEdgeInsets = + UIEdgeInsetsMake(kButtonInsetTop, kButtonInsetLeading, + kButtonInsetBottom, kButtonInsetTrailing); + [stackView addArrangedSubview:button]; + + CGFloat pixelHeight = 1.0 / [UIScreen mainScreen].scale; + [hairline.heightAnchor constraintEqualToConstant:pixelHeight].active = YES; + AddSameConstraintsToSides(hairline, button, + (LayoutSides::kTrailing | LayoutSides::kLeading)); + + AddSameConstraintsToSides(button, self.contentView, + LayoutSides::kTrailing | LayoutSides::kLeading); + + button.tag = action.uniqueIdentifier; + self.buttonAlertActionsDictionary[@(action.uniqueIdentifier)] = action; + } + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(handleKeyboardWillShow:) + name:UIKeyboardWillShowNotification + object:nil]; + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(handleKeyboardWillHide:) + name:UIKeyboardWillHideNotification + object:nil]; +} + +#pragma mark - Getters + +- (NSArray<NSString*>*)textFieldResults { + if (!self.textFields) { + return nil; + } + NSMutableArray<NSString*>* results = + [[NSMutableArray alloc] initWithCapacity:self.textFields.count]; + for (UITextField* textField in self.textFields) { + [results addObject:textField.text]; + } + return results; +} + +#pragma mark - UIGestureRecognizerDelegate + +- (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer + shouldReceiveTouch:(UITouch*)touch { + if (self.tapRecognizer != gestureRecognizer) { + return YES; + } + CGPoint locationInContentView = [touch locationInView:self.contentView]; + return !CGRectContainsPoint(self.contentView.bounds, locationInContentView); +} + +#pragma mark - UITextFieldDelegate + +- (void)textFieldDidBeginEditing:(UITextField*)textField { + self.lastFocusedTextField = textField; +} + +- (BOOL)textFieldShouldReturn:(UITextField*)textField { + NSUInteger index = [self.textFields indexOfObject:textField]; + if (index + 1 < self.textFields.count) { + [self.textFields[index + 1] becomeFirstResponder]; + } else { + [textField resignFirstResponder]; + } + return NO; +} + +#pragma mark - Private + +- (void)handleKeyboardWillShow:(NSNotification*)notification { + CGRect keyboardFrame = + [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue]; + CGRect viewFrameInWindow = [self.view convertRect:self.view.bounds + toView:nil]; + CGRect intersectedFrame = + CGRectIntersection(keyboardFrame, viewFrameInWindow); + + CGFloat additionalBottomInset = + intersectedFrame.size.height - self.view.safeAreaInsets.bottom; + + if (additionalBottomInset > 0) { + self.additionalSafeAreaInsets = + UIEdgeInsetsMake(0, 0, additionalBottomInset, 0); + [self animateLayoutFromKeyboardNotification:notification]; + } + + self.tapRecognizer.enabled = YES; + self.swipeRecognizer.enabled = YES; +} + +- (void)handleKeyboardWillHide:(NSNotification*)notification { + self.additionalSafeAreaInsets = UIEdgeInsetsZero; + [self animateLayoutFromKeyboardNotification:notification]; + + self.tapRecognizer.enabled = NO; + self.swipeRecognizer.enabled = NO; +} + +- (void)animateLayoutFromKeyboardNotification:(NSNotification*)notification { + double duration = + [notification.userInfo[UIKeyboardAnimationDurationUserInfoKey] + doubleValue]; + UIViewAnimationCurve animationCurve = static_cast<UIViewAnimationCurve>( + [notification.userInfo[UIKeyboardAnimationCurveUserInfoKey] + integerValue]); + UIViewAnimationOptions options = animationCurve + << kUIViewAnimationCurveToOptionsShift; + + [UIView animateWithDuration:duration + delay:0 + options:options + animations:^{ + [self.view layoutIfNeeded]; + } + completion:nil]; +} + +- (void)didSelectActionForButton:(UIButton*)button { + AlertAction* action = self.buttonAlertActionsDictionary[@(button.tag)]; + if (action.handler) { + action.handler(action); + } +} + +- (void)dismissKeyboard { + [self.lastFocusedTextField resignFirstResponder]; +} + +@end
diff --git a/ios/chrome/browser/ui/alert_view/alert_view_controller_unittest.mm b/ios/chrome/browser/ui/alert_view/alert_view_controller_unittest.mm new file mode 100644 index 0000000..88f9f30 --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/alert_view_controller_unittest.mm
@@ -0,0 +1,45 @@ +// Copyright 2019 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. + +#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h" + +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#include "testing/platform_test.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +using AlertViewControllerTest = PlatformTest; + +// Tests AlertViewController can be initiliazed. +TEST_F(AlertViewControllerTest, Init) { + AlertViewController* alert = [[AlertViewController alloc] init]; + EXPECT_TRUE(alert); +} + +// Tests there are no circular references in a simple init. +TEST_F(AlertViewControllerTest, Dealloc) { + __weak AlertViewController* weakAlert = nil; + @autoreleasepool { + AlertViewController* alert = [[AlertViewController alloc] init]; + weakAlert = alert; + } + EXPECT_FALSE(weakAlert); +} + +// Tests there are no circular references in an alert with actions. +TEST_F(AlertViewControllerTest, DeallocWithActions) { + __weak AlertViewController* weakAlert = nil; + @autoreleasepool { + AlertViewController* alert = [[AlertViewController alloc] init]; + AlertAction* action = [AlertAction actionWithTitle:@"OK" + style:UIAlertActionStyleDefault + handler:^(AlertAction* action){ + }]; + [alert setActions:@[ action ]]; + weakAlert = alert; + } + EXPECT_FALSE(weakAlert); +}
diff --git a/ios/chrome/browser/ui/alert_view/test/BUILD.gn b/ios/chrome/browser/ui/alert_view/test/BUILD.gn new file mode 100644 index 0000000..4df88ea --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/test/BUILD.gn
@@ -0,0 +1,19 @@ +# Copyright 2019 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. + +source_set("test") { + testonly = true + sources = [ + "fake_alert_consumer.h", + "fake_alert_consumer.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/ui/alert_view", + "//testing/gtest", + ] +}
diff --git a/ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h b/ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h new file mode 100644 index 0000000..636c5c6 --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h
@@ -0,0 +1,22 @@ +// Copyright 2019 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. + +#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_TEST_FAKE_ALERT_CONSUMER_H_ +#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_TEST_FAKE_ALERT_CONSUMER_H_ + +#import "ios/chrome/browser/ui/alert_view/alert_consumer.h" + +// Fake version of AlertConsumer that allows read access to consumed values. +@interface FakeAlertConsumer : NSObject <AlertConsumer> + +@property(nonatomic, copy) NSString* title; +@property(nonatomic, copy) NSString* message; +@property(nonatomic, copy) + NSArray<TextFieldConfiguration*>* textFieldConfigurations; +@property(nonatomic, copy) NSArray<AlertAction*>* actions; +@property(nonatomic, copy) NSString* alertAccessibilityIdentifier; + +@end + +#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_TEST_FAKE_ALERT_CONSUMER_H_
diff --git a/ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.mm b/ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.mm new file mode 100644 index 0000000..bdbb83e --- /dev/null +++ b/ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.mm
@@ -0,0 +1,12 @@ +// Copyright 2019 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. + +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" + +#if !defined(__has_feature) || !__has_feature(objc_arc) +#error "This file requires ARC support." +#endif + +@implementation FakeAlertConsumer +@end
diff --git a/ios/chrome/browser/ui/alert_view_controller/BUILD.gn b/ios/chrome/browser/ui/alert_view_controller/BUILD.gn deleted file mode 100644 index 531ec33..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/BUILD.gn +++ /dev/null
@@ -1,35 +0,0 @@ -# Copyright 2019 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. - -source_set("alert_view_controller") { - sources = [ - "alert_action.h", - "alert_action.mm", - "alert_consumer.h", - "alert_view_controller.h", - "alert_view_controller.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui/elements", - "//ios/chrome/browser/ui/presenters", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", - ] - libs = [ "UIKit.framework" ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "alert_view_controller_unittest.mm", - ] - deps = [ - ":alert_view_controller", - "//testing/gtest:gtest", - ] -}
diff --git a/ios/chrome/browser/ui/alert_view_controller/alert_action.h b/ios/chrome/browser/ui/alert_view_controller/alert_action.h deleted file mode 100644 index 19edff9d..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/alert_action.h +++ /dev/null
@@ -1,35 +0,0 @@ -// Copyright 2019 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. - -#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_ACTION_H_ -#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_ACTION_H_ - -#import <UIKit/UIKit.h> - -// This class is a replacement for UIAlertAction. UIAlertAction doesn't expose -// its handler, rendering it unreusable. -@interface AlertAction : NSObject - -// The title for this action. -@property(nonatomic, readonly) NSString* title; - -// The style for this action. Matches UIAlertAction style. -@property(nonatomic, readonly) UIAlertActionStyle style; - -// The unique identifier for the actions created. -@property(nonatomic, readonly) NSInteger uniqueIdentifier; - -// Block to be called when this action is triggered. -@property(nonatomic, readonly) void (^handler)(AlertAction* action); - -// Initializes an action with |title| and |handler|. -+ (instancetype)actionWithTitle:(NSString*)title - style:(UIAlertActionStyle)style - handler:(void (^)(AlertAction* action))handler; - -- (instancetype)init NS_UNAVAILABLE; - -@end - -#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_ACTION_H_
diff --git a/ios/chrome/browser/ui/alert_view_controller/alert_action.mm b/ios/chrome/browser/ui/alert_view_controller/alert_action.mm deleted file mode 100644 index 375cd98..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/alert_action.mm +++ /dev/null
@@ -1,33 +0,0 @@ -// Copyright 2019 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. - -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -@implementation AlertAction - -- (instancetype)initWithTitle:(NSString*)title - style:(UIAlertActionStyle)style - handler:(void (^)(AlertAction* action))handler { - self = [super init]; - if (self) { - static NSInteger actionIdentifier = 0; - _uniqueIdentifier = ++actionIdentifier; - _title = [title copy]; - _handler = handler; - _style = style; - } - return self; -} - -+ (instancetype)actionWithTitle:(NSString*)title - style:(UIAlertActionStyle)style - handler:(void (^)(AlertAction* action))handler { - return [[AlertAction alloc] initWithTitle:title style:style handler:handler]; -} - -@end
diff --git a/ios/chrome/browser/ui/alert_view_controller/alert_consumer.h b/ios/chrome/browser/ui/alert_view_controller/alert_consumer.h deleted file mode 100644 index 72261a6..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/alert_consumer.h +++ /dev/null
@@ -1,35 +0,0 @@ -// Copyright 2019 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. - -#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_CONSUMER_H_ -#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_CONSUMER_H_ - -#import <Foundation/Foundation.h> - -@class AlertAction; -@class TextFieldConfiguration; - -// AlertConsumer defines methods to set the contents of an alert. -@protocol AlertConsumer <NSObject> - -// Sets the title of the alert. -- (void)setTitle:(NSString*)title; - -// Sets the message of the alert. -- (void)setMessage:(NSString*)message; - -// Sets the text field configurations for this alert. One text field will be -// created for each |TextFieldConfiguration|. -- (void)setTextFieldConfigurations: - (NSArray<TextFieldConfiguration*>*)textFieldConfigurations; - -// Sets the actions for this alert. -- (void)setActions:(NSArray<AlertAction*>*)actions; - -// Sets the accessibility identifier for the alert view. -- (void)setAlertAccessibilityIdentifier:(NSString*)identifier; - -@end - -#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_CONSUMER_H_
diff --git a/ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h b/ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h deleted file mode 100644 index 925191bf..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h +++ /dev/null
@@ -1,24 +0,0 @@ -// Copyright 2019 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. - -#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_VIEW_CONTROLLER_H_ -#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_VIEW_CONTROLLER_H_ - -#import <UIKit/UIKit.h> - -#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h" - -// This class is a replacement for UIAlertController that supports custom -// presentation styles, i.e. change modalPresentationStyle, -// modalTransitionStyle, or transitioningDelegate. The style is more similar to -// the rest of Chromium. Current limitations: -// Action Sheet Style is not supported. -@interface AlertViewController : UIViewController <AlertConsumer> - -// The text in the text fields after presentation. -@property(nonatomic, readonly) NSArray<NSString*>* textFieldResults; - -@end - -#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_VIEW_CONTROLLER_H_
diff --git a/ios/chrome/browser/ui/alert_view_controller/alert_view_controller.mm b/ios/chrome/browser/ui/alert_view_controller/alert_view_controller.mm deleted file mode 100644 index afb379a..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/alert_view_controller.mm +++ /dev/null
@@ -1,541 +0,0 @@ -// Copyright 2019 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. - -#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h" - -#include "base/logging.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/elements/gray_highlight_button.h" -#import "ios/chrome/browser/ui/elements/text_field_configuration.h" -#import "ios/chrome/browser/ui/util/uikit_ui_util.h" -#import "ios/chrome/common/colors/UIColor+cr_semantic_colors.h" -#import "ios/chrome/common/colors/semantic_color_names.h" -#import "ios/chrome/common/ui_util/constraints_ui_util.h" - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -namespace { - -// Properties of the alert shadow. -constexpr CGFloat kShadowOffsetX = 0; -constexpr CGFloat kShadowOffsetY = 15; -constexpr CGFloat kShadowRadius = 13; -constexpr float kShadowOpacity = 0.12; - -// Properties of the alert view. -constexpr CGFloat kCornerRadius = 14; -constexpr CGFloat kAlertWidth = 270; -constexpr CGFloat kAlertWidthAccessibility = 402; -constexpr CGFloat kTextFieldCornerRadius = 5; -constexpr CGFloat kMinimumHeight = 30; -constexpr CGFloat kMinimumMargin = 4; - -// Inset at the top of the alert. Is always present. -constexpr CGFloat kAlertMarginTop = 22; -// Space before the actions and everything else. -constexpr CGFloat kAlertActionsSpacing = 12; - -// Insets for the content in the alert view. -constexpr CGFloat kTitleInsetLeading = 20; -constexpr CGFloat kTitleInsetBottom = 9; -constexpr CGFloat kTitleInsetTrailing = 20; - -constexpr CGFloat kMessageInsetLeading = 20; -constexpr CGFloat kMessageInsetBottom = 6; -constexpr CGFloat kMessageInsetTrailing = 20; - -constexpr CGFloat kButtonInsetTop = 13; -constexpr CGFloat kButtonInsetLeading = 20; -constexpr CGFloat kButtonInsetBottom = 13; -constexpr CGFloat kButtonInsetTrailing = 20; - -constexpr CGFloat kTextfieldStackInsetTop = 12; -constexpr CGFloat kTextfieldStackInsetLeading = 12; -constexpr CGFloat kTextfieldStackInsetTrailing = 12; - -constexpr CGFloat kTextfieldInset = 8; - -// This is how many bits UIViewAnimationCurve needs to be shifted to be in -// UIViewAnimationOptions format. Must match the one in UIView.h. -constexpr NSUInteger kUIViewAnimationCurveToOptionsShift = 16; - -} // namespace - -@interface AlertViewController () <UITextFieldDelegate, - UIGestureRecognizerDelegate> - -// The actions for to this alert. |copy| for safety against mutable objects. -@property(nonatomic, copy) NSArray<AlertAction*>* actions; - -// This maps UIButtons' tags with AlertActions' uniqueIdentifiers. -@property(nonatomic, strong) - NSMutableDictionary<NSNumber*, AlertAction*>* buttonAlertActionsDictionary; - -// This is the view with the shadow, white background and round corners. -// Everything will be added here. -@property(nonatomic, strong) UIView* contentView; - -// The message of the alert, will appear after the title. -@property(nonatomic, copy) NSString* message; - -// Text field configurations for this alert. One text field will be created for -// each |TextFieldConfiguration|. |copy| for safety against mutable objects. -@property(nonatomic, copy) - NSArray<TextFieldConfiguration*>* textFieldConfigurations; - -// The alert view's accessibility identifier. -@property(nonatomic, copy) NSString* alertAccessibilityIdentifier; - -// The text fields that had been added to this alert. -@property(nonatomic, strong) NSArray<UITextField*>* textFields; - -// Recognizer used to dismiss the keyboard when tapping outside the container -// view. -@property(nonatomic, strong) UITapGestureRecognizer* tapRecognizer; - -// Recognizer used to dismiss the keyboard swipping down the alert. -@property(nonatomic, strong) UISwipeGestureRecognizer* swipeRecognizer; - -// This is the last focused text field, the gestures to dismiss the keyboard -// will end up calling |resignFirstResponder| on this. -@property(nonatomic, weak) UITextField* lastFocusedTextField; - -// This holds the text field stack view. A reference is needed because its -// layer.borderColor is manually set. As that is a CGColor, it must be updated -// when the trait collection changes from light to dark mode. -@property(nonatomic, weak) UIView* textFieldStackHolder; - -@end - -@implementation AlertViewController - -#pragma mark - Public - -- (void)traitCollectionDidChange:(UITraitCollection*)previousTraitCollection { - [super traitCollectionDidChange:previousTraitCollection]; - - if (@available(iOS 13, *)) { - if ([self.traitCollection - hasDifferentColorAppearanceComparedToTraitCollection: - previousTraitCollection]) { - self.textFieldStackHolder.layer.borderColor = - UIColor.cr_separatorColor.CGColor; - } - } -} - -- (void)loadView { - [super loadView]; - self.view.backgroundColor = [UIColor colorNamed:kScrimBackgroundColor]; - self.view.accessibilityViewIsModal = YES; - - self.tapRecognizer = [[UITapGestureRecognizer alloc] - initWithTarget:self - action:@selector(dismissKeyboard)]; - self.tapRecognizer.enabled = NO; - self.tapRecognizer.delegate = self; - [self.view addGestureRecognizer:self.tapRecognizer]; - - self.contentView = [[UIView alloc] init]; - self.contentView.accessibilityIdentifier = self.alertAccessibilityIdentifier; - self.contentView.clipsToBounds = YES; - self.contentView.backgroundColor = UIColor.cr_systemBackgroundColor; - self.contentView.layer.cornerRadius = kCornerRadius; - self.contentView.layer.shadowOffset = - CGSizeMake(kShadowOffsetX, kShadowOffsetY); - self.contentView.layer.shadowRadius = kShadowRadius; - self.contentView.layer.shadowOpacity = kShadowOpacity; - self.contentView.translatesAutoresizingMaskIntoConstraints = NO; - [self.view addSubview:self.contentView]; - - self.swipeRecognizer = [[UISwipeGestureRecognizer alloc] - initWithTarget:self - action:@selector(dismissKeyboard)]; - self.swipeRecognizer.direction = UISwipeGestureRecognizerDirectionDown; - self.swipeRecognizer.enabled = NO; - [self.contentView addGestureRecognizer:self.swipeRecognizer]; - - auto GetAlertWidth = ^CGFloat(void) { - BOOL isAccessibilityContentSize = - UIContentSizeCategoryIsAccessibilityCategory( - [UIApplication sharedApplication].preferredContentSizeCategory); - return isAccessibilityContentSize ? kAlertWidthAccessibility : kAlertWidth; - }; - - NSLayoutConstraint* widthConstraint = - [self.contentView.widthAnchor constraintEqualToConstant:GetAlertWidth()]; - widthConstraint.priority = UILayoutPriorityRequired - 1; - - [[NSNotificationCenter defaultCenter] - addObserverForName:UIContentSizeCategoryDidChangeNotification - object:nil - queue:[NSOperationQueue mainQueue] - usingBlock:^(NSNotification* _Nonnull note) { - widthConstraint.constant = GetAlertWidth(); - }]; - [NSLayoutConstraint activateConstraints:@[ - widthConstraint, - - // Centering - [self.contentView.centerXAnchor - constraintEqualToAnchor:self.view.safeAreaLayoutGuide.centerXAnchor], - [self.contentView.centerYAnchor - constraintEqualToAnchor:self.view.safeAreaLayoutGuide.centerYAnchor], - - // Minimum Size - [self.contentView.heightAnchor - constraintGreaterThanOrEqualToConstant:kMinimumHeight], - - // Maximum Size - [self.contentView.topAnchor - constraintGreaterThanOrEqualToAnchor:self.view.safeAreaLayoutGuide - .topAnchor - constant:kMinimumMargin], - [self.contentView.bottomAnchor - constraintLessThanOrEqualToAnchor:self.view.safeAreaLayoutGuide - .bottomAnchor - constant:-kMinimumMargin], - [self.contentView.trailingAnchor - constraintLessThanOrEqualToAnchor:self.view.safeAreaLayoutGuide - .trailingAnchor - constant:-kMinimumMargin], - [self.contentView.leadingAnchor - constraintGreaterThanOrEqualToAnchor:self.view.safeAreaLayoutGuide - .leadingAnchor - constant:kMinimumMargin], - - ]]; - - UIScrollView* scrollView = [[UIScrollView alloc] init]; - scrollView.delaysContentTouches = NO; - scrollView.showsVerticalScrollIndicator = YES; - scrollView.showsHorizontalScrollIndicator = NO; - scrollView.translatesAutoresizingMaskIntoConstraints = NO; - scrollView.scrollEnabled = YES; - scrollView.contentInsetAdjustmentBehavior = - UIScrollViewContentInsetAdjustmentAlways; - [self.contentView addSubview:scrollView]; - AddSameConstraints(scrollView, self.contentView); - - UIStackView* stackView = [[UIStackView alloc] init]; - stackView.axis = UILayoutConstraintAxisVertical; - stackView.translatesAutoresizingMaskIntoConstraints = NO; - stackView.alignment = UIStackViewAlignmentCenter; - [scrollView addSubview:stackView]; - - NSLayoutConstraint* heightConstraint = [scrollView.heightAnchor - constraintEqualToAnchor:scrollView.contentLayoutGuide.heightAnchor - multiplier:1]; - // UILayoutPriorityDefaultHigh is the default priority for content - // compression. Setting this lower avoids compressing the content of the - // scroll view. - heightConstraint.priority = UILayoutPriorityDefaultHigh - 1; - heightConstraint.active = YES; - - ChromeDirectionalEdgeInsets stackViewInsets = - ChromeDirectionalEdgeInsetsMake(kAlertMarginTop, 0, 0, 0); - AddSameConstraintsWithInsets(stackView, scrollView, stackViewInsets); - - if (self.title.length) { - UILabel* titleLabel = [[UILabel alloc] init]; - titleLabel.numberOfLines = 0; - titleLabel.font = - [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]; - titleLabel.adjustsFontForContentSizeCategory = YES; - titleLabel.textAlignment = NSTextAlignmentCenter; - titleLabel.text = self.title; - titleLabel.translatesAutoresizingMaskIntoConstraints = NO; - [stackView addArrangedSubview:titleLabel]; - [stackView setCustomSpacing:kTitleInsetBottom afterView:titleLabel]; - - ChromeDirectionalEdgeInsets titleInsets = ChromeDirectionalEdgeInsetsMake( - 0, kTitleInsetLeading, 0, kTitleInsetTrailing); - AddSameConstraintsToSidesWithInsets( - titleLabel, self.contentView, - LayoutSides::kTrailing | LayoutSides::kLeading, titleInsets); - } - - if (self.message.length) { - UILabel* messageLabel = [[UILabel alloc] init]; - messageLabel.numberOfLines = 0; - messageLabel.font = - [UIFont preferredFontForTextStyle:UIFontTextStyleFootnote]; - messageLabel.adjustsFontForContentSizeCategory = YES; - messageLabel.textAlignment = NSTextAlignmentCenter; - messageLabel.text = self.message; - messageLabel.translatesAutoresizingMaskIntoConstraints = NO; - [stackView addArrangedSubview:messageLabel]; - [stackView setCustomSpacing:kMessageInsetBottom afterView:messageLabel]; - - ChromeDirectionalEdgeInsets messageInsets = ChromeDirectionalEdgeInsetsMake( - 0, kMessageInsetLeading, 0, kMessageInsetTrailing); - AddSameConstraintsToSidesWithInsets( - messageLabel, self.contentView, - LayoutSides::kTrailing | LayoutSides::kLeading, messageInsets); - } - - if (self.textFieldConfigurations.count) { - // |stackHolder| has the background, border and round corners of the stacked - // fields. - UIView* stackHolder = [[UIView alloc] init]; - stackHolder.layer.cornerRadius = kTextFieldCornerRadius; - stackHolder.layer.borderColor = UIColor.cr_separatorColor.CGColor; - if (@available(iOS 13, *)) { - // Use performAsCurrentTraitCollection to get the correct CGColor for the - // given dynamic color and current userInterfaceStyle. - [self.traitCollection performAsCurrentTraitCollection:^{ - stackHolder.layer.borderColor = UIColor.cr_separatorColor.CGColor; - }]; - } - stackHolder.layer.borderWidth = 1.0 / [UIScreen mainScreen].scale; - stackHolder.clipsToBounds = YES; - stackHolder.backgroundColor = UIColor.cr_secondarySystemBackgroundColor; - stackHolder.translatesAutoresizingMaskIntoConstraints = NO; - self.textFieldStackHolder = stackHolder; - - // Updates the custom space before the text fields to account for their - // inset. - UIView* previousView = stackView.arrangedSubviews.lastObject; - if (previousView) { - CGFloat spaceBefore = [stackView customSpacingAfterView:previousView]; - [stackView setCustomSpacing:kTextfieldStackInsetTop + spaceBefore - afterView:previousView]; - } else { - // There should always be a title or message. - NOTREACHED() << "Presenting alert without a title or message."; - } - [stackView addArrangedSubview:stackHolder]; - - ChromeDirectionalEdgeInsets stackHolderContentInsets = - ChromeDirectionalEdgeInsetsMake(0, kTextfieldStackInsetLeading, 0, - kTextfieldStackInsetTrailing); - AddSameConstraintsToSidesWithInsets( - stackHolder, self.contentView, - LayoutSides::kTrailing | LayoutSides::kLeading, - stackHolderContentInsets); - - UIStackView* fieldStack = [[UIStackView alloc] init]; - fieldStack.axis = UILayoutConstraintAxisVertical; - fieldStack.translatesAutoresizingMaskIntoConstraints = NO; - fieldStack.spacing = kTextfieldInset; - fieldStack.alignment = UIStackViewAlignmentCenter; - [stackHolder addSubview:fieldStack]; - ChromeDirectionalEdgeInsets fieldStackContentInsets = - ChromeDirectionalEdgeInsetsMake(kTextfieldInset, 0.0, kTextfieldInset, - 0.0); - AddSameConstraintsWithInsets(fieldStack, stackHolder, - fieldStackContentInsets); - - NSMutableArray<UITextField*>* textFields = [[NSMutableArray alloc] - initWithCapacity:self.textFieldConfigurations.count]; - for (TextFieldConfiguration* textFieldConfiguration in self - .textFieldConfigurations) { - if (textFieldConfiguration != - [self.textFieldConfigurations firstObject]) { - UIView* hairline = [[UIView alloc] init]; - hairline.backgroundColor = UIColor.cr_separatorColor; - hairline.translatesAutoresizingMaskIntoConstraints = NO; - [fieldStack addArrangedSubview:hairline]; - CGFloat pixelHeight = 1.0 / [UIScreen mainScreen].scale; - [hairline.heightAnchor constraintEqualToConstant:pixelHeight].active = - YES; - AddSameConstraintsToSides( - fieldStack, hairline, - LayoutSides::kTrailing | LayoutSides::kLeading); - } - UITextField* textField = [[UITextField alloc] init]; - textField.text = textFieldConfiguration.text; - textField.placeholder = textFieldConfiguration.placeholder; - textField.secureTextEntry = textFieldConfiguration.secureTextEntry; - textField.accessibilityIdentifier = - textFieldConfiguration.accessibilityIdentifier; - textField.translatesAutoresizingMaskIntoConstraints = NO; - textField.delegate = self; - textField.font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody]; - textField.adjustsFontForContentSizeCategory = YES; - - [fieldStack addArrangedSubview:textField]; - ChromeDirectionalEdgeInsets fieldInsets = ChromeDirectionalEdgeInsetsMake( - 0.0, kTextfieldInset, 0.0, kTextfieldInset); - AddSameConstraintsToSidesWithInsets( - textField, fieldStack, LayoutSides::kTrailing | LayoutSides::kLeading, - fieldInsets); - [textFields addObject:textField]; - } - self.textFields = textFields; - } - - UIView* lastArrangedView = stackView.arrangedSubviews.lastObject; - if (lastArrangedView) { - [stackView setCustomSpacing:kAlertActionsSpacing - afterView:lastArrangedView]; - } - - self.buttonAlertActionsDictionary = [[NSMutableDictionary alloc] init]; - for (AlertAction* action in self.actions) { - UIView* hairline = [[UIView alloc] init]; - hairline.backgroundColor = UIColor.cr_separatorColor; - hairline.translatesAutoresizingMaskIntoConstraints = NO; - [stackView addArrangedSubview:hairline]; - - GrayHighlightButton* button = [[GrayHighlightButton alloc] init]; - UIFont* font = nil; - UIColor* textColor = nil; - if (action.style == UIAlertActionStyleDefault) { - font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody]; - textColor = [UIColor colorNamed:kBlueColor]; - } else if (action.style == UIAlertActionStyleCancel) { - font = [UIFont preferredFontForTextStyle:UIFontTextStyleHeadline]; - textColor = [UIColor colorNamed:kBlueColor]; - } else { // Style is UIAlertActionStyleDestructive - font = [UIFont preferredFontForTextStyle:UIFontTextStyleBody]; - textColor = [UIColor colorNamed:kRedColor]; - } - button.titleLabel.font = font; - button.titleLabel.adjustsFontForContentSizeCategory = YES; - - [button setTitleColor:textColor forState:UIControlStateNormal]; - [button setTitle:action.title forState:UIControlStateNormal]; - - button.contentHorizontalAlignment = - UIControlContentHorizontalAlignmentCenter; - [button addTarget:self - action:@selector(didSelectActionForButton:) - forControlEvents:UIControlEventTouchUpInside]; - button.translatesAutoresizingMaskIntoConstraints = NO; - button.contentEdgeInsets = - UIEdgeInsetsMake(kButtonInsetTop, kButtonInsetLeading, - kButtonInsetBottom, kButtonInsetTrailing); - [stackView addArrangedSubview:button]; - - CGFloat pixelHeight = 1.0 / [UIScreen mainScreen].scale; - [hairline.heightAnchor constraintEqualToConstant:pixelHeight].active = YES; - AddSameConstraintsToSides(hairline, button, - (LayoutSides::kTrailing | LayoutSides::kLeading)); - - AddSameConstraintsToSides(button, self.contentView, - LayoutSides::kTrailing | LayoutSides::kLeading); - - button.tag = action.uniqueIdentifier; - self.buttonAlertActionsDictionary[@(action.uniqueIdentifier)] = action; - } - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(handleKeyboardWillShow:) - name:UIKeyboardWillShowNotification - object:nil]; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(handleKeyboardWillHide:) - name:UIKeyboardWillHideNotification - object:nil]; -} - -#pragma mark - Getters - -- (NSArray<NSString*>*)textFieldResults { - if (!self.textFields) { - return nil; - } - NSMutableArray<NSString*>* results = - [[NSMutableArray alloc] initWithCapacity:self.textFields.count]; - for (UITextField* textField in self.textFields) { - [results addObject:textField.text]; - } - return results; -} - -#pragma mark - UIGestureRecognizerDelegate - -- (BOOL)gestureRecognizer:(UIGestureRecognizer*)gestureRecognizer - shouldReceiveTouch:(UITouch*)touch { - if (self.tapRecognizer != gestureRecognizer) { - return YES; - } - CGPoint locationInContentView = [touch locationInView:self.contentView]; - return !CGRectContainsPoint(self.contentView.bounds, locationInContentView); -} - -#pragma mark - UITextFieldDelegate - -- (void)textFieldDidBeginEditing:(UITextField*)textField { - self.lastFocusedTextField = textField; -} - -- (BOOL)textFieldShouldReturn:(UITextField*)textField { - NSUInteger index = [self.textFields indexOfObject:textField]; - if (index + 1 < self.textFields.count) { - [self.textFields[index + 1] becomeFirstResponder]; - } else { - [textField resignFirstResponder]; - } - return NO; -} - -#pragma mark - Private - -- (void)handleKeyboardWillShow:(NSNotification*)notification { - CGRect keyboardFrame = - [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue]; - CGRect viewFrameInWindow = [self.view convertRect:self.view.bounds - toView:nil]; - CGRect intersectedFrame = - CGRectIntersection(keyboardFrame, viewFrameInWindow); - - CGFloat additionalBottomInset = - intersectedFrame.size.height - self.view.safeAreaInsets.bottom; - - if (additionalBottomInset > 0) { - self.additionalSafeAreaInsets = - UIEdgeInsetsMake(0, 0, additionalBottomInset, 0); - [self animateLayoutFromKeyboardNotification:notification]; - } - - self.tapRecognizer.enabled = YES; - self.swipeRecognizer.enabled = YES; -} - -- (void)handleKeyboardWillHide:(NSNotification*)notification { - self.additionalSafeAreaInsets = UIEdgeInsetsZero; - [self animateLayoutFromKeyboardNotification:notification]; - - self.tapRecognizer.enabled = NO; - self.swipeRecognizer.enabled = NO; -} - -- (void)animateLayoutFromKeyboardNotification:(NSNotification*)notification { - double duration = - [notification.userInfo[UIKeyboardAnimationDurationUserInfoKey] - doubleValue]; - UIViewAnimationCurve animationCurve = static_cast<UIViewAnimationCurve>( - [notification.userInfo[UIKeyboardAnimationCurveUserInfoKey] - integerValue]); - UIViewAnimationOptions options = animationCurve - << kUIViewAnimationCurveToOptionsShift; - - [UIView animateWithDuration:duration - delay:0 - options:options - animations:^{ - [self.view layoutIfNeeded]; - } - completion:nil]; -} - -- (void)didSelectActionForButton:(UIButton*)button { - AlertAction* action = self.buttonAlertActionsDictionary[@(button.tag)]; - if (action.handler) { - action.handler(action); - } -} - -- (void)dismissKeyboard { - [self.lastFocusedTextField resignFirstResponder]; -} - -@end
diff --git a/ios/chrome/browser/ui/alert_view_controller/alert_view_controller_unittest.mm b/ios/chrome/browser/ui/alert_view_controller/alert_view_controller_unittest.mm deleted file mode 100644 index 117bfe2..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/alert_view_controller_unittest.mm +++ /dev/null
@@ -1,45 +0,0 @@ -// Copyright 2019 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. - -#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h" - -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#include "testing/platform_test.h" - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -using AlertViewControllerTest = PlatformTest; - -// Tests AlertViewController can be initiliazed. -TEST_F(AlertViewControllerTest, Init) { - AlertViewController* alert = [[AlertViewController alloc] init]; - EXPECT_TRUE(alert); -} - -// Tests there are no circular references in a simple init. -TEST_F(AlertViewControllerTest, Dealloc) { - __weak AlertViewController* weakAlert = nil; - @autoreleasepool { - AlertViewController* alert = [[AlertViewController alloc] init]; - weakAlert = alert; - } - EXPECT_FALSE(weakAlert); -} - -// Tests there are no circular references in an alert with actions. -TEST_F(AlertViewControllerTest, DeallocWithActions) { - __weak AlertViewController* weakAlert = nil; - @autoreleasepool { - AlertViewController* alert = [[AlertViewController alloc] init]; - AlertAction* action = [AlertAction actionWithTitle:@"OK" - style:UIAlertActionStyleDefault - handler:^(AlertAction* action){ - }]; - [alert setActions:@[ action ]]; - weakAlert = alert; - } - EXPECT_FALSE(weakAlert); -}
diff --git a/ios/chrome/browser/ui/alert_view_controller/test/BUILD.gn b/ios/chrome/browser/ui/alert_view_controller/test/BUILD.gn deleted file mode 100644 index b3cdf7f..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/test/BUILD.gn +++ /dev/null
@@ -1,19 +0,0 @@ -# Copyright 2019 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. - -source_set("test") { - testonly = true - sources = [ - "fake_alert_consumer.h", - "fake_alert_consumer.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - "//base", - "//ios/chrome/browser/ui/alert_view_controller", - "//testing/gtest", - ] -}
diff --git a/ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h b/ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h deleted file mode 100644 index 5d40240..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h +++ /dev/null
@@ -1,22 +0,0 @@ -// Copyright 2019 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. - -#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_TEST_FAKE_ALERT_CONSUMER_H_ -#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_TEST_FAKE_ALERT_CONSUMER_H_ - -#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h" - -// Fake version of AlertConsumer that allows read access to consumed values. -@interface FakeAlertConsumer : NSObject <AlertConsumer> - -@property(nonatomic, copy) NSString* title; -@property(nonatomic, copy) NSString* message; -@property(nonatomic, copy) - NSArray<TextFieldConfiguration*>* textFieldConfigurations; -@property(nonatomic, copy) NSArray<AlertAction*>* actions; -@property(nonatomic, copy) NSString* alertAccessibilityIdentifier; - -@end - -#endif // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_TEST_FAKE_ALERT_CONSUMER_H_
diff --git a/ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.mm b/ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.mm deleted file mode 100644 index e8e4c1ae..0000000 --- a/ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.mm +++ /dev/null
@@ -1,12 +0,0 @@ -// Copyright 2019 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. - -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" - -#if !defined(__has_feature) || !__has_feature(objc_arc) -#error "This file requires ARC support." -#endif - -@implementation FakeAlertConsumer -@end
diff --git a/ios/chrome/browser/ui/autofill/BUILD.gn b/ios/chrome/browser/ui/autofill/BUILD.gn index a5c4124..b99947d 100644 --- a/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/ios/chrome/browser/ui/autofill/BUILD.gn
@@ -57,7 +57,6 @@ "//ios/chrome/common", "//ios/public/provider/chrome/browser", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web/common", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", @@ -92,7 +91,6 @@ "//ios/chrome/browser/ui/util", "//ios/chrome/common/colors", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//ui/base", ] @@ -133,7 +131,6 @@ "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ] libs = [ "UIKit.framework" ]
diff --git a/ios/chrome/browser/ui/autofill/cells/BUILD.gn b/ios/chrome/browser/ui/autofill/cells/BUILD.gn index b8f427a..067ab22 100644 --- a/ios/chrome/browser/ui/autofill/cells/BUILD.gn +++ b/ios/chrome/browser/ui/autofill/cells/BUILD.gn
@@ -30,7 +30,6 @@ "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ]
diff --git a/ios/chrome/browser/ui/bookmarks/BUILD.gn b/ios/chrome/browser/ui/bookmarks/BUILD.gn index acd3635..f2bf038c 100644 --- a/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/ios/chrome/browser/ui/bookmarks/BUILD.gn
@@ -104,7 +104,6 @@ "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//ui/base", "//ui/gfx",
diff --git a/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn index 5e8b288..9bf8467e 100644 --- a/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn +++ b/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn
@@ -37,7 +37,6 @@ "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ]
diff --git a/ios/chrome/browser/ui/collection_view/cells/BUILD.gn b/ios/chrome/browser/ui/collection_view/cells/BUILD.gn index d653507..f8005ba 100644 --- a/ios/chrome/browser/ui/collection_view/cells/BUILD.gn +++ b/ios/chrome/browser/ui/collection_view/cells/BUILD.gn
@@ -34,7 +34,6 @@ "//ios/chrome/common", "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", "//url", ]
diff --git a/ios/chrome/browser/ui/download/BUILD.gn b/ios/chrome/browser/ui/download/BUILD.gn index 8c8f6ff1..7fe2b1d4d 100644 --- a/ios/chrome/browser/ui/download/BUILD.gn +++ b/ios/chrome/browser/ui/download/BUILD.gn
@@ -50,7 +50,6 @@ "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//ios/web:core", "//net",
diff --git a/ios/chrome/browser/ui/first_run/BUILD.gn b/ios/chrome/browser/ui/first_run/BUILD.gn index 116f94f..6e3fe97 100644 --- a/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/ios/chrome/browser/ui/first_run/BUILD.gn
@@ -52,7 +52,6 @@ "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web/common:web_view_creation_util", "//ui/base", "//ui/gfx",
diff --git a/ios/chrome/browser/ui/location_bar/BUILD.gn b/ios/chrome/browser/ui/location_bar/BUILD.gn index 0c4ea20..0c477ec81 100644 --- a/ios/chrome/browser/ui/location_bar/BUILD.gn +++ b/ios/chrome/browser/ui/location_bar/BUILD.gn
@@ -78,7 +78,6 @@ "//ios/public/provider/chrome/browser:browser", "//ios/public/provider/chrome/browser/voice", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web/common", "//ios/web/public:public", "//ios/web/public/security",
diff --git a/ios/chrome/browser/ui/ntp/BUILD.gn b/ios/chrome/browser/ui/ntp/BUILD.gn index ffd3f637..1c8f76b 100644 --- a/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/ios/chrome/browser/ui/ntp/BUILD.gn
@@ -122,7 +122,6 @@ "//ios/public/provider/chrome/browser/ui", "//ios/public/provider/chrome/browser/voice", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//ios/web/public/deprecated", "//net",
diff --git a/ios/chrome/browser/ui/omnibox/BUILD.gn b/ios/chrome/browser/ui/omnibox/BUILD.gn index 21e5382c..e389fcc3 100644 --- a/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/ios/chrome/browser/ui/omnibox/BUILD.gn
@@ -165,7 +165,6 @@ "//ios/chrome/common/favicon", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//net", "//skia",
diff --git a/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn b/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn index c427b338..0f9f74f2 100644 --- a/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn +++ b/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn
@@ -16,7 +16,7 @@ deps = [ "//base", - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays:coordinators", "//ios/chrome/browser/ui/presenters", @@ -33,8 +33,8 @@ deps = [ ":alerts", - "//ios/chrome/browser/ui/alert_view_controller", - "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/alert_view", + "//ios/chrome/browser/ui/alert_view/test", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays/common/alerts/test", "//ios/chrome/browser/ui/overlays/test",
diff --git a/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator.mm b/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator.mm index 321bbfc..57d8fb4 100644 --- a/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator.mm +++ b/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator.mm
@@ -5,7 +5,7 @@ #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator.h" #include "base/logging.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h" +#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator+subclassing.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h" #import "ios/chrome/browser/ui/overlays/overlay_request_coordinator_delegate.h"
diff --git a/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.mm index 138b0b3..143625d 100644 --- a/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.mm +++ b/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.mm
@@ -5,7 +5,7 @@ #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h" #include "base/logging.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_consumer.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator_unittest.mm index 938f2139..edfb7644 100644 --- a/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator_unittest.mm
@@ -4,8 +4,8 @@ #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" #import "ios/chrome/browser/ui/elements/text_field_configuration.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h" #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"
diff --git a/ios/chrome/browser/ui/overlays/common/alerts/test/BUILD.gn b/ios/chrome/browser/ui/overlays/common/alerts/test/BUILD.gn index ebeb8e5..df0a1432 100644 --- a/ios/chrome/browser/ui/overlays/common/alerts/test/BUILD.gn +++ b/ios/chrome/browser/ui/overlays/common/alerts/test/BUILD.gn
@@ -12,8 +12,8 @@ configs += [ "//build/config/compiler:enable_arc" ] deps = [ - "//ios/chrome/browser/ui/alert_view_controller", - "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/alert_view", + "//ios/chrome/browser/ui/alert_view/test", "//ios/chrome/browser/ui/overlays/common/alerts", "//ios/chrome/browser/ui/overlays/test", "//testing/gtest",
diff --git a/ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.mm b/ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.mm index 4d2e6b2..2fe277d 100644 --- a/ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.mm +++ b/ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.mm
@@ -4,7 +4,7 @@ #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h" -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn b/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn index 5e2e724..d79c5cbe 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn +++ b/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn
@@ -19,7 +19,7 @@ "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/overlays:coordinators", "//ios/chrome/browser/ui/overlays/common/alerts", "//ui/base", @@ -43,8 +43,8 @@ "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/overlays/test", - "//ios/chrome/browser/ui/alert_view_controller", - "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/alert_view", + "//ios/chrome/browser/ui/alert_view/test", "//ios/chrome/browser/ui/dialogs", "//ios/chrome/browser/ui/overlays/common/alerts/test", "//ios/chrome/browser/ui/overlays/test",
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator.mm index 5556b44..ee4fbf0e 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator.mm
@@ -9,7 +9,7 @@ #include "ios/chrome/browser/overlays/public/overlay_request.h" #include "ios/chrome/browser/overlays/public/overlay_response.h" #include "ios/chrome/browser/overlays/public/web_content_area/app_launcher_alert_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h" #include "ios/chrome/grit/ios_strings.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator_unittest.mm index 12d9ce1..6377986 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator_unittest.mm
@@ -8,8 +8,8 @@ #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/overlay_response.h" #import "ios/chrome/browser/overlays/public/web_content_area/app_launcher_alert_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h" #include "ios/chrome/grit/ios_strings.h" #include "testing/gtest_mac.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn index 6229011..5f9fb15 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn +++ b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn
@@ -19,7 +19,7 @@ "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays:coordinators", "//ios/chrome/browser/ui/overlays/common/alerts", @@ -44,8 +44,8 @@ "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/overlays/test", - "//ios/chrome/browser/ui/alert_view_controller", - "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/alert_view", + "//ios/chrome/browser/ui/alert_view/test", "//ios/chrome/browser/ui/dialogs", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays/common/alerts/test",
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_coordinator.mm b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_coordinator.mm index eb460f9..11b3f09 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_coordinator.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_coordinator.mm
@@ -6,7 +6,7 @@ #include "ios/chrome/browser/overlays/public/overlay_request.h" #include "ios/chrome/browser/overlays/public/web_content_area/http_auth_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h" +#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator+subclassing.h" #import "ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator.mm index 32fe261..e651510 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator.mm
@@ -10,8 +10,8 @@ #include "ios/chrome/browser/overlays/public/overlay_request.h" #include "ios/chrome/browser/overlays/public/overlay_response.h" #include "ios/chrome/browser/overlays/public/web_content_area/http_auth_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/alert_consumer.h" #import "ios/chrome/browser/ui/elements/text_field_configuration.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h" #include "ios/chrome/grit/ios_strings.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator_unittest.mm index 5b2ba67..8830eed 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator_unittest.mm
@@ -10,8 +10,8 @@ #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/overlay_response.h" #import "ios/chrome/browser/overlays/public/web_content_area/http_auth_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h" #import "ios/chrome/browser/ui/elements/text_field_configuration.h" #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn index c318872..55b6db76 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn
@@ -19,7 +19,7 @@ "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/dialogs", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays:coordinators", @@ -45,7 +45,7 @@ "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/dialogs:constants", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays:coordinators", @@ -71,7 +71,7 @@ "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/dialogs:constants", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays:coordinators", @@ -97,7 +97,7 @@ "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/dialogs:constants", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/overlays:coordinators", @@ -128,8 +128,8 @@ "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/overlays/test", - "//ios/chrome/browser/ui/alert_view_controller", - "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/alert_view", + "//ios/chrome/browser/ui/alert_view/test", "//ios/chrome/browser/ui/dialogs", "//ios/chrome/browser/ui/dialogs:constants", "//ios/chrome/browser/ui/elements",
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_coordinator_unittest.mm b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_coordinator_unittest.mm index c618bde..5dfa8d6 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_coordinator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_coordinator_unittest.mm
@@ -7,7 +7,7 @@ #import "base/test/ios/wait_util.h" #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/web_content_area/java_script_alert_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h" +#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h" #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test/java_script_dialog_overlay_coordinator_test.h" #import "ios/web/public/test/fakes/test_web_state.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator.mm index ad99048..5159f13a 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator.mm
@@ -8,8 +8,8 @@ #include "components/strings/grit/components_strings.h" #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/web_content_area/java_script_alert_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/alert_consumer.h" #import "ios/chrome/browser/ui/dialogs/dialog_constants.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h" #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator_unittest.mm index 18d0bae..b310878 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator_unittest.mm
@@ -9,8 +9,8 @@ #include "components/url_formatter/elide_url.h" #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/web_content_area/java_script_alert_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h" #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h" #include "ios/chrome/grit/ios_strings.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator.mm index 672c0c8..f375a26a 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator.mm
@@ -8,8 +8,8 @@ #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/overlay_response.h" #import "ios/chrome/browser/overlays/public/web_content_area/java_script_confirmation_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/alert_consumer.h" #import "ios/chrome/browser/ui/dialogs/dialog_constants.h" #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h" #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_overlay_mediator_util.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator_unittest.mm index d535aae..d71a50d 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator_unittest.mm
@@ -10,8 +10,8 @@ #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/overlay_response.h" #import "ios/chrome/browser/overlays/public/web_content_area/java_script_confirmation_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h" #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h" #include "ios/chrome/grit/ios_strings.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h index 7bb329b..1089b683 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h
@@ -5,7 +5,7 @@ #ifndef IOS_CHROME_BROWSER_UI_OVERLAYS_WEB_CONTENT_AREA_JAVA_SCRIPT_DIALOGS_JAVA_SCRIPT_DIALOG_BLOCKING_ACTION_H_ #define IOS_CHROME_BROWSER_UI_OVERLAYS_WEB_CONTENT_AREA_JAVA_SCRIPT_DIALOGS_JAVA_SCRIPT_DIALOG_BLOCKING_ACTION_H_ -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" @class AlertOverlayMediator; class JavaScriptDialogSource;
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator.mm b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator.mm index 5af92c0..52bf866 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator.mm
@@ -9,8 +9,8 @@ #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/overlay_response.h" #import "ios/chrome/browser/overlays/public/web_content_area/java_script_prompt_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h" #import "ios/chrome/browser/ui/dialogs/dialog_constants.h" #import "ios/chrome/browser/ui/elements/text_field_configuration.h" #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h"
diff --git a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator_unittest.mm b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator_unittest.mm index cacf81b1..054a511 100644 --- a/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator_unittest.mm +++ b/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator_unittest.mm
@@ -10,8 +10,8 @@ #import "ios/chrome/browser/overlays/public/overlay_request.h" #import "ios/chrome/browser/overlays/public/overlay_response.h" #import "ios/chrome/browser/overlays/public/web_content_area/java_script_prompt_overlay.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h" #import "ios/chrome/browser/ui/dialogs/dialog_constants.h" #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h" #import "ios/chrome/browser/ui/elements/text_field_configuration.h"
diff --git a/ios/chrome/browser/ui/payments/BUILD.gn b/ios/chrome/browser/ui/payments/BUILD.gn index 01e07a1..3b56da5 100644 --- a/ios/chrome/browser/ui/payments/BUILD.gn +++ b/ios/chrome/browser/ui/payments/BUILD.gn
@@ -90,7 +90,6 @@ "//ios/chrome/browser/ui/payments/cells", "//ios/chrome/browser/ui/util", "//ios/chrome/common/colors", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web/common", "//ios/web/public", "//ios/web/public/deprecated",
diff --git a/ios/chrome/browser/ui/payments/cells/BUILD.gn b/ios/chrome/browser/ui/payments/cells/BUILD.gn index 55fa8f6..3681e9d 100644 --- a/ios/chrome/browser/ui/payments/cells/BUILD.gn +++ b/ios/chrome/browser/ui/payments/cells/BUILD.gn
@@ -31,7 +31,6 @@ "//ios/chrome/browser/ui/util", "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", - "//ios/third_party/material_roboto_font_loader_ios", "//url/", ]
diff --git a/ios/chrome/browser/ui/popup_menu/BUILD.gn b/ios/chrome/browser/ui/popup_menu/BUILD.gn index 3e1ec2f4..18398a9c 100644 --- a/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/ios/chrome/browser/ui/popup_menu/BUILD.gn
@@ -175,6 +175,7 @@ "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", + "//ios/web/common:user_agent", "//ios/web/public/test", "//ios/web/public/test/http_server", "//ui/base",
diff --git a/ios/chrome/browser/ui/popup_menu/request_desktop_mobile_site_egtest.mm b/ios/chrome/browser/ui/popup_menu/request_desktop_mobile_site_egtest.mm index 083ef90..9c604b1 100644 --- a/ios/chrome/browser/ui/popup_menu/request_desktop_mobile_site_egtest.mm +++ b/ios/chrome/browser/ui/popup_menu/request_desktop_mobile_site_egtest.mm
@@ -9,12 +9,12 @@ #include "components/strings/grit/components_strings.h" #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h" #import "ios/chrome/browser/ui/util/uikit_ui_util.h" -#include "ios/chrome/browser/web/chrome_web_client.h" #include "ios/chrome/grit/ios_strings.h" #import "ios/chrome/test/earl_grey/chrome_earl_grey.h" #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h" #import "ios/chrome/test/earl_grey/chrome_matchers.h" #import "ios/chrome/test/earl_grey/chrome_test_case.h" +#include "ios/web/common/user_agent.h" #include "ios/web/public/test/http_server/data_response_provider.h" #import "ios/web/public/test/http_server/http_server.h" #include "ios/web/public/test/http_server/http_server_util.h" @@ -79,8 +79,10 @@ *headers = web::ResponseProvider::GetDefaultResponseHeaders(); std::string userAgent; + std::string desktop_user_agent = + web::BuildUserAgentFromProduct(web::UserAgentType::DESKTOP, ""); if (request.headers.GetHeader("User-Agent", &userAgent) && - userAgent == kDesktopUserAgent) { + userAgent == desktop_user_agent) { response_body->assign("Desktop"); } else { response_body->assign("Mobile");
diff --git a/ios/chrome/browser/ui/sad_tab/BUILD.gn b/ios/chrome/browser/ui/sad_tab/BUILD.gn index a6ed853..0fcc080 100644 --- a/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/ios/chrome/browser/ui/sad_tab/BUILD.gn
@@ -23,7 +23,6 @@ "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//net", "//ui/base",
diff --git a/ios/chrome/browser/ui/settings/BUILD.gn b/ios/chrome/browser/ui/settings/BUILD.gn index 6719d8e70..eb1c923 100644 --- a/ios/chrome/browser/ui/settings/BUILD.gn +++ b/ios/chrome/browser/ui/settings/BUILD.gn
@@ -197,7 +197,6 @@ "//ios/public/provider/chrome/browser/user_feedback", "//ios/public/provider/chrome/browser/voice", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//net", "//ui/base", "//url",
diff --git a/ios/chrome/browser/ui/settings/cells/BUILD.gn b/ios/chrome/browser/ui/settings/cells/BUILD.gn index 8d5182e..2c1d8299 100644 --- a/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/ios/chrome/browser/ui/settings/cells/BUILD.gn
@@ -56,7 +56,6 @@ "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ]
diff --git a/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn b/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn index 17611b9..9e325a9 100644 --- a/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn +++ b/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn
@@ -17,7 +17,6 @@ "//ios/chrome/browser/ui/util", "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ]
diff --git a/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/ios/chrome/browser/ui/table_view/cells/BUILD.gn index a98cd1d..ae39e7b 100644 --- a/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/ios/chrome/browser/ui/table_view/cells/BUILD.gn
@@ -61,7 +61,7 @@ "//ios/chrome/common/colors", "//ios/chrome/common/favicon", "//ios/chrome/common/ui_util", - "//ios/third_party/material_components_ios:material_components_ios", + "//ios/third_party/material_components_ios", "//net", "//ui/base", "//url:url",
diff --git a/ios/chrome/browser/ui/util/BUILD.gn b/ios/chrome/browser/ui/util/BUILD.gn index eed018e..ce46e9f 100644 --- a/ios/chrome/browser/ui/util/BUILD.gn +++ b/ios/chrome/browser/ui/util/BUILD.gn
@@ -145,7 +145,6 @@ ":util", "//base", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//testing/gtest", "//third_party/ocmock", "//url",
diff --git a/ios/chrome/browser/ui/webui/about_ui.cc b/ios/chrome/browser/ui/webui/about_ui.cc index b1c4a93..9ea5fc3 100644 --- a/ios/chrome/browser/ui/webui/about_ui.cc +++ b/ios/chrome/browser/ui/webui/about_ui.cc
@@ -38,14 +38,13 @@ std::string GetSource() const override; void StartDataRequest( const std::string& path, - const web::URLDataSourceIOS::GotDataCallback& callback) override; + web::URLDataSourceIOS::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) const override; bool ShouldDenyXFrameOptions() const override; // Send the response data. - void FinishDataRequest( - const std::string& html, - const web::URLDataSourceIOS::GotDataCallback& callback); + void FinishDataRequest(const std::string& html, + web::URLDataSourceIOS::GotDataCallback callback); private: ~AboutUIHTMLSource() override; @@ -112,7 +111,7 @@ void AboutUIHTMLSource::StartDataRequest( const std::string& path, - const web::URLDataSourceIOS::GotDataCallback& callback) { + web::URLDataSourceIOS::GotDataCallback callback) { std::string response; // Add your data source here, in alphabetical order. if (source_name_ == kChromeUIChromeURLsHost) { @@ -131,14 +130,14 @@ base::StatisticsRecorder::WriteHTMLGraph("", &response); } - FinishDataRequest(response, callback); + FinishDataRequest(response, std::move(callback)); } void AboutUIHTMLSource::FinishDataRequest( const std::string& html, - const web::URLDataSourceIOS::GotDataCallback& callback) { + web::URLDataSourceIOS::GotDataCallback callback) { std::string html_copy(html); - callback.Run(base::RefCountedString::TakeString(&html_copy)); + std::move(callback).Run(base::RefCountedString::TakeString(&html_copy)); } std::string AboutUIHTMLSource::GetMimeType(const std::string& path) const {
diff --git a/ios/chrome/browser/ui/webui/prefs_internals_ui.cc b/ios/chrome/browser/ui/webui/prefs_internals_ui.cc index 052e861..fe65ffb 100644 --- a/ios/chrome/browser/ui/webui/prefs_internals_ui.cc +++ b/ios/chrome/browser/ui/webui/prefs_internals_ui.cc
@@ -35,11 +35,11 @@ void StartDataRequest( const std::string& path, - const web::URLDataSourceIOS::GotDataCallback& callback) override { + web::URLDataSourceIOS::GotDataCallback callback) override { // TODO(crbug.com/1006711): Properly disable this webui provider for // incognito browser states. if (browser_state_->IsOffTheRecord()) { - callback.Run(nullptr); + std::move(callback).Run(nullptr); return; } @@ -51,7 +51,7 @@ DCHECK(prefs); CHECK(base::JSONWriter::WriteWithOptions( *prefs, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json)); - callback.Run(base::RefCountedString::TakeString(&json)); + std::move(callback).Run(base::RefCountedString::TakeString(&json)); } private:
diff --git a/ios/chrome/browser/ui/webui/suggestions_ui.cc b/ios/chrome/browser/ui/webui/suggestions_ui.cc index 16beb1bb..1c43c53 100644 --- a/ios/chrome/browser/ui/webui/suggestions_ui.cc +++ b/ios/chrome/browser/ui/webui/suggestions_ui.cc
@@ -26,7 +26,7 @@ std::string GetSource() const override; void StartDataRequest( const std::string& path, - const web::URLDataSourceIOS::GotDataCallback& callback) override; + web::URLDataSourceIOS::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) const override; private: @@ -49,8 +49,8 @@ void SuggestionsSourceWrapper::StartDataRequest( const std::string& path, - const web::URLDataSourceIOS::GotDataCallback& callback) { - suggestions_source_.StartDataRequest(path, callback); + web::URLDataSourceIOS::GotDataCallback callback) { + suggestions_source_.StartDataRequest(path, std::move(callback)); } std::string SuggestionsSourceWrapper::GetMimeType(
diff --git a/ios/chrome/browser/ui/webui/terms_ui.mm b/ios/chrome/browser/ui/webui/terms_ui.mm index 8ff629b..7c360e27 100644 --- a/ios/chrome/browser/ui/webui/terms_ui.mm +++ b/ios/chrome/browser/ui/webui/terms_ui.mm
@@ -29,14 +29,13 @@ std::string GetSource() const override; void StartDataRequest( const std::string& path, - const web::URLDataSourceIOS::GotDataCallback& callback) override; + web::URLDataSourceIOS::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) const override; bool ShouldDenyXFrameOptions() const override; // Send the response data. - void FinishDataRequest( - const std::string& html, - const web::URLDataSourceIOS::GotDataCallback& callback); + void FinishDataRequest(const std::string& html, + web::URLDataSourceIOS::GotDataCallback callback); private: ~TermsUIHTMLSource() override; @@ -59,7 +58,7 @@ void TermsUIHTMLSource::StartDataRequest( const std::string& path, - const web::URLDataSourceIOS::GotDataCallback& callback) { + web::URLDataSourceIOS::GotDataCallback callback) { NSString* terms_of_service_path = base::SysUTF8ToNSString(GetTermsOfServicePath()); NSString* bundle_path = [base::mac::FrameworkBundle() bundlePath]; @@ -72,14 +71,14 @@ encoding:NSUTF8StringEncoding error:&error]; DCHECK(!error && [content length]); - FinishDataRequest(base::SysNSStringToUTF8(content), callback); + FinishDataRequest(base::SysNSStringToUTF8(content), std::move(callback)); } void TermsUIHTMLSource::FinishDataRequest( const std::string& html, - const web::URLDataSourceIOS::GotDataCallback& callback) { + web::URLDataSourceIOS::GotDataCallback callback) { std::string html_copy(html); - callback.Run(base::RefCountedString::TakeString(&html_copy)); + std::move(callback).Run(base::RefCountedString::TakeString(&html_copy)); } std::string TermsUIHTMLSource::GetMimeType(const std::string& path) const {
diff --git a/ios/chrome/browser/web/chrome_web_client.h b/ios/chrome/browser/web/chrome_web_client.h index fa66009..7507a24f 100644 --- a/ios/chrome/browser/web/chrome_web_client.h +++ b/ios/chrome/browser/web/chrome_web_client.h
@@ -12,9 +12,6 @@ #include "base/macros.h" #import "ios/web/public/web_client.h" -// Shared desktop user agent used to mimic Safari on a mac. -extern const char kDesktopUserAgent[]; - // Chrome implementation of WebClient. class ChromeWebClient : public web::WebClient { public:
diff --git a/ios/chrome/browser/web/chrome_web_client.mm b/ios/chrome/browser/web/chrome_web_client.mm index fc9b390..afd5a46 100644 --- a/ios/chrome/browser/web/chrome_web_client.mm +++ b/ios/chrome/browser/web/chrome_web_client.mm
@@ -64,12 +64,6 @@ } } // namespace -const char kDesktopUserAgent[] = - "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_5) " - "AppleWebKit/605.1.15 (KHTML, like Gecko) " - "Version/11.1.1 " - "Safari/605.1.15"; - ChromeWebClient::ChromeWebClient() {} ChromeWebClient::~ChromeWebClient() {} @@ -131,11 +125,9 @@ // Using desktop user agent overrides a command-line user agent, so that // request desktop site can still work when using an overridden UA. - if (type == web::UserAgentType::DESKTOP) - return kDesktopUserAgent; - base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch(switches::kUserAgent)) { + if (type != web::UserAgentType::DESKTOP && + command_line->HasSwitch(switches::kUserAgent)) { std::string user_agent = command_line->GetSwitchValueASCII(switches::kUserAgent); if (net::HttpUtil::IsValidHeaderValue(user_agent)) @@ -143,7 +135,7 @@ LOG(WARNING) << "Ignored invalid value for flag --" << switches::kUserAgent; } - return web::BuildUserAgentFromProduct(GetProduct()); + return web::BuildUserAgentFromProduct(type, GetProduct()); } base::string16 ChromeWebClient::GetLocalizedString(int message_id) const {
diff --git a/ios/chrome/test/BUILD.gn b/ios/chrome/test/BUILD.gn index 24ba864..6490ba4 100644 --- a/ios/chrome/test/BUILD.gn +++ b/ios/chrome/test/BUILD.gn
@@ -205,7 +205,7 @@ "//ios/chrome/browser/u2f:unit_tests", "//ios/chrome/browser/ui/activity_services:unit_tests", "//ios/chrome/browser/ui/alert_coordinator:unit_tests", - "//ios/chrome/browser/ui/alert_view_controller:unit_tests", + "//ios/chrome/browser/ui/alert_view:unit_tests", "//ios/chrome/browser/ui/app_launcher:unit_tests", "//ios/chrome/browser/ui/authentication:unit_tests", "//ios/chrome/browser/ui/authentication/cells:unit_tests",
diff --git a/ios/components/io_thread/ios_io_thread.mm b/ios/components/io_thread/ios_io_thread.mm index 31beb495..c988f81 100644 --- a/ios/components/io_thread/ios_io_thread.mm +++ b/ios/components/io_thread/ios_io_thread.mm
@@ -274,7 +274,7 @@ quic_user_agent_id.append( version_info::GetProductNameAndVersionForUserAgent()); quic_user_agent_id.push_back(' '); - quic_user_agent_id.append(web::BuildOSCpuInfo()); + quic_user_agent_id.append(web::BuildOSCpuInfo(web::UserAgentType::MOBILE)); // Set up field trials, ignoring debug command line options. network_session_configurator::ParseCommandLineAndFieldTrials(
diff --git a/ios/showcase/DEPS b/ios/showcase/DEPS index 22197b7..efa0f79 100644 --- a/ios/showcase/DEPS +++ b/ios/showcase/DEPS
@@ -2,6 +2,5 @@ "+components/strings", "+ios/chrome", "+ios/third_party/material_components_ios", - "+ios/third_party/material_roboto_font_loader_ios", "+ui/base", ]
diff --git a/ios/showcase/alert/BUILD.gn b/ios/showcase/alert/BUILD.gn index acf0809..bc2c579 100644 --- a/ios/showcase/alert/BUILD.gn +++ b/ios/showcase/alert/BUILD.gn
@@ -8,7 +8,7 @@ "sc_alert_coordinator.mm", ] deps = [ - "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/presenters", "//ios/showcase/common",
diff --git a/ios/showcase/alert/sc_alert_coordinator.mm b/ios/showcase/alert/sc_alert_coordinator.mm index 6cd36bc..2703e66b 100644 --- a/ios/showcase/alert/sc_alert_coordinator.mm +++ b/ios/showcase/alert/sc_alert_coordinator.mm
@@ -4,8 +4,8 @@ #import "ios/showcase/alert/sc_alert_coordinator.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h" -#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h" +#import "ios/chrome/browser/ui/alert_view/alert_action.h" +#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h" #import "ios/chrome/browser/ui/elements/text_field_configuration.h" #import "ios/chrome/browser/ui/presenters/non_modal_view_controller_presenter.h"
diff --git a/ios/showcase/core/BUILD.gn b/ios/showcase/core/BUILD.gn index 3563e73..739064a 100644 --- a/ios/showcase/core/BUILD.gn +++ b/ios/showcase/core/BUILD.gn
@@ -17,7 +17,6 @@ "//ios/chrome/browser/ui/util", "//ios/showcase/common", "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ] libs = [ "UIKit.framework" ]
diff --git a/ios/web/common/user_agent.h b/ios/web/common/user_agent.h index 206896b..883fefd 100644 --- a/ios/web/common/user_agent.h +++ b/ios/web/common/user_agent.h
@@ -29,12 +29,13 @@ UserAgentType GetUserAgentTypeWithDescription(const std::string& description); // Returns the os cpu info portion for a user agent. -std::string BuildOSCpuInfo(); +std::string BuildOSCpuInfo(UserAgentType type); // Returns the user agent to use for the given product name. // The returned user agent is very similar to that used by Mobile Safari, for // web page compatibility. -std::string BuildUserAgentFromProduct(const std::string& product); +std::string BuildUserAgentFromProduct(UserAgentType type, + const std::string& product); } // namespace web
diff --git a/ios/web/common/user_agent.mm b/ios/web/common/user_agent.mm index 7b681d1..bca7800 100644 --- a/ios/web/common/user_agent.mm +++ b/ios/web/common/user_agent.mm
@@ -23,54 +23,28 @@ namespace { +const char kDesktopUserAgent[] = + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_5) " + "AppleWebKit/605.1.15 (KHTML, like Gecko) " + "Version/11.1.1 " + "Safari/605.1.15"; + // UserAgentType description strings. const char kUserAgentTypeNoneDescription[] = "NONE"; const char kUserAgentTypeMobileDescription[] = "MOBILE"; const char kUserAgentTypeDesktopDescription[] = "DESKTOP"; -struct UAVersions { - const char* safari_version_string; - const char* webkit_version_string; -}; - -struct OSVersionMap { - int32_t major_os_version; - int32_t minor_os_version; - UAVersions ua_versions; -}; - -const UAVersions& GetUAVersionsForCurrentOS() { - // The WebKit version can be extracted dynamically from UIWebView, but the - // Safari version can't be, so a lookup table is used instead (for both, since - // the reported versions should stay in sync). - static const OSVersionMap version_map[] = { - {13, 0, {"604.1", "605.1.15"}}, - {12, 0, {"605.1", "605.1.15"}}, - }; - +std::string OSVersion(web::UserAgentType type) { int32_t os_major_version = 0; int32_t os_minor_version = 0; int32_t os_bugfix_version = 0; base::SysInfo::OperatingSystemVersionNumbers( &os_major_version, &os_minor_version, &os_bugfix_version); - // Return the versions corresponding to the first (and thus highest) OS - // version less than or equal to the given OS version. - for (unsigned int i = 0; i < base::size(version_map); ++i) { - if (os_major_version > version_map[i].major_os_version || - (os_major_version == version_map[i].major_os_version && - os_minor_version >= version_map[i].minor_os_version)) - return version_map[i].ua_versions; - } - NOTREACHED(); - return version_map[base::size(version_map) - 1].ua_versions; -} - -std::string BuildKernelVersion() { - // Freeze the kernel version for iOS 11.3 and later (as Safari does). - if (@available(iOS 11.3, *)) - return "15E148"; - return base::SysInfo::GetIOSBuildNumber(); + DCHECK_EQ(web::UserAgentType::MOBILE, type); + std::string os_version; + base::StringAppendF(&os_version, "%d_%d", os_major_version, os_minor_version); + return os_version; } } // namespace @@ -98,26 +72,9 @@ return UserAgentType::NONE; } -std::string BuildOSCpuInfo() { - int32_t os_major_version = 0; - int32_t os_minor_version = 0; - int32_t os_bugfix_version = 0; - base::SysInfo::OperatingSystemVersionNumbers( - &os_major_version, &os_minor_version, &os_bugfix_version); - - // Drop bugfix version for iOS 11.3 and later (as Safari does). - if (@available(iOS 11.3, *)) - os_bugfix_version = 0; - - std::string os_version; - if (os_bugfix_version == 0) { - base::StringAppendF(&os_version, "%d_%d", os_major_version, - os_minor_version); - } else { - base::StringAppendF(&os_version, "%d_%d_%d", os_major_version, - os_minor_version, os_bugfix_version); - } - +std::string BuildOSCpuInfo(web::UserAgentType type) { + std::string os_cpu; + DCHECK_EQ(web::UserAgentType::MOBILE, type); // Remove the end of the platform name. For example "iPod touch" becomes // "iPod". std::string platform = @@ -126,25 +83,24 @@ if (position != std::string::npos) platform = platform.substr(0, position); - std::string os_cpu; base::StringAppendF(&os_cpu, "%s; CPU %s %s like Mac OS X", platform.c_str(), (platform == "iPad") ? "OS" : "iPhone OS", - os_version.c_str()); + OSVersion(type).c_str()); return os_cpu; } -std::string BuildUserAgentFromProduct(const std::string& product) { - UAVersions ua_versions = GetUAVersionsForCurrentOS(); +std::string BuildUserAgentFromProduct(UserAgentType type, + const std::string& product) { + if (type == web::UserAgentType::DESKTOP) + return kDesktopUserAgent; + DCHECK_EQ(web::UserAgentType::MOBILE, type); std::string user_agent; base::StringAppendF(&user_agent, - "Mozilla/5.0 (%s) AppleWebKit/%s" - " (KHTML, like Gecko) %s Mobile/%s Safari/%s", - BuildOSCpuInfo().c_str(), - ua_versions.webkit_version_string, product.c_str(), - BuildKernelVersion().c_str(), - ua_versions.safari_version_string); + "Mozilla/5.0 (%s) AppleWebKit/605.1.15" + " (KHTML, like Gecko) %s Mobile/15E148 Safari/604.1", + BuildOSCpuInfo(type).c_str(), product.c_str()); return user_agent; }
diff --git a/ios/web/common/user_agent_unittest.mm b/ios/web/common/user_agent_unittest.mm index 8c1de47e..38fc328 100644 --- a/ios/web/common/user_agent_unittest.mm +++ b/ios/web/common/user_agent_unittest.mm
@@ -14,6 +14,14 @@ #error "This file requires ARC support." #endif +namespace { +const char kDesktopUserAgent[] = + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_5) " + "AppleWebKit/605.1.15 (KHTML, like Gecko) " + "Version/11.1.1 " + "Safari/605.1.15"; +} // namespace + namespace web { using UserAgentTest = PlatformTest; @@ -40,8 +48,8 @@ GetUserAgentTypeWithDescription(kInvalidDescription)); } -// Tests the user agent returned for a specific product. -TEST_F(UserAgentTest, UserAgentForProduct) { +// Tests the mobile user agent returned for a specific product. +TEST_F(UserAgentTest, MobileUserAgentForProduct) { std::string product = "my_product_name"; std::string platform; @@ -62,24 +70,25 @@ &os_major_version, &os_minor_version, &os_bugfix_version); base::StringAppendF(&os_version, "%d_%d", os_major_version, os_minor_version); - std::string safari_version; - if (@available(iOS 13, *)) { - safari_version = "604.1"; - } else { - safari_version = "605.1"; - } - std::string expected_user_agent; base::StringAppendF( &expected_user_agent, "Mozilla/5.0 (%s; CPU %s %s like Mac OS X) AppleWebKit/605.1.15 (KHTML, " - "like Gecko) %s Mobile/15E148 Safari/%s", - platform.c_str(), cpu.c_str(), os_version.c_str(), product.c_str(), - safari_version.c_str()); + "like Gecko) %s Mobile/15E148 Safari/604.1", + platform.c_str(), cpu.c_str(), os_version.c_str(), product.c_str()); - std::string result = BuildUserAgentFromProduct(product); + std::string result = + BuildUserAgentFromProduct(web::UserAgentType::MOBILE, product); EXPECT_EQ(expected_user_agent, result); } +// Tests the desktop user agent, checking that the product isn't taken into +// account. +TEST_F(UserAgentTest, DesktopUserAgentForProduct) { + EXPECT_EQ(kDesktopUserAgent, + BuildUserAgentFromProduct(web::UserAgentType::DESKTOP, + "my_product_name")); +} + } // namespace web
diff --git a/ios/web/public/webui/url_data_source_ios.h b/ios/web/public/webui/url_data_source_ios.h index 43e49fb..28d70ed44 100644 --- a/ios/web/public/webui/url_data_source_ios.h +++ b/ios/web/public/webui/url_data_source_ios.h
@@ -50,7 +50,7 @@ // data is available or if the request could not be satisfied. This can be // called either in this callback or asynchronously with the response. virtual void StartDataRequest(const std::string& path, - const GotDataCallback& callback) = 0; + GotDataCallback callback) = 0; // Return the mimetype that should be sent with this response, or empty // string to specify no mime type.
diff --git a/ios/web/shell/shell_web_client.mm b/ios/web/shell/shell_web_client.mm index 184ea1e..33f310fa 100644 --- a/ios/web/shell/shell_web_client.mm +++ b/ios/web/shell/shell_web_client.mm
@@ -58,7 +58,8 @@ } std::string ShellWebClient::GetUserAgent(UserAgentType type) const { - return web::BuildUserAgentFromProduct("CriOS/36.77.34.45"); + return web::BuildUserAgentFromProduct(UserAgentType::MOBILE, + "CriOS/36.77.34.45"); } base::StringPiece ShellWebClient::GetDataResource(
diff --git a/ios/web/webui/shared_resources_data_source_ios.h b/ios/web/webui/shared_resources_data_source_ios.h index 82bddd4..134ff81 100644 --- a/ios/web/webui/shared_resources_data_source_ios.h +++ b/ios/web/webui/shared_resources_data_source_ios.h
@@ -18,9 +18,8 @@ // web::URLDataSourceIOS implementation. std::string GetSource() const override; - void StartDataRequest( - const std::string& path, - const URLDataSourceIOS::GotDataCallback& callback) override; + void StartDataRequest(const std::string& path, + URLDataSourceIOS::GotDataCallback callback) override; std::string GetMimeType(const std::string& path) const override; private:
diff --git a/ios/web/webui/shared_resources_data_source_ios.mm b/ios/web/webui/shared_resources_data_source_ios.mm index 9578687..53484b6 100644 --- a/ios/web/webui/shared_resources_data_source_ios.mm +++ b/ios/web/webui/shared_resources_data_source_ios.mm
@@ -49,7 +49,7 @@ void SharedResourcesDataSourceIOS::StartDataRequest( const std::string& path, - const URLDataSourceIOS::GotDataCallback& callback) { + URLDataSourceIOS::GotDataCallback callback) { const GritResourceMap* resource = PathToResource(path); DCHECK(resource) << " path: " << path; scoped_refptr<base::RefCountedMemory> bytes; @@ -64,7 +64,7 @@ bytes = web_client->GetDataResourceBytes(idr); } - callback.Run(bytes.get()); + std::move(callback).Run(bytes.get()); } std::string SharedResourcesDataSourceIOS::GetMimeType(
diff --git a/ios/web/webui/web_ui_ios_data_source_impl.h b/ios/web/webui/web_ui_ios_data_source_impl.h index 9335e64..405b566c 100644 --- a/ios/web/webui/web_ui_ios_data_source_impl.h +++ b/ios/web/webui/web_ui_ios_data_source_impl.h
@@ -40,9 +40,8 @@ ~WebUIIOSDataSourceImpl() override; // Completes a request by sending our dictionary of localized strings. - void SendLocalizedStringsAsJSON( - const URLDataSourceIOS::GotDataCallback& callback, - bool from_js_module); + void SendLocalizedStringsAsJSON(URLDataSourceIOS::GotDataCallback callback, + bool from_js_module); private: class InternalDataSource; @@ -60,7 +59,7 @@ std::string GetSource() const; std::string GetMimeType(const std::string& path) const; void StartDataRequest(const std::string& path, - const URLDataSourceIOS::GotDataCallback& callback); + URLDataSourceIOS::GotDataCallback callback); int PathToIdrOrDefault(const std::string& path) const;
diff --git a/ios/web/webui/web_ui_ios_data_source_impl.mm b/ios/web/webui/web_ui_ios_data_source_impl.mm index ad48885..edd2f97 100644 --- a/ios/web/webui/web_ui_ios_data_source_impl.mm +++ b/ios/web/webui/web_ui_ios_data_source_impl.mm
@@ -44,10 +44,9 @@ std::string GetMimeType(const std::string& path) const override { return parent_->GetMimeType(path); } - void StartDataRequest( - const std::string& path, - const URLDataSourceIOS::GotDataCallback& callback) override { - return parent_->StartDataRequest(path, callback); + void StartDataRequest(const std::string& path, + URLDataSourceIOS::GotDataCallback callback) override { + return parent_->StartDataRequest(path, std::move(callback)); } bool ShouldReplaceExistingSource() const override { return parent_->replace_existing_source_; @@ -159,13 +158,13 @@ void WebUIIOSDataSourceImpl::StartDataRequest( const std::string& path, - const URLDataSourceIOS::GotDataCallback& callback) { + URLDataSourceIOS::GotDataCallback callback) { EnsureLoadTimeDataDefaultsAdded(); if (use_strings_js_) { bool from_js_module = path == "strings.m.js"; if (from_js_module || path == "strings.js") { - SendLocalizedStringsAsJSON(callback, from_js_module); + SendLocalizedStringsAsJSON(std::move(callback), from_js_module); return; } } @@ -174,15 +173,15 @@ DCHECK_NE(resource_id, -1); scoped_refptr<base::RefCountedMemory> response( GetWebClient()->GetDataResourceBytes(resource_id)); - callback.Run(response); + std::move(callback).Run(response); } void WebUIIOSDataSourceImpl::SendLocalizedStringsAsJSON( - const URLDataSourceIOS::GotDataCallback& callback, + URLDataSourceIOS::GotDataCallback callback, bool from_js_module) { std::string template_data; webui::AppendJsonJS(&localized_strings_, &template_data, from_js_module); - callback.Run(base::RefCountedString::TakeString(&template_data)); + std::move(callback).Run(base::RefCountedString::TakeString(&template_data)); } int WebUIIOSDataSourceImpl::PathToIdrOrDefault(const std::string& path) const {
diff --git a/ios/web_view/internal/passwords/web_view_password_feature_manager.h b/ios/web_view/internal/passwords/web_view_password_feature_manager.h index db4493c..bc322af 100644 --- a/ios/web_view/internal/passwords/web_view_password_feature_manager.h +++ b/ios/web_view/internal/passwords/web_view_password_feature_manager.h
@@ -20,6 +20,10 @@ bool ShouldCheckReuseOnLeakDetection() const override; + bool IsOptedInForAccountStorage() const override; + bool ShouldShowAccountStorageOptIn() const override; + void SetAccountStorageOptIn(bool opt_in) override; + private: DISALLOW_COPY_AND_ASSIGN(WebViewPasswordFeatureManager); };
diff --git a/ios/web_view/internal/passwords/web_view_password_feature_manager.mm b/ios/web_view/internal/passwords/web_view_password_feature_manager.mm index c06fb53..dcd66ef 100644 --- a/ios/web_view/internal/passwords/web_view_password_feature_manager.mm +++ b/ios/web_view/internal/passwords/web_view_password_feature_manager.mm
@@ -4,6 +4,8 @@ #include "ios/web_view/internal/passwords/web_view_password_feature_manager.h" +#include "base/logging.h" + #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." #endif @@ -18,4 +20,16 @@ return false; } +bool WebViewPasswordFeatureManager::IsOptedInForAccountStorage() const { + return false; +} + +bool WebViewPasswordFeatureManager::ShouldShowAccountStorageOptIn() const { + return false; +} + +void WebViewPasswordFeatureManager::SetAccountStorageOptIn(bool opt_in) { + NOTREACHED(); +} + } // namespace ios_web_view
diff --git a/ios/web_view/internal/web_view_web_client.mm b/ios/web_view/internal/web_view_web_client.mm index 2a83189..155b0b0 100644 --- a/ios/web_view/internal/web_view_web_client.mm +++ b/ios/web_view/internal/web_view_web_client.mm
@@ -63,6 +63,7 @@ std::string WebViewWebClient::GetUserAgent(web::UserAgentType type) const { return web::BuildUserAgentFromProduct( + web::UserAgentType::MOBILE, base::SysNSStringToUTF8([CWVWebView userAgentProduct])); }
diff --git a/services/network/public/cpp/network_connection_tracker.cc b/services/network/public/cpp/network_connection_tracker.cc index b67f9c0..ceec480 100644 --- a/services/network/public/cpp/network_connection_tracker.cc +++ b/services/network/public/cpp/network_connection_tracker.cc
@@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/task_runner.h" #include "base/threading/thread_task_runner_handle.h" -#include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/network/public/mojom/network_change_manager.mojom.h" #include "services/network/public/mojom/network_service.mojom.h" @@ -39,7 +38,7 @@ } // namespace NetworkConnectionTracker::NetworkConnectionTracker(BindingCallback callback) - : bind_request_callback_(callback), + : bind_receiver_callback_(callback), task_runner_(base::ThreadTaskRunnerHandle::Get()), connection_type_(kConnectionTypeInvalid), network_change_observer_list_( @@ -168,12 +167,10 @@ // Get mojo::Remote<NetworkChangeManager>. mojo::Remote<network::mojom::NetworkChangeManager> manager_remote; - bind_request_callback_.Run(manager_remote.BindNewPipeAndPassReceiver()); + bind_receiver_callback_.Run(manager_remote.BindNewPipeAndPassReceiver()); // Request notification from mojo::Remote<NetworkChangeManager>. - mojo::PendingRemote<network::mojom::NetworkChangeManagerClient> client_remote; - receiver_.Bind(client_remote.InitWithNewPipeAndPassReceiver()); - manager_remote->RequestNotifications(std::move(client_remote)); + manager_remote->RequestNotifications(receiver_.BindNewPipeAndPassRemote()); // base::Unretained is safe as |receiver_| is owned by |this|. receiver_.set_disconnect_handler(base::BindRepeating(
diff --git a/services/network/public/cpp/network_connection_tracker.h b/services/network/public/cpp/network_connection_tracker.h index e8497d1..864a03fb 100644 --- a/services/network/public/cpp/network_connection_tracker.h +++ b/services/network/public/cpp/network_connection_tracker.h
@@ -54,9 +54,9 @@ }; // Constructs a NetworkConnectionTracker. |callback| should bind the given - // NetworkChangeManagerRequest to the NetworkChangeManager that should be - // used. NetworkConnectionTracker does not need to be destroyed before the - // network service. + // mojo::PendingReceiver<NetworkChangeManager> to the NetworkChangeManager + // that should be used. NetworkConnectionTracker does not need to be destroyed + // before the network service. explicit NetworkConnectionTracker(BindingCallback callback); ~NetworkConnectionTracker() override; @@ -127,8 +127,8 @@ // restarts. void HandleNetworkServicePipeBroken(); - // Callback to bind a NetworkChangeManagerRequest. - const BindingCallback bind_request_callback_; + // Callback to bind a mojo::PendingReceiver<NetworkChangeManager>. + const BindingCallback bind_receiver_callback_; // The task runner that |this| lives on. scoped_refptr<base::SequencedTaskRunner> task_runner_;
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index 4756dcc..cda6dda7 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json
@@ -5991,6 +5991,9 @@ "test": "boringssl_ssl_tests" }, { + "args": [ + "--test-launcher-filter-file=../../testing/buildbot/filters/linux_trusty_rel.browser_tests.filter" + ], "merge": { "args": [], "script": "//testing/merge_scripts/standard_gtest_merge.py"
diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn index af859ee..e05a13f 100644 --- a/testing/buildbot/filters/BUILD.gn +++ b/testing/buildbot/filters/BUILD.gn
@@ -125,6 +125,12 @@ ] } +source_set("linux_trusty_rel_browser_tests_filters") { + data = [ + "//testing/buildbot/filters/linux_trusty_rel.browser_tests.filter", + ] +} + source_set("ozone_unittests_filters") { data = [ "//testing/buildbot/filters/chromeos.ozone_unittests.filter",
diff --git a/testing/buildbot/filters/linux_trusty_rel.browser_tests.filter b/testing/buildbot/filters/linux_trusty_rel.browser_tests.filter new file mode 100644 index 0000000..d110c86 --- /dev/null +++ b/testing/buildbot/filters/linux_trusty_rel.browser_tests.filter
@@ -0,0 +1,16 @@ +# http://crbug.com/1029355 + +CDM_10/ECKEncryptedMediaTest.DecryptOnly_VideoOnly_MP4_CBCS/0 +CDM_10/ECKEncryptedMediaTest.MultipeCdmTypes/0 +CDM_11/ECKEncryptedMediaTest.DecryptOnly_VideoOnly_MP4_CBCS/0 +MSE_ClearKey/EncryptedMediaTest.FrameSizeChangeVideo/0 +MSE_ClearKey/EncryptedMediaTest.Playback_AudioOnly_MP4_OPUS/0 +MSE_ClearKey/EncryptedMediaTest.Playback_Encryption_CBCS/0 +MSE_ClearKey/EncryptedMediaTest.Playback_VideoOnly_MP4_AV1/0 +MSE_ClearKey/EncryptedMediaTest.PolicyCheck/0 +MSE_ExternalClearKey/EncryptedMediaTest.Playback_VideoOnly_WebM_AV1/0 +SRC_ExternalClearKey/EncryptedMediaTest.ConfigChangeVideo_ClearToClear/0 +SRC_ExternalClearKey/EncryptedMediaTest.EncryptedMediaDisabled/0 +SRC_ExternalClearKey/EncryptedMediaTest.InvalidResponseKeyError/0 +SRC_ExternalClearKey/EncryptedMediaTest.Playback_EncryptedVideo_CBCS_EncryptedAudio_CENC/0 +SRC_ExternalClearKey/EncryptedMediaTest.Playback_VideoAudio_WebM_Opus/0 \ No newline at end of file
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl index d962d72..084d31450 100644 --- a/testing/buildbot/test_suite_exceptions.pyl +++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -236,6 +236,11 @@ 'shards': 31, }, }, + 'linux-trusty-rel': { + 'args': [ + '--test-launcher-filter-file=../../testing/buildbot/filters/linux_trusty_rel.browser_tests.filter', + ] + }, # chromium.win 'Win7 Tests (1)': { # This is for slow test execution that often becomes a critical path of
diff --git a/third_party/blink/common/feature_policy/document_policy.cc b/third_party/blink/common/feature_policy/document_policy.cc index 4275183..86fd51a 100644 --- a/third_party/blink/common/feature_policy/document_policy.cc +++ b/third_party/blink/common/feature_policy/document_policy.cc
@@ -62,25 +62,6 @@ } } -void DocumentPolicy::SetHeaderPolicy( - const ParsedDocumentPolicy& parsed_header) { - for (const ParsedDocumentPolicyDeclaration& parsed_declaration : - parsed_header) { - mojom::FeaturePolicyFeature feature = parsed_declaration.feature; - // TODO(iclelland): Generate this switch block - switch (feature) { - case mojom::FeaturePolicyFeature::kFontDisplay: - font_display_ = parsed_declaration.value.BoolValue(); - break; - case mojom::FeaturePolicyFeature::kUnoptimizedLosslessImages: - unoptimized_lossless_images_ = parsed_declaration.value.DoubleValue(); - break; - default: - NOTREACHED(); - } - } -} - void DocumentPolicy::UpdateFeatureState(const FeatureState& feature_state) { for (const auto& feature_and_value : feature_state) { // TODO(iclelland): Generate this switch block @@ -136,30 +117,14 @@ } bool DocumentPolicy::IsPolicyCompatible( - const ParsedDocumentPolicy& required_policy) { - FeatureState p_map = ParsedDocumentPolicyToFeatureState(RequiredPolicy()); - for (const ParsedDocumentPolicyDeclaration& req_p : required_policy) { + const DocumentPolicy::FeatureState& incoming_policy) { + const DocumentPolicy::FeatureState& state = GetFeatureState(); + for (const auto& e : incoming_policy) { // feature value > threshold => enabled - // value_a > value_b => value_a looser than value_b - if (p_map[req_p.feature] > req_p.value) + // value_a > value_b => value_a less strict than value_b + if (state.at(e.first) > e.second) return false; } return true; } - -// static -DocumentPolicy::FeatureState DocumentPolicy::ParsedDocumentPolicyToFeatureState( - const ParsedDocumentPolicy& policies) { - FeatureState result; - for (const ParsedDocumentPolicyDeclaration& policy : policies) - result[policy.feature] = policy.value; - return result; -} - -ParsedDocumentPolicy DocumentPolicy::RequiredPolicy() const { - // TODO(iclelland): This is currently a placeholder. - // To be implemented later. - return ParsedDocumentPolicy(); -} - } // namespace blink
diff --git a/third_party/blink/public/BUILD.gn b/third_party/blink/public/BUILD.gn index 0d923bf..26d3b52 100644 --- a/third_party/blink/public/BUILD.gn +++ b/third_party/blink/public/BUILD.gn
@@ -317,6 +317,7 @@ "web/mac/web_substring_util.h", "web/modules/autofill/web_form_element_observer.h", "web/modules/media/webmediaplayer_util.h", + "web/modules/mediastream/encoded_video_frame.h", "web/modules/mediastream/media_stream_video_sink.h", "web/modules/mediastream/media_stream_video_source.h", "web/modules/mediastream/media_stream_video_track.h",
diff --git a/third_party/blink/public/common/feature_policy/document_policy.h b/third_party/blink/public/common/feature_policy/document_policy.h index 991d698..f973b1e2 100644 --- a/third_party/blink/public/common/feature_policy/document_policy.h +++ b/third_party/blink/public/common/feature_policy/document_policy.h
@@ -64,13 +64,6 @@ // Each defined feature has a default policy, which determines the threshold // value to use when no policy has been declared. -struct BLINK_COMMON_EXPORT ParsedDocumentPolicyDeclaration { - mojom::FeaturePolicyFeature feature; - PolicyValue value; -}; - -using ParsedDocumentPolicy = std::vector<ParsedDocumentPolicyDeclaration>; - class BLINK_COMMON_EXPORT DocumentPolicy { public: using FeatureState = std::map<mojom::FeaturePolicyFeature, PolicyValue>; @@ -97,21 +90,14 @@ // Returns the value of the given feature on the given origin. PolicyValue GetFeatureValue(mojom::FeaturePolicyFeature feature) const; - // Sets the declared policy from the parsed Document-Policy HTTP header. - // Unrecognized features will be ignored. - void SetHeaderPolicy(const ParsedDocumentPolicy& parsed_header); - // Returns the current threshold values assigned to all document policies. // the declared header policy as well as any unadvertised required policies // (such as sandbox policies). FeatureState GetFeatureState() const; - // Returns the required policy to advertise for an outgoing HTTP request. - ParsedDocumentPolicy RequiredPolicy() const; - - // Returns true if this document policy is compatible with the given required - // policy. - bool IsPolicyCompatible(const ParsedDocumentPolicy& required_policy); + // Returns true if this document policy is compatible with the incoming + // document policy. + bool IsPolicyCompatible(const FeatureState& incoming_policy); // Returns the list of features which can be controlled by Document Policy, // and their default values. @@ -127,9 +113,6 @@ void UpdateFeatureState(const FeatureState& feature_state); - static FeatureState ParsedDocumentPolicyToFeatureState( - const ParsedDocumentPolicy& policies); - // Threshold values for each defined feature. // TODO(iclelland): Generate these members; pack booleans in bitfields if // possible.
diff --git a/third_party/blink/public/web/modules/mediastream/encoded_video_frame.h b/third_party/blink/public/web/modules/mediastream/encoded_video_frame.h new file mode 100644 index 0000000..17fe0ca --- /dev/null +++ b/third_party/blink/public/web/modules/mediastream/encoded_video_frame.h
@@ -0,0 +1,44 @@ +// Copyright 2019 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. + +#ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_ENCODED_VIDEO_FRAME_H_ +#define THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_ENCODED_VIDEO_FRAME_H_ + +#include "base/containers/span.h" +#include "base/optional.h" +#include "media/base/video_codecs.h" +#include "media/base/video_color_space.h" +#include "third_party/blink/renderer/platform/wtf/thread_safe_ref_counted.h" +#include "ui/gfx/geometry/size.h" + +namespace blink { + +// Interface for accessing an encoded frame +class EncodedVideoFrame : public WTF::ThreadSafeRefCounted<EncodedVideoFrame> { + public: + virtual ~EncodedVideoFrame() = default; + + // Returns a span of the data of the encoded frame + virtual base::span<const uint8_t> Data() const = 0; + + // Returns the encoding of the encoded frame + virtual media::VideoCodec Codec() const = 0; + + // Returns true if this frame is a key frame + virtual bool IsKeyFrame() const = 0; + + // Returns color space stored in the encoded frame. + virtual base::Optional<media::VideoColorSpace> ColorSpace() const = 0; + + // Returns resolution of encoded frame, or 0x0 if not set. + virtual gfx::Size Resolution() const = 0; +}; + +using EncodedVideoFrameCB = + base::RepeatingCallback<void(scoped_refptr<EncodedVideoFrame>, + base::TimeTicks estimated_capture_time)>; + +} // namespace blink + +#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_ENCODED_VIDEO_FRAME_H_
diff --git a/third_party/blink/public/web/modules/mediastream/media_stream_video_sink.h b/third_party/blink/public/web/modules/mediastream/media_stream_video_sink.h index 7ea183e..53a7581 100644 --- a/third_party/blink/public/web/modules/mediastream/media_stream_video_sink.h +++ b/third_party/blink/public/web/modules/mediastream/media_stream_video_sink.h
@@ -10,6 +10,7 @@ #include "third_party/blink/public/platform/modules/mediastream/web_media_stream_sink.h" #include "third_party/blink/public/platform/web_common.h" #include "third_party/blink/public/platform/web_media_stream_track.h" +#include "third_party/blink/public/web/modules/mediastream/encoded_video_frame.h" namespace blink { @@ -28,10 +29,10 @@ MediaStreamVideoSink(); ~MediaStreamVideoSink() override; - // A subclass should call ConnectToTrack when it is ready to receive data from - // a video track. Before destruction, DisconnectFromTrack must be called. - // This base class holds a reference to the WebMediaStreamTrack until - // DisconnectFromTrack is called. + // A subclass should call ConnectToTrack and/or ConnectEncodedToTrack when it + // is ready to receive data from a video track. Before destruction, + // DisconnectFromTrack must be called. This base class holds a reference to + // the WebMediaStreamTrack until DisconnectFromTrack is called. // // Calls to these methods must be done on the main render thread. // Note that |callback| for frame delivery happens on the IO thread. @@ -43,10 +44,14 @@ // |is_sink_secure| indicates if this MediaStreamVideoSink is secure (i.e. // meets output protection requirement). Generally, this should be false // unless you know what you are doing. + // Encoded sinks are never secure. void ConnectToTrack(const WebMediaStreamTrack& track, const VideoCaptureDeliverFrameCB& callback, bool is_sink_secure); + void ConnectEncodedToTrack(const WebMediaStreamTrack& track, + const EncodedVideoFrameCB& callback); void DisconnectFromTrack(); + void DisconnectEncodedFromTrack(); // Returns the currently-connected track, or a null instance otherwise. const WebMediaStreamTrack& connected_track() const { @@ -56,6 +61,7 @@ private: // Set by ConnectToTrack() and cleared by DisconnectFromTrack(). WebMediaStreamTrack connected_track_; + WebMediaStreamTrack connected_encoded_track_; }; } // namespace blink
diff --git a/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h b/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h index b1084735..1a8695cf 100644 --- a/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h +++ b/third_party/blink/public/web/modules/mediastream/media_stream_video_source.h
@@ -25,6 +25,7 @@ #include "third_party/blink/public/platform/web_media_constraints.h" #include "third_party/blink/public/platform/web_media_stream_source.h" #include "third_party/blink/public/platform/web_media_stream_track.h" +#include "third_party/blink/public/web/modules/mediastream/encoded_video_frame.h" namespace base { class SingleThreadTaskRunner; @@ -71,6 +72,7 @@ void AddTrack(MediaStreamVideoTrack* track, const VideoTrackAdapterSettings& track_adapter_settings, const VideoCaptureDeliverFrameCB& frame_callback, + const EncodedVideoFrameCB& encoded_frame_callback, const VideoTrackSettingsCallback& settings_callback, const VideoTrackFormatCallback& format_callback, ConstraintsOnceCallback callback); @@ -151,6 +153,14 @@ virtual base::Optional<media::VideoCaptureParams> GetCurrentCaptureParams() const; + // Returns true if encoded output can be enabled in the source. + virtual bool SupportsEncodedOutput() const; + + // Notifies the source about that the number of encoded sinks have been + // updated. Note: Can only be called if the number of encoded sinks have + // actually changed! + void UpdateNumEncodedSinks(); + bool IsRunning() const { return state_ == STARTED; } size_t NumTracks() const { @@ -176,9 +186,10 @@ // An implementation must start capturing frames after this method is called. // When the source has started or failed to start OnStartDone must be called. // An implementation must call |frame_callback| on the IO thread with the - // captured frames. - virtual void StartSourceImpl( - const VideoCaptureDeliverFrameCB& frame_callback) = 0; + // captured frames, and |encoded_frame_callback| with encoded frames if + // supported and enabled via OnEncodedSinkEnabled. + virtual void StartSourceImpl(VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback) = 0; void OnStartDone(mojom::MediaStreamRequestResult result); // A subclass that supports restart must override this method such that it @@ -243,6 +254,14 @@ // Optionally overridden by subclasses to implement changing source. virtual void ChangeSourceImpl(const MediaStreamDevice& new_device) {} + // Optionally override by subclasses to implement encoded source control. + // The method is called when at least one encoded sink has been added. + virtual void OnEncodedSinkEnabled() {} + + // Optionally override by subclasses to implement encoded source control. + // The method is called when the last encoded sink has been removed. + virtual void OnEncodedSinkDisabled() {} + enum State { NEW, STARTING, @@ -274,6 +293,8 @@ void UpdateTrackSettings(MediaStreamVideoTrack* track, const VideoTrackAdapterSettings& adapter_settings); void DidStopSource(RestartResult result); + void NotifyCapturingLinkSecured(size_t num_encoded_sinks); + size_t CountEncodedSinks() const; State state_; @@ -281,6 +302,7 @@ PendingTrackInfo( MediaStreamVideoTrack* track, const VideoCaptureDeliverFrameCB& frame_callback, + const EncodedVideoFrameCB& encoded_frame_callback, const VideoTrackSettingsCallback& settings_callback, const VideoTrackFormatCallback& format_callback, std::unique_ptr<VideoTrackAdapterSettings> adapter_settings, @@ -291,6 +313,7 @@ MediaStreamVideoTrack* track; VideoCaptureDeliverFrameCB frame_callback; + EncodedVideoFrameCB encoded_frame_callback; VideoTrackSettingsCallback settings_callback; VideoTrackFormatCallback format_callback; // TODO(guidou): Make |adapter_settings| a regular field instead of a
diff --git a/third_party/blink/public/web/modules/mediastream/media_stream_video_track.h b/third_party/blink/public/web/modules/mediastream/media_stream_video_track.h index 982ab84..ccf2179 100644 --- a/third_party/blink/public/web/modules/mediastream/media_stream_video_track.h +++ b/third_party/blink/public/web/modules/mediastream/media_stream_video_track.h
@@ -18,6 +18,7 @@ #include "third_party/blink/public/platform/modules/mediastream/web_platform_media_stream_track.h" #include "third_party/blink/public/platform/web_common.h" #include "third_party/blink/public/platform/web_media_stream_track.h" +#include "third_party/blink/public/web/modules/mediastream/encoded_video_frame.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h" namespace blink { @@ -90,6 +91,18 @@ bool is_sink_secure); void RemoveSink(blink::WebMediaStreamSink* sink); + // Adds |callback| for encoded frame output on the IO thread. The function + // will cause generation of a keyframe from the source. + // Encoded sinks are not secure. + void AddEncodedSink(blink::WebMediaStreamSink* sink, + EncodedVideoFrameCB callback); + + // Removes encoded callbacks associated with |sink|. + void RemoveEncodedSink(blink::WebMediaStreamSink* sink); + + // Returns the number of currently present encoded sinks. + size_t CountEncodedSinks() const; + void OnReadyStateChanged(blink::WebMediaStreamSource::ReadyState state); const base::Optional<bool>& noise_reduction() const { @@ -146,11 +159,15 @@ PreservesColorSpace); FRIEND_TEST_ALL_PREFIXES(PepperToVideoTrackAdapterTest, PutFrame); + void UpdateSourceCapturingSecure(); + void UpdateSourceHasConsumers(); + // In debug builds, check that all methods that could cause object graph // or data flow changes are being called on the main thread. THREAD_CHECKER(main_render_thread_checker_); std::vector<blink::WebMediaStreamSink*> sinks_; + std::vector<blink::WebMediaStreamSink*> encoded_sinks_; // |FrameDeliverer| is an internal helper object used for delivering video // frames on the IO-thread using callbacks to all registered tracks.
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn index 1ecf7f56..ab3b7bd 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn
@@ -1552,6 +1552,7 @@ "style/svg_computed_style_test.cc", "svg/animation/priority_queue_test.cc", "svg/graphics/svg_image_test.cc", + "svg/svg_foreign_object_element_test.cc", "svg/svg_path_parser_test.cc", "svg/svg_text_content_element_test.cc", "svg/svg_use_element_test.cc",
diff --git a/third_party/blink/renderer/core/animation/animation.cc b/third_party/blink/renderer/core/animation/animation.cc index 1dc05ac0..3c52387 100644 --- a/third_party/blink/renderer/core/animation/animation.cc +++ b/third_party/blink/renderer/core/animation/animation.cc
@@ -1538,7 +1538,7 @@ // An Animation with zero playback rate will produce no visual output, so // there is no reason to composite it. - if (playback_rate_ == 0) + if (EffectivePlaybackRate() == 0) reasons |= CompositorAnimations::kInvalidAnimationOrEffect; // Cannot composite an infinite duration animation with a negative playback
diff --git a/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm.cc b/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm.cc index bbb0887..546c4b8 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm.cc
@@ -373,9 +373,8 @@ // If block-size is non-auto, subtract the space for content we've consumed in // previous fragments. This is necessary when we're nested inside another // fragmentation context. - if (is_constrained_by_outer_fragmentation_context_ && - column_size.block_size != kIndefiniteSize) { - if (BreakToken()) + if (column_size.block_size != kIndefiniteSize) { + if (BreakToken() && is_constrained_by_outer_fragmentation_context_) column_size.block_size -= BreakToken()->ConsumedBlockSize(); // Subtract the space already taken in the current fragment (spanners and
diff --git a/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc b/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc index 85c973e..dd1ad94 100644 --- a/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc +++ b/third_party/blink/renderer/core/layout/ng/ng_column_layout_algorithm_test.cc
@@ -4856,6 +4856,47 @@ EXPECT_EQ(expectation, dump); } +TEST_F(NGColumnLayoutAlgorithmTest, FixedSizeMulticolWithSpanner) { + SetBodyInnerHTML(R"HTML( + <style> + #parent { + columns: 3; + column-gap: 10px; + column-fill: auto; + width: 320px; + height: 300px; + } + </style> + <div id="container"> + <div id="parent"> + <div style="width:33px; height:300px;"></div> + <div style="column-span:all; width:44px; height:50px;"></div> + <div style="width:55px; height:450px;"></div> + </div> + </div> + )HTML"); + + String dump = DumpFragmentTree(GetElementById("container")); + String expectation = R"DUMP(.:: LayoutNG Physical Fragment Tree ::. + offset:unplaced size:1000x300 + offset:0,0 size:320x300 + offset:0,0 size:100x100 + offset:0,0 size:33x100 + offset:110,0 size:100x100 + offset:0,0 size:33x100 + offset:220,0 size:100x100 + offset:0,0 size:33x100 + offset:0,100 size:44x50 + offset:0,150 size:100x150 + offset:0,0 size:55x150 + offset:110,150 size:100x150 + offset:0,0 size:55x150 + offset:220,150 size:100x150 + offset:0,0 size:55x150 +)DUMP"; + EXPECT_EQ(expectation, dump); +} + TEST_F(NGColumnLayoutAlgorithmTest, BreakInsideSpannerWithMargins) { SetBodyInnerHTML(R"HTML( <style>
diff --git a/third_party/blink/renderer/core/layout/svg/layout_svg_resource_filter_primitive.cc b/third_party/blink/renderer/core/layout/svg/layout_svg_resource_filter_primitive.cc index f697338..7e12984 100644 --- a/third_party/blink/renderer/core/layout/svg/layout_svg_resource_filter_primitive.cc +++ b/third_party/blink/renderer/core/layout/svg/layout_svg_resource_filter_primitive.cc
@@ -61,14 +61,14 @@ DCHECK(GetElement()); auto& element = To<SVGFilterPrimitiveStandardAttributes>(*GetElement()); const SVGComputedStyle& new_style = StyleRef().SvgStyle(); - if (IsSVGFEFloodElement(element) || IsSVGFEDropShadowElement(element)) { + if (IsA<SVGFEFloodElement>(element) || IsSVGFEDropShadowElement(element)) { CheckForColorChange(element, svg_names::kFloodColorAttr, diff, old_style->SvgStyle().FloodColor(), new_style.FloodColor()); if (new_style.FloodOpacity() != old_style->SvgStyle().FloodOpacity()) element.PrimitiveAttributeChanged(svg_names::kFloodOpacityAttr); } else if (IsSVGFEDiffuseLightingElement(element) || - IsSVGFESpecularLightingElement(element)) { + IsA<SVGFESpecularLightingElement>(element)) { CheckForColorChange(element, svg_names::kLightingColorAttr, diff, old_style->SvgStyle().LightingColor(), new_style.LightingColor());
diff --git a/third_party/blink/renderer/core/layout/svg/layout_svg_text_path.cc b/third_party/blink/renderer/core/layout/svg/layout_svg_text_path.cc index 9b48551..6b1e61c 100644 --- a/third_party/blink/renderer/core/layout/svg/layout_svg_text_path.cc +++ b/third_party/blink/renderer/core/layout/svg/layout_svg_text_path.cc
@@ -60,8 +60,7 @@ } std::unique_ptr<PathPositionMapper> LayoutSVGTextPath::LayoutPath() const { - const SVGTextPathElement& text_path_element = - ToSVGTextPathElement(*GetNode()); + const auto& text_path_element = To<SVGTextPathElement>(*GetNode()); Element* target_element = SVGURIReference::TargetElementFromIRIString( text_path_element.HrefString(), text_path_element.TreeScopeForIdResolution());
diff --git a/third_party/blink/renderer/core/layout/svg/svg_text_layout_engine.cc b/third_party/blink/renderer/core/layout/svg/svg_text_layout_engine.cc index cfbf2ca..b4af6bc 100644 --- a/third_party/blink/renderer/core/layout/svg/svg_text_layout_engine.cc +++ b/third_party/blink/renderer/core/layout/svg/svg_text_layout_engine.cc
@@ -273,7 +273,7 @@ continue; SVGInlineFlowBox* flow_box = ToSVGInlineFlowBox(child); - bool is_text_path = IsSVGTextPathElement(*node); + bool is_text_path = IsA<SVGTextPathElement>(*node); if (is_text_path) BeginTextPathLayout(flow_box);
diff --git a/third_party/blink/renderer/core/paint/image_element_timing_test.cc b/third_party/blink/renderer/core/paint/image_element_timing_test.cc index b146125..1349b35 100644 --- a/third_party/blink/renderer/core/paint/image_element_timing_test.cc +++ b/third_party/blink/renderer/core/paint/image_element_timing_test.cc
@@ -42,17 +42,21 @@ // the LayoutImage. LayoutImage* SetImageResource(const char* id, int width, int height) { ImageResourceContent* content = CreateImageForTest(width, height); - auto* layout_image = ToLayoutImage(GetLayoutObjectById(id)); - layout_image->ImageResource()->SetImageResource(content); - return layout_image; + if (auto* layout_image = ToLayoutImageOrNull(GetLayoutObjectById(id))) { + layout_image->ImageResource()->SetImageResource(content); + return layout_image; + } + return nullptr; } // Similar to above but for a LayoutSVGImage. LayoutSVGImage* SetSVGImageResource(const char* id, int width, int height) { ImageResourceContent* content = CreateImageForTest(width, height); - auto* layout_image = ToLayoutSVGImage(GetLayoutObjectById(id)); - layout_image->ImageResource()->SetImageResource(content); - return layout_image; + if (auto* layout_image = ToLayoutSVGImageOrNull(GetLayoutObjectById(id))) { + layout_image->ImageResource()->SetImageResource(content); + return layout_image; + } + return nullptr; } bool ImagesNotifiedContains( @@ -156,13 +160,10 @@ TEST_F(ImageElementTimingTest, ImageInsideSVG) { frame_test_helpers::LoadHTMLString( web_view_helper_.GetWebView()->MainFrameImpl(), R"HTML( - <svg mask="url(#mask)"> - <mask id="mask"> - <foreignObject width="100" height="100"> - <img elementtiming="image-inside-svg" id="target" style='width: 100px; height: 100px;'/> - </foreignObject> - </mask> - <rect width="100" height="100" fill="green"/> + <svg> + <foreignObject width="100" height="100"> + <img elementtiming="image-inside-svg" id="target" style='width: 100px; height: 100px;'/> + </foreignObject> </svg> )HTML", base_url_); @@ -175,6 +176,26 @@ std::make_pair(layout_image, layout_image->CachedImage()))); } +TEST_F(ImageElementTimingTest, ImageInsideNonRenderedSVG) { + frame_test_helpers::LoadHTMLString( + web_view_helper_.GetWebView()->MainFrameImpl(), R"HTML( + <svg mask="url(#mask)"> + <mask id="mask"> + <foreignObject width="100" height="100"> + <img elementtiming="image-inside-svg" id="target" style='width: 100px; height: 100px;'/> + </foreignObject> + </mask> + <rect width="100" height="100" fill="green"/> + </svg> + )HTML", + base_url_); + + // HTML inside foreignObject in a non-rendered SVG subtree should not generate + // layout objects. Generating layout objects for caused crashes + // (crbug.com/905850) as well as correctness issues. + EXPECT_FALSE(GetLayoutObjectById("target")); +} + TEST_F(ImageElementTimingTest, ImageRemoved) { frame_test_helpers::LoadHTMLString( web_view_helper_.GetWebView()->MainFrameImpl(), R"HTML(
diff --git a/third_party/blink/renderer/core/style/computed_style.cc b/third_party/blink/renderer/core/style/computed_style.cc index b2d7aeb..5552ab05 100644 --- a/third_party/blink/renderer/core/style/computed_style.cc +++ b/third_party/blink/renderer/core/style/computed_style.cc
@@ -121,11 +121,11 @@ ASSERT_SIZE(ComputedStyle, SameSizeAsComputedStyle); scoped_refptr<ComputedStyle> ComputedStyle::Create() { - return base::AdoptRef(new ComputedStyle(InitialStyle())); + return base::AdoptRef(new ComputedStyle(PassKey(), InitialStyle())); } scoped_refptr<ComputedStyle> ComputedStyle::CreateInitialStyle() { - return base::AdoptRef(new ComputedStyle()); + return base::AdoptRef(new ComputedStyle(PassKey())); } ComputedStyle& ComputedStyle::MutableInitialStyle() { @@ -161,7 +161,7 @@ } scoped_refptr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) { - return base::AdoptRef(new ComputedStyle(other)); + return base::AdoptRef(new ComputedStyle(PassKey(), other)); } ALWAYS_INLINE ComputedStyle::ComputedStyle() @@ -174,6 +174,11 @@ RefCounted<ComputedStyle>(), svg_style_(o.svg_style_) {} +ALWAYS_INLINE ComputedStyle::ComputedStyle(PassKey key) : ComputedStyle() {} + +ALWAYS_INLINE ComputedStyle::ComputedStyle(PassKey key, const ComputedStyle& o) + : ComputedStyle(o) {} + static bool PseudoElementStylesEqual(const ComputedStyle& old_style, const ComputedStyle& new_style) { if (!old_style.HasAnyPseudoElementStyles() &&
diff --git a/third_party/blink/renderer/core/style/computed_style.h b/third_party/blink/renderer/core/style/computed_style.h index e84d5e4..9c775d4 100644 --- a/third_party/blink/renderer/core/style/computed_style.h +++ b/third_party/blink/renderer/core/style/computed_style.h
@@ -27,6 +27,7 @@ #define THIRD_PARTY_BLINK_RENDERER_CORE_STYLE_COMPUTED_STYLE_H_ #include <memory> +#include "base/util/type_safety/pass_key.h" #include "third_party/blink/renderer/core/core_export.h" #include "third_party/blink/renderer/core/css/css_property_names.h" #include "third_party/blink/renderer/core/css/properties/css_property.h" @@ -294,6 +295,11 @@ CORE_EXPORT static ComputedStyle& MutableInitialStyle(); public: + using PassKey = util::PassKey<ComputedStyle>; + + ALWAYS_INLINE ComputedStyle(PassKey, const ComputedStyle&); + ALWAYS_INLINE explicit ComputedStyle(PassKey); + CORE_EXPORT static scoped_refptr<ComputedStyle> Create(); static scoped_refptr<ComputedStyle> CreateAnonymousStyleWithDisplay( const ComputedStyle& parent_style,
diff --git a/third_party/blink/renderer/core/svg/svg_fe_component_transfer_element.cc b/third_party/blink/renderer/core/svg/svg_fe_component_transfer_element.cc index 7a2bcc3..9b859ef 100644 --- a/third_party/blink/renderer/core/svg/svg_fe_component_transfer_element.cc +++ b/third_party/blink/renderer/core/svg/svg_fe_component_transfer_element.cc
@@ -71,11 +71,11 @@ element = Traversal<SVGElement>::NextSibling(*element)) { if (auto* func_r = ToSVGFEFuncRElementOrNull(*element)) red = func_r->TransferFunction(); - else if (auto* func_g = ToSVGFEFuncGElementOrNull(*element)) + else if (auto* func_g = DynamicTo<SVGFEFuncGElement>(*element)) green = func_g->TransferFunction(); else if (auto* func_b = ToSVGFEFuncBElementOrNull(*element)) blue = func_b->TransferFunction(); - else if (auto* func_a = ToSVGFEFuncAElementOrNull(*element)) + else if (auto* func_a = DynamicTo<SVGFEFuncAElement>(*element)) alpha = func_a->TransferFunction(); }
diff --git a/third_party/blink/renderer/core/svg/svg_fe_light_element.cc b/third_party/blink/renderer/core/svg/svg_fe_light_element.cc index f196439..da0c172 100644 --- a/third_party/blink/renderer/core/svg/svg_fe_light_element.cc +++ b/third_party/blink/renderer/core/svg/svg_fe_light_element.cc
@@ -133,7 +133,7 @@ SVGElement::InvalidationGuard invalidation_guard(this); if (auto* diffuse = ToSVGFEDiffuseLightingElementOrNull(*parent)) diffuse->LightElementAttributeChanged(this, attr_name); - else if (auto* specular = ToSVGFESpecularLightingElementOrNull(*parent)) + else if (auto* specular = DynamicTo<SVGFESpecularLightingElement>(*parent)) specular->LightElementAttributeChanged(this, attr_name); return;
diff --git a/third_party/blink/renderer/core/svg/svg_foreign_object_element.cc b/third_party/blink/renderer/core/svg/svg_foreign_object_element.cc index 6ccb144..676129d27 100644 --- a/third_party/blink/renderer/core/svg/svg_foreign_object_element.cc +++ b/third_party/blink/renderer/core/svg/svg_foreign_object_element.cc
@@ -125,6 +125,21 @@ LayoutObject* SVGForeignObjectElement::CreateLayoutObject(const ComputedStyle&, LegacyLayout) { + // Suppress foreignObject LayoutObjects in SVG hidden containers. + // LayoutSVGHiddenContainers does not allow the subtree to be rendered, but + // allow LayoutObject descendants to be created. That will causes crashes in + // the layout code if object creation is not inhibited for foreignObject + // subtrees (https://crbug.com/1027905). + // Note that we currently do not support foreignObject instantiation via + // <use>, and attachShadow is not allowed on SVG elements, hence it is safe to + // use parentElement() here. + for (Element* ancestor = parentElement(); + ancestor && ancestor->IsSVGElement(); + ancestor = ancestor->parentElement()) { + if (ancestor->GetLayoutObject() && + ancestor->GetLayoutObject()->IsSVGHiddenContainer()) + return nullptr; + } return new LayoutSVGForeignObject(this); }
diff --git a/third_party/blink/renderer/core/svg/svg_foreign_object_element_test.cc b/third_party/blink/renderer/core/svg/svg_foreign_object_element_test.cc new file mode 100644 index 0000000..42d0805 --- /dev/null +++ b/third_party/blink/renderer/core/svg/svg_foreign_object_element_test.cc
@@ -0,0 +1,59 @@ +// Copyright 2019 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. + +#include "third_party/blink/renderer/core/svg/svg_foreign_object_element.h" + +#include "third_party/blink/renderer/core/html/html_element.h" +#include "third_party/blink/renderer/core/layout/layout_object.h" +#include "third_party/blink/renderer/core/style/computed_style.h" +#include "third_party/blink/renderer/core/testing/page_test_base.h" + +namespace blink { + +class SVGForeignObjectElementTest : public PageTestBase {}; + +TEST_F(SVGForeignObjectElementTest, NoLayoutObjectInNonRendered) { + GetDocument().body()->SetInnerHTMLFromString(R"HTML( + <svg> + <pattern> + <foreignObject id="fo"></foreignObject> + </pattern> + </svg> + )HTML"); + + UpdateAllLifecyclePhasesForTest(); + + Element* foreign_object = GetDocument().getElementById("fo"); + EXPECT_FALSE(foreign_object->GetLayoutObject()); + + scoped_refptr<ComputedStyle> style = ComputedStyle::Create(); + LayoutObject* layout_object = + foreign_object->CreateLayoutObject(*style, LegacyLayout::kAuto); + EXPECT_FALSE(layout_object); +} + +TEST_F(SVGForeignObjectElementTest, ReferenceForeignObjectInNonRenderedCrash) { + GetDocument().body()->SetInnerHTMLFromString(R"HTML( + <style> + div { writing-mode: vertical-rl; } + div > svg { float: right; } + </style> + <svg> + <radialGradient id="gradient"> + <pattern> + <foreignObject> + <div id="foRoot"> + <svg><rect fill="url(#gradient)" /></svg> + </div> + </foreignObject> + </pattern> + </radialGradient> + </svg> + )HTML"); + + // This should not trigger any DCHECK failures or crashes. + UpdateAllLifecyclePhasesForTest(); +} + +} // namespace blink
diff --git a/third_party/blink/renderer/core/svg/svg_tspan_element.cc b/third_party/blink/renderer/core/svg/svg_tspan_element.cc index 5b876af..3f074216 100644 --- a/third_party/blink/renderer/core/svg/svg_tspan_element.cc +++ b/third_party/blink/renderer/core/svg/svg_tspan_element.cc
@@ -36,7 +36,8 @@ bool SVGTSpanElement::LayoutObjectIsNeeded(const ComputedStyle& style) const { if (parentNode() && (IsSVGAElement(*parentNode()) || IsSVGTextElement(*parentNode()) || - IsSVGTextPathElement(*parentNode()) || IsSVGTSpanElement(*parentNode()))) + IsA<SVGTextPathElement>(*parentNode()) || + IsSVGTSpanElement(*parentNode()))) return SVGElement::LayoutObjectIsNeeded(style); return false;
diff --git a/third_party/blink/renderer/modules/mediastream/BUILD.gn b/third_party/blink/renderer/modules/mediastream/BUILD.gn index 7607eb4..5dde0a3 100644 --- a/third_party/blink/renderer/modules/mediastream/BUILD.gn +++ b/third_party/blink/renderer/modules/mediastream/BUILD.gn
@@ -13,6 +13,7 @@ "apply_constraints_request.cc", "apply_constraints_request.h", "dom_window_media_stream.h", + "encoded_frame.h", "input_device_info.cc", "input_device_info.h", "local_media_stream_audio_source.cc", @@ -105,6 +106,7 @@ sources = [ "mock_constraint_factory.cc", "mock_constraint_factory.h", + "mock_encoded_video_frame.h", "mock_media_stream_registry.cc", "mock_media_stream_registry.h", "mock_media_stream_video_sink.cc",
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.cc index ab4f339..3a78511 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.cc
@@ -86,10 +86,11 @@ } void MediaStreamVideoCapturerSource::StartSourceImpl( - const VideoCaptureDeliverFrameCB& frame_callback) { + VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); state_ = STARTING; - frame_callback_ = frame_callback; + frame_callback_ = std::move(frame_callback); source_->StartCapture( capture_params_, frame_callback_, WTF::BindRepeating(&MediaStreamVideoCapturerSource::OnRunStateChanged,
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.h b/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.h index 6e9be4d..dbf6bf6 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.h +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_capturer_source.h
@@ -71,8 +71,8 @@ void OnLog(const std::string& message) override; void OnHasConsumers(bool has_consumers) override; void OnCapturingLinkSecured(bool is_secure) override; - void StartSourceImpl( - const VideoCaptureDeliverFrameCB& frame_callback) override; + void StartSourceImpl(VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback) override; void StopSourceImpl() override; void StopSourceForRestartImpl() override; void RestartSourceImpl(const media::VideoCaptureFormat& new_format) override;
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_sink.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_sink.cc index 71a6f20..3040687 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_sink.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_sink.cc
@@ -25,11 +25,31 @@ AddSinkToMediaStreamTrack(track, this, callback, is_sink_secure); } +void MediaStreamVideoSink::ConnectEncodedToTrack( + const WebMediaStreamTrack& track, + const EncodedVideoFrameCB& callback) { + DCHECK(connected_encoded_track_.IsNull()); + connected_encoded_track_ = track; + MediaStreamVideoTrack* const video_track = + MediaStreamVideoTrack::GetVideoTrack(track); + DCHECK(video_track); + video_track->AddEncodedSink(this, callback); +} + void MediaStreamVideoSink::DisconnectFromTrack() { RemoveSinkFromMediaStreamTrack(connected_track_, this); connected_track_.Reset(); } +void MediaStreamVideoSink::DisconnectEncodedFromTrack() { + MediaStreamVideoTrack* const video_track = + MediaStreamVideoTrack::GetVideoTrack(connected_encoded_track_); + if (video_track) { + video_track->RemoveEncodedSink(this); + } + connected_encoded_track_.Reset(); +} + void MediaStreamVideoSink::OnFrameDropped( media::VideoCaptureFrameDropReason reason) { if (connected_track_.IsNull())
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc index b7f3ca22..ef71ae2f 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_source.cc
@@ -49,6 +49,7 @@ MediaStreamVideoTrack* track, const VideoTrackAdapterSettings& track_adapter_settings, const VideoCaptureDeliverFrameCB& frame_callback, + const EncodedVideoFrameCB& encoded_frame_callback, const VideoTrackSettingsCallback& settings_callback, const VideoTrackFormatCallback& format_callback, ConstraintsOnceCallback callback) { @@ -58,15 +59,20 @@ secure_tracker_.Add(track, true); pending_tracks_.push_back(PendingTrackInfo( - track, frame_callback, settings_callback, format_callback, + track, frame_callback, encoded_frame_callback, settings_callback, + format_callback, std::make_unique<VideoTrackAdapterSettings>(track_adapter_settings), std::move(callback))); switch (state_) { case NEW: { state_ = STARTING; - StartSourceImpl(ConvertToBaseCallback(CrossThreadBindRepeating( - &VideoTrackAdapter::DeliverFrameOnIO, track_adapter_))); + StartSourceImpl( + ConvertToBaseCallback(CrossThreadBindRepeating( + &VideoTrackAdapter::DeliverFrameOnIO, track_adapter_)), + ConvertToBaseCallback(CrossThreadBindRepeating( + &VideoTrackAdapter::DeliverEncodedVideoFrameOnIO, + track_adapter_))); break; } case STARTING: @@ -287,7 +293,14 @@ bool is_secure) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); secure_tracker_.Update(track, is_secure); - OnCapturingLinkSecured(secure_tracker_.is_capturing_secure()); + NotifyCapturingLinkSecured(CountEncodedSinks()); +} + +void MediaStreamVideoSource::NotifyCapturingLinkSecured( + size_t num_encoded_sinks) { + // Encoded sinks imply insecure sinks. + OnCapturingLinkSecured(secure_tracker_.is_capturing_secure() && + num_encoded_sinks == 0); } void MediaStreamVideoSource::SetDeviceRotationDetection(bool enabled) { @@ -312,6 +325,26 @@ return base::Optional<media::VideoCaptureParams>(); } +size_t MediaStreamVideoSource::CountEncodedSinks() const { + return std::accumulate(tracks_.begin(), tracks_.end(), size_t(0), + [](size_t accum, MediaStreamVideoTrack* track) { + return accum + track->CountEncodedSinks(); + }); +} + +void MediaStreamVideoSource::UpdateNumEncodedSinks() { + DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); + size_t count = CountEncodedSinks(); + DCHECK(SupportsEncodedOutput() || count == 0); + if (count == 1) { + OnEncodedSinkEnabled(); + } else if (count == 0) { + OnEncodedSinkDisabled(); + } + // Encoded sinks are insecure. + NotifyCapturingLinkSecured(count); +} + void MediaStreamVideoSource::DoChangeSource( const MediaStreamDevice& new_device) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); @@ -374,10 +407,10 @@ } if (result == mojom::blink::MediaStreamRequestResult::OK) { - track_adapter_->AddTrack(track_info.track, track_info.frame_callback, - track_info.settings_callback, - track_info.format_callback, - *track_info.adapter_settings); + track_adapter_->AddTrack( + track_info.track, track_info.frame_callback, + track_info.encoded_frame_callback, track_info.settings_callback, + track_info.format_callback, *track_info.adapter_settings); UpdateTrackSettings(track_info.track, *track_info.adapter_settings); } @@ -446,15 +479,21 @@ track->SetTrackAdapterSettings(adapter_settings); } +bool MediaStreamVideoSource::SupportsEncodedOutput() const { + return false; +} + MediaStreamVideoSource::PendingTrackInfo::PendingTrackInfo( MediaStreamVideoTrack* track, const VideoCaptureDeliverFrameCB& frame_callback, + const EncodedVideoFrameCB& encoded_frame_callback, const VideoTrackSettingsCallback& settings_callback, const VideoTrackFormatCallback& format_callback, std::unique_ptr<VideoTrackAdapterSettings> adapter_settings, ConstraintsOnceCallback callback) : track(track), frame_callback(frame_callback), + encoded_frame_callback(encoded_frame_callback), settings_callback(settings_callback), format_callback(format_callback), adapter_settings(std::move(adapter_settings)),
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_source_test.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_source_test.cc index 6708b0a..e4d6f7e 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_source_test.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_source_test.cc
@@ -25,11 +25,14 @@ using ::testing::_; using ::testing::DoAll; +using ::testing::InSequence; +using ::testing::Mock; +using ::testing::Return; using ::testing::SaveArg; namespace blink { -class MediaStreamVideoSourceTest : public ::testing::Test { +class MediaStreamVideoSourceTest : public testing::Test { public: MediaStreamVideoSourceTest() : number_of_successful_constraints_applied_(0), @@ -56,6 +59,7 @@ WebString::FromASCII("dummy_source_name"), false /* remote */); web_source_.SetPlatformSource(base::WrapUnique(mock_source_)); + ON_CALL(*mock_source_, SupportsEncodedOutput).WillByDefault(Return(true)); } void TearDown() override { @@ -93,6 +97,12 @@ enabled); } + WebMediaStreamTrack CreateTrack() { + return CreateTrack("123", + VideoTrackAdapterSettings(gfx::Size(100, 100), 30.0), + base::Optional<bool>(), false, 0.0); + } + WebMediaStreamTrack CreateTrackAndStartSource(int width, int height, double frame_rate, @@ -708,4 +718,81 @@ EXPECT_EQ(1, NumberOfFailedConstraintsCallbacks()); } +TEST_F(MediaStreamVideoSourceTest, AddsEncodedSinkWhenEncodedConsumerAppears) { + EXPECT_CALL(*mock_source(), OnEncodedSinkEnabled).Times(1); + EXPECT_CALL(*mock_source(), OnEncodedSinkDisabled).Times(0); + + WebMediaStreamTrack track = CreateTrack(); + MockMediaStreamVideoSink sink; + sink.ConnectEncodedToTrack(track); + + Mock::VerifyAndClearExpectations(mock_source()); + sink.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoSourceTest, AddsEncodedSinkWhenEncodedConsumersAppear) { + EXPECT_CALL(*mock_source(), OnEncodedSinkEnabled).Times(1); + EXPECT_CALL(*mock_source(), OnEncodedSinkDisabled).Times(0); + + WebMediaStreamTrack track1 = CreateTrack(); + MockMediaStreamVideoSink sink1; + sink1.ConnectEncodedToTrack(track1); + WebMediaStreamTrack track2 = CreateTrack(); + MockMediaStreamVideoSink sink2; + sink2.ConnectEncodedToTrack(track2); + + Mock::VerifyAndClearExpectations(mock_source()); + sink1.DisconnectEncodedFromTrack(); + sink2.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoSourceTest, + RemovesEncodedSinkWhenEncodedConsumerDisappears) { + EXPECT_CALL(*mock_source(), OnEncodedSinkDisabled).Times(1); + WebMediaStreamTrack track = CreateTrack(); + MockMediaStreamVideoSink sink; + sink.ConnectEncodedToTrack(track); + sink.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoSourceTest, + RemovesEncodedSinkWhenEncodedConsumersDisappear) { + EXPECT_CALL(*mock_source(), OnEncodedSinkDisabled).Times(1); + WebMediaStreamTrack track1 = CreateTrack(); + MockMediaStreamVideoSink sink1; + sink1.ConnectEncodedToTrack(track1); + WebMediaStreamTrack track2 = CreateTrack(); + MockMediaStreamVideoSink sink2; + sink2.ConnectEncodedToTrack(track2); + sink1.DisconnectEncodedFromTrack(); + sink2.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoSourceTest, CapturingLinkSecureOnlyEncodedSinks) { + InSequence s; + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(false)); + WebMediaStreamTrack track = CreateTrack(); + MockMediaStreamVideoSink sink; + sink.ConnectEncodedToTrack(track); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(true)); + sink.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoSourceTest, CapturingLinkSecureTracksAndEncodedSinks) { + InSequence s; + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(true)); + WebMediaStreamTrack track = CreateTrack(); + mock_source()->UpdateCapturingLinkSecure( + MediaStreamVideoTrack::GetVideoTrack(track), true); + + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(false)); + MockMediaStreamVideoSink sink; + sink.ConnectEncodedToTrack(track); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(true)); + sink.DisconnectEncodedFromTrack(); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(false)); + mock_source()->UpdateCapturingLinkSecure( + MediaStreamVideoTrack::GetVideoTrack(track), false); +} + } // namespace blink
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc index 1cb6eff..5c01ea6 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_track.cc
@@ -21,7 +21,6 @@ #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" namespace blink { - namespace { // This alias mimics the definition of VideoCaptureDeliverFrameCB. @@ -29,6 +28,11 @@ WTF::CrossThreadFunction<void(scoped_refptr<media::VideoFrame> video_frame, base::TimeTicks estimated_capture_time)>; +// Mimics blink::EncodedVideoFrameCB +using EncodedVideoFrameInternalCallback = + WTF::CrossThreadFunction<void(scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time)>; + void ResetCallback( std::unique_ptr<VideoCaptureDeliverFrameInternalCallback> callback) { // |callback| will be deleted when this exits. @@ -37,11 +41,11 @@ } // namespace // MediaStreamVideoTrack::FrameDeliverer is a helper class used for registering -// VideoCaptureDeliverFrameCB on the main render thread to receive video frames -// on the IO-thread. -// Frames are only delivered to the sinks if the track is enabled. If the track -// is disabled, a black frame is instead forwarded to the sinks at the same -// frame rate. +// VideoCaptureDeliverFrameCB/EncodedVideoFrameCB callbacks on the main render +// thread to receive video frames on the IO-thread. Frames are only delivered to +// the sinks if the track is enabled. If the track is disabled, a black frame is +// instead forwarded to the sinks at the same frame rate. A disabled track does +// not forward data to encoded sinks. class MediaStreamVideoTrack::FrameDeliverer : public WTF::ThreadSafeRefCounted<FrameDeliverer> { public: @@ -51,23 +55,41 @@ base::WeakPtr<MediaStreamVideoTrack> media_stream_video_track, bool enabled); - void SetEnabled(bool enabled); + // Sets whether the track is enabled or not. If getting enabled and encoded + // output is enabled, the deliverer will wait until the next key frame before + // it resumes producing encoded data. + void SetEnabled(bool enabled, bool await_key_frame); // Add |callback| to receive video frames on the IO-thread. // Must be called on the main render thread. void AddCallback(VideoSinkId id, VideoCaptureDeliverFrameCB callback); + // Add |callback| to receive encoded video frames on the IO-thread. + // Must be called on the main render thread. + void AddEncodedCallback(VideoSinkId id, EncodedVideoFrameCB callback); + // Removes |callback| associated with |id| from receiving video frames if |id| // has been added. It is ok to call RemoveCallback even if the |id| has not // been added. Note that the added callback will be reset on the main thread. // Must be called on the main render thread. void RemoveCallback(VideoSinkId id); - // Triggers all registered callbacks with |frame|, |format| and - // |estimated_capture_time| as parameters. Must be called on the IO-thread. + // Removes encoded callback associated with |id| from receiving video frames + // if |id| has been added. It is ok to call RemoveEncodedCallback even if the + // |id| has not been added. Note that the added callback will be reset on the + // main thread. Must be called on the main render thread. + void RemoveEncodedCallback(VideoSinkId id); + + // Triggers all registered callbacks with |frame| and |estimated_capture_time| + // as parameters. Must be called on the IO-thread. void DeliverFrameOnIO(scoped_refptr<media::VideoFrame> frame, base::TimeTicks estimated_capture_time); + // Triggers all encoded callbacks with |frame| and |estimated_capture_time|. + // Must be called on the IO-thread. + void DeliverEncodedVideoFrameOnIO(scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time); + private: friend class WTF::ThreadSafeRefCounted<FrameDeliverer>; virtual ~FrameDeliverer(); @@ -77,7 +99,13 @@ VideoSinkId id, const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); - void SetEnabledOnIO(bool enabled); + void AddEncodedCallbackOnIO(VideoSinkId id, + EncodedVideoFrameInternalCallback callback); + void RemoveEncodedCallbackOnIO( + VideoSinkId id, + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); + + void SetEnabledOnIO(bool enabled, bool await_key_frame); // Returns a black frame where the size and time stamp is set to the same as // as in |reference_frame|. @@ -100,6 +128,9 @@ using VideoIdCallbackPair = std::pair<VideoSinkId, VideoCaptureDeliverFrameInternalCallback>; std::vector<VideoIdCallbackPair> callbacks_; + WTF::HashMap<VideoSinkId, EncodedVideoFrameInternalCallback> + encoded_callbacks_; + bool await_next_key_frame_; DISALLOW_COPY_AND_ASSIGN(FrameDeliverer); }; @@ -111,7 +142,8 @@ : io_task_runner_(std::move(io_task_runner)), media_stream_video_track_(media_stream_video_track), enabled_(enabled), - emit_frame_drop_events_(true) { + emit_frame_drop_events_(true), + await_next_key_frame_(false) { DCHECK(io_task_runner_.get()); WebLocalFrame* web_frame = WebLocalFrame::FrameForCurrentContext(); @@ -144,6 +176,25 @@ callbacks_.push_back(std::make_pair(id, std::move(callback))); } +void MediaStreamVideoTrack::FrameDeliverer::AddEncodedCallback( + VideoSinkId id, + EncodedVideoFrameCB callback) { + DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); + PostCrossThreadTask( + *io_task_runner_, FROM_HERE, + CrossThreadBindOnce( + &FrameDeliverer::AddEncodedCallbackOnIO, WrapRefCounted(this), + WTF::CrossThreadUnretained(id), + WTF::Passed(CrossThreadBindRepeating(std::move(callback))))); +} + +void MediaStreamVideoTrack::FrameDeliverer::AddEncodedCallbackOnIO( + VideoSinkId id, + EncodedVideoFrameInternalCallback callback) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); + encoded_callbacks_.insert(id, std::move(callback)); +} + void MediaStreamVideoTrack::FrameDeliverer::RemoveCallback(VideoSinkId id) { DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); PostCrossThreadTask( @@ -161,6 +212,7 @@ for (; it != callbacks_.end(); ++it) { if (it->first == id) { // Callback is copied to heap and then deleted on the target thread. + // TODO(handellm): remove this arcane method. std::unique_ptr<VideoCaptureDeliverFrameInternalCallback> callback; callback.reset( new VideoCaptureDeliverFrameInternalCallback(std::move(it->second))); @@ -173,21 +225,56 @@ } } -void MediaStreamVideoTrack::FrameDeliverer::SetEnabled(bool enabled) { +void MediaStreamVideoTrack::FrameDeliverer::RemoveEncodedCallback( + VideoSinkId id) { DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); - PostCrossThreadTask(*io_task_runner_, FROM_HERE, - CrossThreadBindOnce(&FrameDeliverer::SetEnabledOnIO, - WrapRefCounted(this), enabled)); + PostCrossThreadTask( + *io_task_runner_, FROM_HERE, + CrossThreadBindOnce(&FrameDeliverer::RemoveEncodedCallbackOnIO, + WrapRefCounted(this), WTF::CrossThreadUnretained(id), + Thread::Current()->GetTaskRunner())); } -void MediaStreamVideoTrack::FrameDeliverer::SetEnabledOnIO(bool enabled) { +void MediaStreamVideoTrack::FrameDeliverer::RemoveEncodedCallbackOnIO( + VideoSinkId id, + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); + + // The callback needs to be destroyed on the sequence it was created on. + // Send it to a dumpster lambda. + auto it = encoded_callbacks_.find(id); + if (it == encoded_callbacks_.end()) { + return; + } + auto callback = std::move(it->value); + encoded_callbacks_.erase(it); + PostCrossThreadTask( + *task_runner, FROM_HERE, + CrossThreadBindOnce([](EncodedVideoFrameInternalCallback callback) {}, + std::move(callback))); +} + +void MediaStreamVideoTrack::FrameDeliverer::SetEnabled(bool enabled, + bool await_key_frame) { + DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); + PostCrossThreadTask( + *io_task_runner_, FROM_HERE, + CrossThreadBindOnce(&FrameDeliverer::SetEnabledOnIO, WrapRefCounted(this), + enabled, await_key_frame)); +} + +void MediaStreamVideoTrack::FrameDeliverer::SetEnabledOnIO( + bool enabled, + bool await_key_frame) { DCHECK(io_task_runner_->BelongsToCurrentThread()); if (enabled != enabled_) { enabled_ = enabled; emit_frame_drop_events_ = true; } - if (enabled_) + if (enabled_) { black_frame_ = nullptr; + await_next_key_frame_ = await_key_frame; + } } void MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO( @@ -212,6 +299,22 @@ entry.second.Run(video_frame, estimated_capture_time); } +void MediaStreamVideoTrack::FrameDeliverer::DeliverEncodedVideoFrameOnIO( + scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); + if (!enabled_) { + return; + } + if (await_next_key_frame_ && !frame->IsKeyFrame()) { + return; + } + await_next_key_frame_ = false; + for (const auto& entry : encoded_callbacks_.Values()) { + entry.Run(frame, estimated_capture_time); + } +} + scoped_refptr<media::VideoFrame> MediaStreamVideoTrack::FrameDeliverer::GetBlackFrame( const media::VideoFrame& reference_frame) { @@ -306,17 +409,21 @@ frame_deliverer_ = base::MakeRefCounted<MediaStreamVideoTrack::FrameDeliverer>( source->io_task_runner(), weak_factory_.GetWeakPtr(), enabled); - source->AddTrack(this, VideoTrackAdapterSettings(), - ConvertToBaseCallback(CrossThreadBindRepeating( - &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, - frame_deliverer_)), - media::BindToCurrentLoop(WTF::BindRepeating( - &MediaStreamVideoTrack::SetSizeAndComputedFrameRate, - weak_factory_.GetWeakPtr())), - media::BindToCurrentLoop(WTF::BindRepeating( - &MediaStreamVideoTrack::set_computed_source_format, - weak_factory_.GetWeakPtr())), - std::move(callback)); + source->AddTrack( + this, VideoTrackAdapterSettings(), + ConvertToBaseCallback(CrossThreadBindRepeating( + &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, + frame_deliverer_)), + ConvertToBaseCallback(CrossThreadBindRepeating( + &MediaStreamVideoTrack::FrameDeliverer::DeliverEncodedVideoFrameOnIO, + frame_deliverer_)), + media::BindToCurrentLoop(WTF::BindRepeating( + &MediaStreamVideoTrack::SetSizeAndComputedFrameRate, + weak_factory_.GetWeakPtr())), + media::BindToCurrentLoop( + WTF::BindRepeating(&MediaStreamVideoTrack::set_computed_source_format, + weak_factory_.GetWeakPtr())), + std::move(callback)); } MediaStreamVideoTrack::MediaStreamVideoTrack( @@ -337,65 +444,117 @@ frame_deliverer_ = base::MakeRefCounted<MediaStreamVideoTrack::FrameDeliverer>( source->io_task_runner(), weak_factory_.GetWeakPtr(), enabled); - source->AddTrack(this, adapter_settings, - ConvertToBaseCallback(CrossThreadBindRepeating( - &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, - frame_deliverer_)), - media::BindToCurrentLoop(WTF::BindRepeating( - &MediaStreamVideoTrack::SetSizeAndComputedFrameRate, - weak_factory_.GetWeakPtr())), - media::BindToCurrentLoop(WTF::BindRepeating( - &MediaStreamVideoTrack::set_computed_source_format, - weak_factory_.GetWeakPtr())), - std::move(callback)); + source->AddTrack( + this, adapter_settings, + ConvertToBaseCallback(CrossThreadBindRepeating( + &MediaStreamVideoTrack::FrameDeliverer::DeliverFrameOnIO, + frame_deliverer_)), + ConvertToBaseCallback(CrossThreadBindRepeating( + &MediaStreamVideoTrack::FrameDeliverer::DeliverEncodedVideoFrameOnIO, + frame_deliverer_)), + media::BindToCurrentLoop(WTF::BindRepeating( + &MediaStreamVideoTrack::SetSizeAndComputedFrameRate, + weak_factory_.GetWeakPtr())), + media::BindToCurrentLoop( + WTF::BindRepeating(&MediaStreamVideoTrack::set_computed_source_format, + weak_factory_.GetWeakPtr())), + std::move(callback)); } MediaStreamVideoTrack::~MediaStreamVideoTrack() { DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); DCHECK(sinks_.empty()); + DCHECK(encoded_sinks_.empty()); Stop(); DVLOG(3) << "~MediaStreamVideoTrack()"; } +static void AddSinkInternal(std::vector<WebMediaStreamSink*>* sinks, + WebMediaStreamSink* sink) { + DCHECK(!base::Contains(*sinks, sink)); + sinks->push_back(sink); +} + +static void RemoveSinkInternal(std::vector<WebMediaStreamSink*>* sinks, + WebMediaStreamSink* sink) { + auto it = std::find(sinks->begin(), sinks->end(), sink); + DCHECK(it != sinks->end()); + sinks->erase(it); +} + void MediaStreamVideoTrack::AddSink(WebMediaStreamSink* sink, const VideoCaptureDeliverFrameCB& callback, bool is_sink_secure) { DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); - DCHECK(!base::Contains(sinks_, sink)); - sinks_.push_back(sink); + AddSinkInternal(&sinks_, sink); frame_deliverer_->AddCallback(sink, callback); secure_tracker_.Add(sink, is_sink_secure); // Request source to deliver a frame because a new sink is added. if (!source_) return; - source_->UpdateHasConsumers(this, true); + UpdateSourceHasConsumers(); source_->RequestRefreshFrame(); source_->UpdateCapturingLinkSecure(this, secure_tracker_.is_capturing_secure()); } +void MediaStreamVideoTrack::AddEncodedSink(WebMediaStreamSink* sink, + EncodedVideoFrameCB callback) { + DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); + AddSinkInternal(&encoded_sinks_, sink); + frame_deliverer_->AddEncodedCallback(sink, std::move(callback)); + source_->UpdateNumEncodedSinks(); + UpdateSourceHasConsumers(); +} + void MediaStreamVideoTrack::RemoveSink(WebMediaStreamSink* sink) { DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); - auto it = std::find(sinks_.begin(), sinks_.end(), sink); - DCHECK(it != sinks_.end()); - sinks_.erase(it); + RemoveSinkInternal(&sinks_, sink); frame_deliverer_->RemoveCallback(sink); secure_tracker_.Remove(sink); if (!source_) return; - if (sinks_.empty()) - source_->UpdateHasConsumers(this, false); + UpdateSourceHasConsumers(); source_->UpdateCapturingLinkSecure(this, secure_tracker_.is_capturing_secure()); } +void MediaStreamVideoTrack::RemoveEncodedSink(WebMediaStreamSink* sink) { + DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); + RemoveSinkInternal(&encoded_sinks_, sink); + frame_deliverer_->RemoveEncodedCallback(sink); + source_->UpdateNumEncodedSinks(); + UpdateSourceHasConsumers(); +} + +void MediaStreamVideoTrack::UpdateSourceHasConsumers() { + DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); + if (!source_) + return; + bool has_consumers = !sinks_.empty() || !encoded_sinks_.empty(); + source_->UpdateHasConsumers(this, has_consumers); +} + void MediaStreamVideoTrack::SetEnabled(bool enabled) { DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); - frame_deliverer_->SetEnabled(enabled); + // If enabled, encoded sinks exist and the source supports encoded output, we + // need a new keyframe from the source as we may have dropped data making the + // stream undecodable. + bool maybe_await_key_frame = false; + if (enabled && source_->SupportsEncodedOutput() && !encoded_sinks_.empty()) { + source_->RequestRefreshFrame(); + maybe_await_key_frame = true; + } + frame_deliverer_->SetEnabled(enabled, maybe_await_key_frame); for (auto* sink : sinks_) sink->OnEnabledChanged(enabled); } +size_t MediaStreamVideoTrack::CountEncodedSinks() const { + DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_); + return encoded_sinks_.size(); +} + void MediaStreamVideoTrack::SetContentHint( WebMediaStreamTrack::ContentHintType content_hint) { DCHECK_CALLED_ON_VALID_THREAD(main_render_thread_checker_);
diff --git a/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc b/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc index cf73c0f..1c21cf3 100644 --- a/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc +++ b/third_party/blink/renderer/modules/mediastream/media_stream_video_track_test.cc
@@ -9,11 +9,13 @@ #include "base/callback.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" +#include "base/test/bind_test_util.h" #include "base/threading/thread_checker.h" #include "media/base/video_frame.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_track.h" #include "third_party/blink/public/web/web_heap.h" +#include "third_party/blink/renderer/modules/mediastream/mock_encoded_video_frame.h" #include "third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.h" #include "third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h" #include "third_party/blink/renderer/modules/mediastream/video_track_adapter_settings.h" @@ -25,6 +27,11 @@ // To avoid symbol collisions in jumbo builds. namespace media_stream_video_track_test { +using ::testing::InSequence; +using ::testing::Invoke; +using ::testing::Mock; +using ::testing::Return; + const uint8_t kBlackValue = 0x00; const uint8_t kColorValue = 0xAB; const int kMockSourceWidth = 640; @@ -34,7 +41,7 @@ closure.Run(); } -class MediaStreamVideoTrackTest : public ::testing::Test { +class MediaStreamVideoTrackTest : public testing::Test { public: MediaStreamVideoTrackTest() : mock_source_(nullptr), source_started_(false) {} @@ -56,6 +63,17 @@ run_loop.Run(); } + void DeliverEncodedVideoFrameAndWait(scoped_refptr<EncodedVideoFrame> frame, + MockMediaStreamVideoSink* sink) { + base::RunLoop run_loop; + base::RepeatingClosure quit_closure = run_loop.QuitClosure(); + EXPECT_CALL(*sink, OnEncodedVideoFrame).WillOnce(Invoke([&] { + std::move(quit_closure).Run(); + })); + mock_source()->DeliverEncodedVideoFrame(frame); + run_loop.Run(); + } + void DeliverDefaultSizeVideoFrameAndWaitForRenderer( MockMediaStreamVideoSink* sink) { const scoped_refptr<media::VideoFrame> frame = @@ -67,7 +85,7 @@ } protected: - void InitializeSource() { + virtual void InitializeSource() { blink_source_.Reset(); mock_source_ = new MockMediaStreamVideoSource( media::VideoCaptureFormat( @@ -123,6 +141,15 @@ blink_source_.SetPlatformSource(base::WrapUnique(mock_source_)); } + void DepleteIOCallbacks() { + base::RunLoop run_loop; + base::RepeatingClosure quit_closure = run_loop.QuitClosure(); + mock_source()->io_task_runner()->PostTask( + FROM_HERE, + base::BindLambdaForTesting([&] { std::move(quit_closure).Run(); })); + run_loop.Run(); + } + MockMediaStreamVideoSource* mock_source() { return mock_source_; } const WebMediaStreamSource& blink_source() const { return blink_source_; } @@ -358,5 +385,110 @@ sink.DisconnectFromTrack(); } +class MediaStreamVideoTrackEncodedTest : public MediaStreamVideoTrackTest { + public: + void InitializeSource() override { + MediaStreamVideoTrackTest::InitializeSource(); + ON_CALL(*mock_source(), SupportsEncodedOutput).WillByDefault(Return(true)); + } +}; + +TEST_F(MediaStreamVideoTrackEncodedTest, ConnectEncodedSink) { + InitializeSource(); + MockMediaStreamVideoSink sink; + WebMediaStreamTrack track = CreateTrack(); + EXPECT_CALL(*mock_source(), OnEncodedSinkEnabled); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(false)); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(true)).Times(0); + EXPECT_CALL(*mock_source(), OnEncodedSinkDisabled).Times(0); + sink.ConnectEncodedToTrack(track); + Mock::VerifyAndClearExpectations(mock_source()); + sink.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoTrackEncodedTest, DisconnectEncodedSink) { + InitializeSource(); + MockMediaStreamVideoSink sink; + WebMediaStreamTrack track = CreateTrack(); + sink.ConnectEncodedToTrack(track); + EXPECT_CALL(*mock_source(), OnEncodedSinkDisabled); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(true)); + sink.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoTrackEncodedTest, + CapturingLinkSecuredWithEncodedAndNormalTracks) { + InitializeSource(); + MockMediaStreamVideoSink sink1; + WebMediaStreamTrack track1 = CreateTrack(); + InSequence s; + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(true)); + sink1.ConnectToTrack(track1); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(false)); + MockMediaStreamVideoSink sink2; + WebMediaStreamTrack track2 = CreateTrack(); + sink2.ConnectEncodedToTrack(track2); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(false)); + sink1.DisconnectFromTrack(); + EXPECT_CALL(*mock_source(), OnCapturingLinkSecured(true)); + sink2.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoTrackEncodedTest, TransferOneEncodedVideoFrame) { + InitializeSource(); + MockMediaStreamVideoSink sink; + WebMediaStreamTrack track = CreateTrack(); + sink.ConnectEncodedToTrack(track); + base::RunLoop run_loop; + base::RepeatingClosure quit_closure = run_loop.QuitClosure(); + EXPECT_CALL(sink, OnEncodedVideoFrame).WillOnce(Invoke([&] { + std::move(quit_closure).Run(); + })); + mock_source()->DeliverEncodedVideoFrame( + base::MakeRefCounted<MockEncodedVideoFrame>()); + run_loop.Run(); + Mock::VerifyAndClearExpectations(mock_source()); + sink.DisconnectEncodedFromTrack(); +} + +TEST_F(MediaStreamVideoTrackEncodedTest, SupportsEncodedDisableEnable) { + InitializeSource(); + MockMediaStreamVideoSink sink; + WebMediaStreamTrack track = CreateTrack(); + sink.ConnectEncodedToTrack(track); + + auto key_frame = base::MakeRefCounted<MockEncodedVideoFrame>(); + EXPECT_CALL(*key_frame, IsKeyFrame).WillRepeatedly(Return(true)); + auto delta_frame = base::MakeRefCounted<MockEncodedVideoFrame>(); + EXPECT_CALL(*delta_frame, IsKeyFrame).WillRepeatedly(Return(false)); + + DeliverEncodedVideoFrameAndWait(key_frame, &sink); + + // Key frame when disabled -> shouldn't get dispatched + MediaStreamVideoTrack::GetVideoTrack(track)->SetEnabled(false); + { + EXPECT_CALL(sink, OnEncodedVideoFrame).Times(0); + mock_source()->DeliverEncodedVideoFrame(key_frame); + DepleteIOCallbacks(); + } + + // Delta frame when disabled -> shouldn't get dispatched until key frame + // appears. + EXPECT_CALL(*mock_source(), OnRequestRefreshFrame); + MediaStreamVideoTrack::GetVideoTrack(track)->SetEnabled(true); + { + EXPECT_CALL(sink, OnEncodedVideoFrame).Times(0); + mock_source()->DeliverEncodedVideoFrame(delta_frame); + DepleteIOCallbacks(); + } + + // After a key frame things should be flowing again. + DeliverEncodedVideoFrameAndWait(key_frame, &sink); + DeliverEncodedVideoFrameAndWait(delta_frame, &sink); + + Mock::VerifyAndClearExpectations(mock_source()); + sink.DisconnectEncodedFromTrack(); +} + } // namespace media_stream_video_track_test } // namespace blink
diff --git a/third_party/blink/renderer/modules/mediastream/mock_encoded_video_frame.h b/third_party/blink/renderer/modules/mediastream/mock_encoded_video_frame.h new file mode 100644 index 0000000..c5619d2 --- /dev/null +++ b/third_party/blink/renderer/modules/mediastream/mock_encoded_video_frame.h
@@ -0,0 +1,25 @@ +// Copyright 2019 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. + +#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MOCK_ENCODED_VIDEO_FRAME_H_ +#define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MOCK_ENCODED_VIDEO_FRAME_H_ + +#include "third_party/blink/public/web/modules/mediastream/media_stream_video_source.h" + +#include "testing/gmock/include/gmock/gmock.h" + +namespace blink { + +class MockEncodedVideoFrame : public EncodedVideoFrame { + public: + MOCK_CONST_METHOD0(Data, base::span<const uint8_t>()); + MOCK_CONST_METHOD0(Codec, media::VideoCodec()); + MOCK_CONST_METHOD0(IsKeyFrame, bool()); + MOCK_CONST_METHOD0(ColorSpace, base::Optional<media::VideoColorSpace>()); + MOCK_CONST_METHOD0(Resolution, gfx::Size()); +}; + +} // namespace blink + +#endif // THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MOCK_ENCODED_VIDEO_FRAME_H_
diff --git a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.cc b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.cc index a18ea747..7351a1ce 100644 --- a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.cc +++ b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.cc
@@ -24,6 +24,12 @@ weak_factory_.GetWeakPtr())); } +EncodedVideoFrameCB MockMediaStreamVideoSink::GetDeliverEncodedVideoFrameCB() { + return media::BindToCurrentLoop( + WTF::BindRepeating(&MockMediaStreamVideoSink::DeliverEncodedVideoFrame, + weak_factory_.GetWeakPtr())); +} + void MockMediaStreamVideoSink::DeliverVideoFrame( scoped_refptr<media::VideoFrame> frame, base::TimeTicks estimated_capture_time) { @@ -34,6 +40,12 @@ OnVideoFrame(); } +void MockMediaStreamVideoSink::DeliverEncodedVideoFrame( + scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time) { + OnEncodedVideoFrame(); +} + void MockMediaStreamVideoSink::OnReadyStateChanged( blink::WebMediaStreamSource::ReadyState state) { state_ = state;
diff --git a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.h b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.h index b593a3c..ea7c702 100644 --- a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.h +++ b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_sink.h
@@ -23,12 +23,18 @@ MediaStreamVideoSink::ConnectToTrack(track, GetDeliverFrameCB(), true); } + void ConnectEncodedToTrack(const WebMediaStreamTrack& track) { + MediaStreamVideoSink::ConnectEncodedToTrack( + track, GetDeliverEncodedVideoFrameCB()); + } + void ConnectToTrackWithCallback(const WebMediaStreamTrack& track, const VideoCaptureDeliverFrameCB& callback) { MediaStreamVideoSink::ConnectToTrack(track, callback, true); } - void DisconnectFromTrack() { MediaStreamVideoSink::DisconnectFromTrack(); } + using MediaStreamVideoSink::DisconnectEncodedFromTrack; + using MediaStreamVideoSink::DisconnectFromTrack; void OnReadyStateChanged(WebMediaStreamSource::ReadyState state) override; void OnEnabledChanged(bool enabled) override; @@ -36,8 +42,10 @@ // Triggered when OnVideoFrame(scoped_refptr<media::VideoFrame> frame) // is called. MOCK_METHOD0(OnVideoFrame, void()); + MOCK_METHOD0(OnEncodedVideoFrame, void()); VideoCaptureDeliverFrameCB GetDeliverFrameCB(); + EncodedVideoFrameCB GetDeliverEncodedVideoFrameCB(); int number_of_frames() const { return number_of_frames_; } media::VideoPixelFormat format() const { return format_; } @@ -50,6 +58,8 @@ private: void DeliverVideoFrame(scoped_refptr<media::VideoFrame> frame, base::TimeTicks estimated_capture_time); + void DeliverEncodedVideoFrame(scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time); int number_of_frames_; bool enabled_;
diff --git a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.cc b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.cc index 78f5673..f451292 100644 --- a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.cc +++ b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.cc
@@ -59,6 +59,7 @@ *io_task_runner(), FROM_HERE, CrossThreadBindOnce(frame_callback_, frame, base::TimeTicks())); } + OnRequestRefreshFrame(); } void MockMediaStreamVideoSource::OnHasConsumers(bool has_consumers) { @@ -71,10 +72,13 @@ } void MockMediaStreamVideoSource::StartSourceImpl( - const VideoCaptureDeliverFrameCB& frame_callback) { + VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback) { DCHECK(frame_callback_.is_null()); + DCHECK(encoded_frame_callback_.is_null()); attempted_to_start_ = true; - frame_callback_ = frame_callback; + frame_callback_ = std::move(frame_callback); + encoded_frame_callback_ = std::move(encoded_frame_callback); } void MockMediaStreamVideoSource::StopSourceImpl() {} @@ -101,6 +105,15 @@ base::TimeTicks())); } +void MockMediaStreamVideoSource::DeliverEncodedVideoFrame( + scoped_refptr<EncodedVideoFrame> frame) { + DCHECK(!is_stopped_for_restart_); + DCHECK(!encoded_frame_callback_.is_null()); + PostCrossThreadTask(*io_task_runner(), FROM_HERE, + CrossThreadBindOnce(encoded_frame_callback_, + std::move(frame), base::TimeTicks())); +} + void MockMediaStreamVideoSource::StopSourceForRestartImpl() { if (can_stop_for_restart_) is_stopped_for_restart_ = true;
diff --git a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h index 89ff47393..7b23b1a 100644 --- a/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h +++ b/third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h
@@ -22,6 +22,12 @@ MOCK_METHOD1(DoSetMutedState, void(bool muted_state)); + MOCK_METHOD0(OnEncodedSinkEnabled, void()); + MOCK_METHOD0(OnEncodedSinkDisabled, void()); + MOCK_METHOD0(OnRequestRefreshFrame, void()); + MOCK_METHOD1(OnCapturingLinkSecured, void(bool)); + MOCK_CONST_METHOD0(SupportsEncodedOutput, bool()); + // Simulate that the underlying source start successfully. void StartMockedSource(); @@ -33,10 +39,15 @@ bool SourceHasAttemptedToStart() { return attempted_to_start_; } // Delivers |frame| to all registered tracks on the IO thread. Its up to the - // call to make sure MockMediaStreamVideoSource is not destroyed before the + // caller to make sure MockMediaStreamVideoSource is not destroyed before the // frame has been delivered. void DeliverVideoFrame(scoped_refptr<media::VideoFrame> frame); + // Delivers |frame| to all registered encoded sinks on the IO thread. Its up + // to the caller to make sure MockMediaStreamVideoSource is not destroyed + // before the frame has been delivered. + void DeliverEncodedVideoFrame(scoped_refptr<EncodedVideoFrame> frame); + const media::VideoCaptureFormat& start_format() const { return format_; } int max_requested_height() const { return max_requested_height_; } int max_requested_width() const { return max_requested_width_; } @@ -66,8 +77,8 @@ void DoChangeSource(const blink::MediaStreamDevice& new_device) override; // Implements blink::MediaStreamVideoSource. - void StartSourceImpl( - const blink::VideoCaptureDeliverFrameCB& frame_callback) override; + void StartSourceImpl(VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback) override; void StopSourceImpl() override; base::Optional<media::VideoCaptureFormat> GetCurrentFormat() const override; void StopSourceForRestartImpl() override; @@ -85,6 +96,7 @@ bool can_restart_ = true; bool is_suspended_ = false; blink::VideoCaptureDeliverFrameCB frame_callback_; + EncodedVideoFrameCB encoded_frame_callback_; DISALLOW_COPY_AND_ASSIGN(MockMediaStreamVideoSource); };
diff --git a/third_party/blink/renderer/modules/mediastream/video_track_adapter.cc b/third_party/blink/renderer/modules/mediastream/video_track_adapter.cc index 9cbf478..c7ca75c 100644 --- a/third_party/blink/renderer/modules/mediastream/video_track_adapter.cc +++ b/third_party/blink/renderer/modules/mediastream/video_track_adapter.cc
@@ -133,6 +133,7 @@ public: struct VideoTrackCallbacks { VideoCaptureDeliverFrameInternalCallback frame_callback; + DeliverEncodedVideoFrameInternalCallback encoded_frame_callback; VideoTrackSettingsInternalCallback settings_callback; VideoTrackFormatInternalCallback format_callback; }; @@ -143,13 +144,16 @@ const VideoTrackAdapterSettings& settings, base::WeakPtr<MediaStreamVideoSource> media_stream_video_source); - // Add |frame_callback| to receive video frames on the IO-thread and - // |settings_callback| to set track settings on the main thread. - // |frame_callback| will however be released on the main render thread. - void AddCallbacks(const MediaStreamVideoTrack* track, - VideoCaptureDeliverFrameInternalCallback frame_callback, - VideoTrackSettingsInternalCallback settings_callback, - VideoTrackFormatInternalCallback format_callback); + // Add |frame_callback|, |encoded_frame_callback| to receive video frames on + // the IO-thread and |settings_callback| to set track settings on the main + // thread. |frame_callback| will however be released on the main render + // thread. + void AddCallbacks( + const MediaStreamVideoTrack* track, + VideoCaptureDeliverFrameInternalCallback frame_callback, + DeliverEncodedVideoFrameInternalCallback encoded_frame_callback, + VideoTrackSettingsInternalCallback settings_callback, + VideoTrackFormatInternalCallback format_callback); // Removes the callbacks associated with |track| if |track| has been added. It // is ok to call RemoveCallbacks() even if |track| has not been added. @@ -165,6 +169,9 @@ const base::TimeTicks& estimated_capture_time, bool is_device_rotated); + void DeliverEncodedVideoFrame(scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time); + // Returns true if all arguments match with the output of this adapter. bool SettingsMatch(const VideoTrackAdapterSettings& settings) const; @@ -253,13 +260,14 @@ void VideoTrackAdapter::VideoFrameResolutionAdapter::AddCallbacks( const MediaStreamVideoTrack* track, VideoCaptureDeliverFrameInternalCallback frame_callback, + DeliverEncodedVideoFrameInternalCallback encoded_frame_callback, VideoTrackSettingsInternalCallback settings_callback, VideoTrackFormatInternalCallback format_callback) { DCHECK_CALLED_ON_VALID_THREAD(io_thread_checker_); - VideoTrackCallbacks track_callbacks = {std::move(frame_callback), - std::move(settings_callback), - std::move(format_callback)}; + VideoTrackCallbacks track_callbacks = { + std::move(frame_callback), std::move(encoded_frame_callback), + std::move(settings_callback), std::move(format_callback)}; callbacks_.emplace(track, std::move(track_callbacks)); } @@ -355,6 +363,15 @@ DoDeliverFrame(std::move(video_frame), estimated_capture_time); } +void VideoTrackAdapter::VideoFrameResolutionAdapter::DeliverEncodedVideoFrame( + scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time) { + DCHECK_CALLED_ON_VALID_THREAD(io_thread_checker_); + for (const auto& callback : callbacks_) { + callback.second.encoded_frame_callback.Run(frame, estimated_capture_time); + } +} + bool VideoTrackAdapter::VideoFrameResolutionAdapter::SettingsMatch( const VideoTrackAdapterSettings& settings) const { DCHECK_CALLED_ON_VALID_THREAD(io_thread_checker_); @@ -506,6 +523,7 @@ void VideoTrackAdapter::AddTrack(const MediaStreamVideoTrack* track, VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback, VideoTrackSettingsCallback settings_callback, VideoTrackFormatCallback format_callback, const VideoTrackAdapterSettings& settings) { @@ -517,6 +535,8 @@ &VideoTrackAdapter::AddTrackOnIO, WTF::CrossThreadUnretained(this), WTF::CrossThreadUnretained(track), WTF::Passed(CrossThreadBindRepeating(std::move(frame_callback))), + WTF::Passed( + CrossThreadBindRepeating(std::move(encoded_frame_callback))), WTF::Passed(CrossThreadBindRepeating(std::move(settings_callback))), WTF::Passed(CrossThreadBindRepeating(std::move(format_callback))), settings)); @@ -525,6 +545,7 @@ void VideoTrackAdapter::AddTrackOnIO( const MediaStreamVideoTrack* track, VideoCaptureDeliverFrameInternalCallback frame_callback, + DeliverEncodedVideoFrameInternalCallback encoded_frame_callback, VideoTrackSettingsInternalCallback settings_callback, VideoTrackFormatInternalCallback format_callback, const VideoTrackAdapterSettings& settings) { @@ -542,9 +563,9 @@ adapters_.push_back(adapter); } - adapter->AddCallbacks(track, std::move(frame_callback), - std::move(settings_callback), - std::move(format_callback)); + adapter->AddCallbacks( + track, std::move(frame_callback), std::move(encoded_frame_callback), + std::move(settings_callback), std::move(format_callback)); } void VideoTrackAdapter::RemoveTrack(const MediaStreamVideoTrack* track) { @@ -727,6 +748,7 @@ // If the track was found, re-add it with new settings. if (track_callbacks.frame_callback) { AddTrackOnIO(track, std::move(track_callbacks.frame_callback), + std::move(track_callbacks.encoded_frame_callback), std::move(track_callbacks.settings_callback), std::move(track_callbacks.format_callback), settings); } @@ -759,6 +781,15 @@ adapter->DeliverFrame(frame, estimated_capture_time, is_device_rotated); } +void VideoTrackAdapter::DeliverEncodedVideoFrameOnIO( + scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time) { + DCHECK(io_task_runner_->BelongsToCurrentThread()); + TRACE_EVENT0("media", "VideoTrackAdapter::DeliverEncodedVideoFrameOnIO"); + for (const auto& adapter : adapters_) + adapter->DeliverEncodedVideoFrame(frame, estimated_capture_time); +} + void VideoTrackAdapter::CheckFramesReceivedOnIO( OnMutedInternalCallback set_muted_state_callback, uint64_t old_frame_counter_snapshot) {
diff --git a/third_party/blink/renderer/modules/mediastream/video_track_adapter.h b/third_party/blink/renderer/modules/mediastream/video_track_adapter.h index 5f4fe83..d5842a3 100644 --- a/third_party/blink/renderer/modules/mediastream/video_track_adapter.h +++ b/third_party/blink/renderer/modules/mediastream/video_track_adapter.h
@@ -15,6 +15,7 @@ #include "base/time/time.h" #include "media/base/video_frame.h" #include "third_party/blink/public/platform/modules/mediastream/media_stream_types.h" +#include "third_party/blink/public/web/modules/mediastream/encoded_video_frame.h" #include "third_party/blink/public/web/modules/mediastream/media_stream_video_track.h" #include "third_party/blink/renderer/modules/modules_export.h" #include "third_party/blink/renderer/platform/wtf/cross_thread_functional.h" @@ -43,14 +44,15 @@ scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, base::WeakPtr<MediaStreamVideoSource> media_stream_video_source); - // Register |track| to receive video frames in |frame_callback| with - // a resolution within the boundaries of the arguments, and settings - // updates in |settings_callback|. - // Must be called on the main render thread. - // |source_frame_rate| is used to calculate a prudent interval to check for - // passing frames and inform of the result via |on_muted_state_callback|. + // Register |track| to receive video frames in and |encoded_frame_callback| + // and in |frame_callback| with a resolution within the boundaries of the + // arguments, and settings updates in |settings_callback|. Must be called on + // the main render thread. |source_frame_rate| is used to calculate a prudent + // interval to check for passing frames and inform of the result via + // |on_muted_state_callback|. void AddTrack(const MediaStreamVideoTrack* track, VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback, VideoTrackSettingsCallback settings_callback, VideoTrackFormatCallback track_callback, const VideoTrackAdapterSettings& settings); @@ -63,6 +65,11 @@ void DeliverFrameOnIO(scoped_refptr<media::VideoFrame> frame, base::TimeTicks estimated_capture_time); + // Delivers |encoded_frame| to all tracks that have registered a callback. + // Must be called on the IO-thread. + void DeliverEncodedVideoFrameOnIO(scoped_refptr<EncodedVideoFrame> frame, + base::TimeTicks estimated_capture_time); + base::SingleThreadTaskRunner* io_task_runner() const { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); return io_task_runner_.get(); @@ -98,15 +105,21 @@ WTF::CrossThreadFunction<void( scoped_refptr<media::VideoFrame> video_frame, base::TimeTicks estimated_capture_time)>; + using DeliverEncodedVideoFrameInternalCallback = + WTF::CrossThreadFunction<void( + scoped_refptr<EncodedVideoFrame> video_frame, + base::TimeTicks estimated_capture_time)>; using VideoTrackSettingsInternalCallback = WTF::CrossThreadFunction<void(gfx::Size frame_size, double frame_rate)>; using VideoTrackFormatInternalCallback = WTF::CrossThreadFunction<void(const media::VideoCaptureFormat&)>; - void AddTrackOnIO(const MediaStreamVideoTrack* track, - VideoCaptureDeliverFrameInternalCallback frame_callback, - VideoTrackSettingsInternalCallback settings_callback, - VideoTrackFormatInternalCallback track_callback, - const VideoTrackAdapterSettings& settings); + void AddTrackOnIO( + const MediaStreamVideoTrack* track, + VideoCaptureDeliverFrameInternalCallback frame_callback, + DeliverEncodedVideoFrameInternalCallback encoded_frame_callback, + VideoTrackSettingsInternalCallback settings_callback, + VideoTrackFormatInternalCallback track_callback, + const VideoTrackAdapterSettings& settings); void RemoveTrackOnIO(const MediaStreamVideoTrack* track); void ReconfigureTrackOnIO(const MediaStreamVideoTrack* track,
diff --git a/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc b/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc index 34eda19..579cbd4 100644 --- a/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc +++ b/third_party/blink/renderer/modules/mediastream/video_track_adapter_unittest.cc
@@ -6,11 +6,14 @@ #include <limits> +#include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/test/bind_test_util.h" #include "base/threading/thread.h" #include "media/base/limits.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/public/web/web_heap.h" +#include "third_party/blink/renderer/modules/mediastream/mock_encoded_video_frame.h" #include "third_party/blink/renderer/modules/mediastream/mock_media_stream_video_source.h" #include "third_party/blink/renderer/modules/mediastream/video_track_adapter_settings.h" #include "third_party/blink/renderer/platform/testing/io_task_runner_testing_platform_support.h" @@ -215,10 +218,9 @@ testing_render_thread_.Stop(); } - void CreateAdapter(const media::VideoCaptureFormat& capture_format) { + void CreateAdapter(media::VideoCaptureFormat capture_format) { mock_source_ = std::make_unique<MockMediaStreamVideoSource>(capture_format, false); - // Create the VideoTrackAdapter instance on |testing_render_thread_|. base::WaitableEvent adapter_created( base::WaitableEvent::ResetPolicy::MANUAL, @@ -236,14 +238,7 @@ // |adapter_settings|. void ConfigureTrack(const VideoTrackAdapterSettings& adapter_settings) { if (!track_added_) { - testing_render_thread_.task_runner()->PostTask( - FROM_HERE, - base::BindOnce( - &VideoTrackAdapter::AddTrack, adapter_, null_track_.get(), - base::BindRepeating( - &VideoTrackAdapterFixtureTest::OnFrameDelivered, - base::Unretained(this)), - base::DoNothing(), base::DoNothing(), adapter_settings)); + AddTrackInternal(null_track_.get(), adapter_settings); track_added_ = true; } else { testing_render_thread_.task_runner()->PostTask( @@ -253,6 +248,20 @@ } } + void AddTrackInternal(MediaStreamVideoTrack* track, + const VideoTrackAdapterSettings& adapter_settings) { + testing_render_thread_.task_runner()->PostTask( + FROM_HERE, + base::BindOnce( + &VideoTrackAdapter::AddTrack, adapter_, track, + base::BindRepeating(&VideoTrackAdapterFixtureTest::OnFrameDelivered, + base::Unretained(this)), + base::BindRepeating( + &VideoTrackAdapterFixtureTest::OnEncodedVideoFrameDelivered, + base::Unretained(this)), + base::DoNothing(), base::DoNothing(), adapter_settings)); + } + void SetFrameValidationCallback(VideoCaptureDeliverFrameCB callback) { frame_validation_callback_ = std::move(callback); } @@ -284,6 +293,10 @@ frame_received_.Signal(); } + MOCK_METHOD2(OnEncodedVideoFrameDelivered, + void(scoped_refptr<EncodedVideoFrame>, + base::TimeTicks estimated_capture_time)); + ScopedTestingPlatformSupport<IOTaskRunnerTestingPlatformSupport> platform_support_; base::Thread testing_render_thread_; @@ -349,4 +362,97 @@ DeliverAndValidateFrame(gmb_frame, base::TimeTicks()); } +class VideoTrackAdapterEncodedTest : public ::testing::Test { + public: + VideoTrackAdapterEncodedTest() + : render_thread_("VideoTrackAdapterEncodedTest_RenderThread") { + render_thread_.Start(); + auto source = std::make_unique<MockMediaStreamVideoSource>( + media::VideoCaptureFormat(), false); + mock_source_ = source.get(); + web_source_.Initialize( + blink::WebString::FromASCII("source_id"), + blink::WebMediaStreamSource::kTypeVideo, + blink::WebString::FromASCII("DeliverEncodedVideoFrameSource"), + false /* remote */); + web_source_.SetPlatformSource(std::move(source)); + RunSyncOnRenderThread([&] { + adapter_ = base::MakeRefCounted<VideoTrackAdapter>( + platform_support_->GetIOTaskRunner(), mock_source_->GetWeakPtr()); + }); + } + + ~VideoTrackAdapterEncodedTest() { + web_source_.Reset(); + WebHeap::CollectAllGarbageForTesting(); + } + + std::unique_ptr<MediaStreamVideoTrack> AddTrack() { + auto track = std::make_unique<MediaStreamVideoTrack>( + mock_source_, WebPlatformMediaStreamSource::ConstraintsOnceCallback(), + true); + RunSyncOnRenderThread([&] { + adapter_->AddTrack( + track.get(), + base::BindRepeating(&VideoTrackAdapterEncodedTest::OnFrameDelivered, + base::Unretained(this)), + base::BindRepeating( + &VideoTrackAdapterEncodedTest::OnEncodedVideoFrameDelivered, + base::Unretained(this)), + base::DoNothing(), base::DoNothing(), VideoTrackAdapterSettings()); + }); + return track; + } + + template <class Function> + void RunSyncOnRenderThread(Function function) { + base::RunLoop run_loop; + base::OnceClosure quit_closure = run_loop.QuitClosure(); + render_thread_.task_runner()->PostTask(FROM_HERE, + base::BindLambdaForTesting([&] { + std::move(function)(); + std::move(quit_closure).Run(); + })); + run_loop.Run(); + } + + MOCK_METHOD2(OnFrameDelivered, + void(scoped_refptr<media::VideoFrame> frame, + base::TimeTicks estimated_capture_time)); + MOCK_METHOD2(OnEncodedVideoFrameDelivered, + void(scoped_refptr<EncodedVideoFrame>, + base::TimeTicks estimated_capture_time)); + + protected: + ScopedTestingPlatformSupport<IOTaskRunnerTestingPlatformSupport> + platform_support_; + base::Thread render_thread_; + WebMediaStreamSource web_source_; + MockMediaStreamVideoSource* mock_source_; + scoped_refptr<VideoTrackAdapter> adapter_; +}; + +TEST_F(VideoTrackAdapterEncodedTest, DeliverEncodedVideoFrame) { + auto track1 = AddTrack(); + auto track2 = AddTrack(); + EXPECT_CALL(*this, OnEncodedVideoFrameDelivered) + .Times(2) + .WillRepeatedly( + testing::Invoke([&](const scoped_refptr<EncodedVideoFrame>& frame, + base::TimeTicks estimated_capture_time) {})); + base::RunLoop run_loop; + base::OnceClosure quit_closure = run_loop.QuitClosure(); + platform_support_->GetIOTaskRunner()->PostTask( + FROM_HERE, base::BindLambdaForTesting([&]() { + adapter_->DeliverEncodedVideoFrameOnIO( + base::MakeRefCounted<MockEncodedVideoFrame>(), base::TimeTicks()); + std::move(quit_closure).Run(); + })); + run_loop.Run(); + RunSyncOnRenderThread([&] { + adapter_->RemoveTrack(track1.get()); + adapter_->RemoveTrack(track2.get()); + }); +} + } // namespace blink
diff --git a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc index b11f244..8c8f8a3 100644 --- a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc +++ b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.cc
@@ -250,11 +250,12 @@ } void MediaStreamRemoteVideoSource::StartSourceImpl( - const VideoCaptureDeliverFrameCB& frame_callback) { + VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB /*encoded_frame_callback*/) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK(!delegate_.get()); - delegate_ = base::MakeRefCounted<RemoteVideoSourceDelegate>(io_task_runner(), - frame_callback); + delegate_ = base::MakeRefCounted<RemoteVideoSourceDelegate>( + io_task_runner(), std::move(frame_callback)); scoped_refptr<webrtc::VideoTrackInterface> video_track( static_cast<webrtc::VideoTrackInterface*>(observer_->track().get())); video_track->AddOrUpdateSink(delegate_.get(), rtc::VideoSinkWants());
diff --git a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.h b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.h index 9f53584..76a044c 100644 --- a/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.h +++ b/third_party/blink/renderer/modules/peerconnection/media_stream_remote_video_source.h
@@ -36,8 +36,8 @@ protected: // Implements MediaStreamVideoSource. - void StartSourceImpl( - const VideoCaptureDeliverFrameCB& frame_callback) override; + void StartSourceImpl(VideoCaptureDeliverFrameCB frame_callback, + EncodedVideoFrameCB encoded_frame_callback) override; void StopSourceImpl() override;
diff --git a/third_party/blink/renderer/platform/loader/fetch/resource_request.h b/third_party/blink/renderer/platform/loader/fetch/resource_request.h index ba96c04e..4148460 100644 --- a/third_party/blink/renderer/platform/loader/fetch/resource_request.h +++ b/third_party/blink/renderer/platform/loader/fetch/resource_request.h
@@ -499,9 +499,6 @@ network::mojom::CredentialsMode credentials_mode_; network::mojom::RedirectMode redirect_mode_; String fetch_integrity_; - // TODO(domfarolino): Use AtomicString for referrer_string_ once - // off-main-thread fetch is fully implemented and ResourceRequest never gets - // transferred between threads. See https://crbug.com/706331. String referrer_string_; network::mojom::ReferrerPolicy referrer_policy_; bool did_set_http_referrer_;
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index 1dfe1da..8a78be4 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -2728,6 +2728,8 @@ crbug.com/1012627 [ Win7 ] external/wpt/css/css-text/line-breaking/line-breaking-021.html [ Failure ] +crbug.com/1029514 external/wpt/html/semantics/embedded-content/the-video-element/resize-during-playback.html [ Pass Failure ] + # ====== New tests from wpt-importer added here ====== crbug.com/583097 crbug.com/633012 [ Linux ] external/wpt/svg/painting/marker-orient-001.svg [ Failure ] crbug.com/583097 crbug.com/633012 [ Mac ] external/wpt/svg/painting/marker-orient-001.svg [ Failure ] @@ -5379,7 +5381,7 @@ crbug.com/865432 [ Linux ] virtual/omt-worker-fetch/external/wpt/workers/modules/dedicated-worker-import-blob-url.any.worker.html [ Timeout Pass ] crbug.com/867532 [ Linux ] virtual/omt-worker-fetch/external/wpt/workers/modules/dedicated-worker-import-data-url.any.worker.html [ Timeout Pass ] crbug.com/867532 [ Linux ] virtual/omt-worker-fetch/external/wpt/workers/modules/dedicated-worker-import.any.worker.html [ Timeout Pass ] -crbug.com/937170 [ Linux Win7 ] external/wpt/IndexedDB/interleaved-cursors-large.html [ Pass Timeout ] +crbug.com/937170 external/wpt/IndexedDB/interleaved-cursors-large.html [ Pass Timeout ] crbug.com/937991 [ Win7 Release ] http/tests/devtools/cache-storage/cache-data.js [ Pass Timeout ] # These video tests seem to take a screenshot too early. @@ -5851,6 +5853,13 @@ crbug.com/1015187 virtual/cross-origin-isolation/external/wpt/html/cross-origin-embedder-policy/none.https.html [ Pass Failure ] crbug.com/1015187 [ Linux Mac ] external/wpt/html/cross-origin-embedder-policy/none.https.html [ Pass Failure Timeout ] +# Sheriff 2019-11-29 +crbug.com/1027436 [ Mac ] inspector-protocol/heap-profiler/heap-snapshot-with-detached-dom-tree.js [ Pass Timeout ] +crbug.com/1019079 virtual/gpu/fast/canvas/OffscreenCanvas-placeholder-createImageBitmap.html [ Pass Failure ] +crbug.com/1019079 fast/canvas/OffscreenCanvas-placeholder-createImageBitmap.html [ Pass Failure ] +crbug.com/1027435 [ Mac ] external/wpt/html/cross-origin-opener-policy/popup-none.https.html [ Pass Timeout ] +crbug.com/1027434 [ Mac ] external/wpt/html/browsers/origin/cross-origin-objects/cross-origin-objects.html [ Pass Timeout ] + # Temporary suppression to allow Skia change to opaqueness tracking crbug.com/1028116 virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius.html [ Pass Failure ] crbug.com/1028116 virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter.html [ Pass Failure ] @@ -5894,3 +5903,14 @@ # Disabled for three-way merge after https://crrev.com/c/devtools/devtools-frontend/+/1934218 is submitted crbug.com/1006759 http/tests/devtools/modules-load-network.js [ Pass Failure ] crbug.com/1006759 http/tests/devtools/modules-load-source.js [ Pass Failure ] + +# Failing document policy tests +crbug.com/993790 external/wpt/document-policy/required-policy/document-policy.html [ Failure ] +crbug.com/993790 external/wpt/document-policy/required-policy/no-document-policy.html [ Failure ] +crbug.com/993790 external/wpt/document-policy/required-policy/required-document-policy-nested.html [ Failure ] +crbug.com/993790 external/wpt/document-policy/required-policy/required-document-policy.html [ Failure ] + +# Temporary suppression to allow devtools-frontend changes +crbug.com/1016772 http/tests/devtools/sourcemap-section-warning.js [ Pass Failure ] + +crbug.com/1029521 virtual/threaded/external/wpt/web-animations/timing-model/animations/updating-the-finished-state.html [ Pass Failure Timeout ]
diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites index 233989a..8521af9 100644 --- a/third_party/blink/web_tests/VirtualTestSuites +++ b/third_party/blink/web_tests/VirtualTestSuites
@@ -29,6 +29,7 @@ "external/wpt/feature-policy/experimental-features", "external/wpt/offscreen-canvas/convert-to-blob", "external/wpt/requestidlecallback", + "external/wpt/web-animations/timing-model/animations", "fast/events/pointerevents/pinch", "lifecycle", "http/tests/devtools/tracing",
diff --git a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation-expected.txt index 86d1000..0d58012 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation-expected.txt +++ b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation-expected.txt
@@ -1,318 +1,290 @@ This is a testharness.js-based test. -Found 316 tests; 248 PASS, 68 FAIL, 0 TIMEOUT, 0 NOTRUN. +Found 288 tests; 184 PASS, 104 FAIL, 0 TIMEOUT, 0 NOTRUN. PASS CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from neutral to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from neutral to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from neutral to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +FAIL CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +FAIL CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [initial] -PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [initial] -PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [initial] -PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [none] +PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [none] +PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [none] PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [initial] -PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [initial] -PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [initial] -PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (-0.3) should be [none] +PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0) should be [none] +PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.3) should be [none] PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [initial] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [inherit] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +FAIL CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +FAIL CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [unset] -PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [unset] -PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [unset] -PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [none] +PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [none] +PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [none] PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [unset] -PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [unset] -PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [unset] -PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (-0.3) should be [none] +PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0) should be [none] +PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.3) should be [none] PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [unset] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/blue-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/blue-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/blue-100.png)] -PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/blue-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/blue-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/blue-100.png)] -PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (-0.3) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.3) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (-0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.6) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (-0.3) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.3) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (-0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.6) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (-0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false -FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.6) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (-0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.3) should be [url(../resources/blue-100.png)] assert_true: 'to' value should be supported expected true got false -FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (0.6) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] at (1.5) should be [cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)] assert_true: 'to' value should be supported expected true got false -PASS CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] +FAIL CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " PASS CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] +FAIL CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " +FAIL CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " PASS CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS CSS Transitions with transition: all: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] PASS CSS Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] PASS CSS Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] -PASS CSS Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS CSS Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] PASS Web Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] PASS Web Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] -PASS Web Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.5) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] PASS Web Animations: property <background-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] -PASS CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (0) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +FAIL CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [none] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (-0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (0) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.3) should be [url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] +FAIL CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [none] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (-0.3) should be [none] PASS CSS Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0) should be [none] PASS CSS Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.3) should be [none] -PASS CSS Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (-0.3) should be [none] PASS Web Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0) should be [none] PASS Web Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.3) should be [none] -PASS Web Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.5) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (0.6) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (1) should be [url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [none] to [url(../resources/green-100.png)] at (1.5) should be [url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (-0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] -FAIL CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " -FAIL CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " PASS CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1.5) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (-0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1.5) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (-0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] -FAIL CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " -FAIL CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " +FAIL CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " +FAIL CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " PASS CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1.5) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] PASS Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (-0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] PASS Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] -FAIL Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " -FAIL Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [cross-fade(url(../resources/stripes-100.png), url(../resources/blue-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " +FAIL Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.3) should be [url(../resources/stripes-100.png), url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) " +FAIL Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (0.6) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) " PASS Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] PASS Web Animations: property <background-image> from [url(../resources/stripes-100.png), url(../resources/blue-100.png)] to [url(../resources/blue-100.png), url(../resources/stripes-100.png)] at (1.5) should be [url(../resources/blue-100.png), url(../resources/stripes-100.png)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), url(../resources/blue-100.png)] +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), url(../resources/blue-100.png)] +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), url(../resources/blue-100.png)] +FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), url(../resources/blue-100.png)] +FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png)] -FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.3), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.3)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " -FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [cross-fade(url(../resources/blue-100.png), url(../resources/stripes-100.png), 0.6), cross-fade(url(../resources/blue-100.png), url(../resources/green-100.png), 0.6)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " +FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.3 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.3 ) " +FAIL Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , 0.6 ) , - webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) , 0.6 ) " PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png)] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), none] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png), none] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png), none] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Transitions: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] -PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), none] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png), none] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " +FAIL CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png), none] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 100.png ) , none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 100.png ) , url ( http : / / web - platform.test : 8001 / ... / green - 100.png ) " PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Transitions with transition: all: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), none] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png), none] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png), none] -PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS CSS Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (-0.3) should be [url(../resources/blue-100.png), none] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0) should be [url(../resources/blue-100.png), none] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.3) should be [url(../resources/blue-100.png), none] -PASS Web Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (0.6) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)] PASS Web Animations: property <background-image> from [url(../resources/blue-100.png), none] to [url(../resources/stripes-100.png), url(../resources/green-100.png)] at (1.5) should be [url(../resources/stripes-100.png), url(../resources/green-100.png)]
diff --git a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation.html b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation.html index b442c4e..feda6af 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation.html +++ b/third_party/blink/web_tests/external/wpt/css/css-backgrounds/animations/background-image-interpolation.html
@@ -38,19 +38,26 @@ }, [ {at: -0.3, expect: from}, {at: 0, expect: from}, - {at: 0.3, expect: 'cross-fade(' + from + ', ' + to + ', 0.3)'}, - {at: 0.6, expect: 'cross-fade(' + from + ', ' + to + ', 0.6)'}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, {at: 1, expect: to}, {at: 1.5, expect: to}, ]); // initial to image to = 'url(../resources/green-100.png)'; -test_no_interpolation({ +test_interpolation({ property: 'background-image', from: 'initial', to: to, -}); +}, [ + {at: -0.3, expect: 'none'}, + {at: 0, expect: 'none'}, + {at: 0.3, expect: 'none'}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); // inherit to image from = 'url(../resources/blue-100.png)'; @@ -62,18 +69,25 @@ }, [ {at: -0.3, expect: from}, {at: 0, expect: from}, - {at: 0.3, expect: 'cross-fade(' + from + ', ' + to + ', 0.3)'}, - {at: 0.6, expect: 'cross-fade(' + from + ', ' + to + ', 0.6)'}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, {at: 1, expect: to}, {at: 1.5, expect: to}, ]); // unset to image -test_no_interpolation({ +test_interpolation({ property: 'background-image', from: 'unset', to: to, -}); +}, [ + {at: -0.3, expect: 'none'}, + {at: 0, expect: 'none'}, + {at: 0.3, expect: 'none'}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); // Image to image from = 'url(../resources/blue-100.png)'; @@ -85,8 +99,8 @@ }, [ {at: -0.3, expect: from}, {at: 0, expect: from}, - {at: 0.3, expect: 'cross-fade(' + from + ', ' + to + ', 0.3)'}, - {at: 0.6, expect: 'cross-fade(' + from + ', ' + to + ', 0.6)'}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, {at: 1, expect: to}, {at: 1.5, expect: to}, ]); @@ -94,38 +108,66 @@ // Image to gradient from = 'url(../resources/blue-100.png)'; to = 'linear-gradient(45deg, blue, orange)'; -test_no_interpolation({ +test_interpolation({ property: 'background-image', from: from, to: to, -}); +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); // Image to crossfade from = 'url(../resources/blue-100.png)'; to = 'cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)'; -test_no_interpolation({ +test_interpolation({ property: 'background-image', from: from, to: to, -}); +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); // Gradient to gradient from = 'linear-gradient(-45deg, red, yellow)'; to = 'linear-gradient(45deg, blue, orange)'; -test_no_interpolation({ +test_interpolation({ property: 'background-image', from: from, to: to, -}); +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); // Keyword to image from = 'none'; to = 'url(../resources/green-100.png)'; -test_no_interpolation({ +test_interpolation({ property: 'background-image', from: from, to: to, -}); +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); // Multiple to multiple var fromA = 'url(../resources/stripes-100.png)'; @@ -141,8 +183,8 @@ }, [ {at: -0.3, expect: from}, {at: 0, expect: from}, - {at: 0.3, expect: 'cross-fade(' + fromA + ', ' + toA + ', 0.3), cross-fade(' + fromB + ', ' + toB + ', 0.3)'}, - {at: 0.6, expect: 'cross-fade(' + fromA + ', ' + toA + ', 0.6), cross-fade(' + fromB + ', ' + toB + ', 0.6)'}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, {at: 1, expect: to}, {at: 1.5, expect: to}, ]); @@ -161,10 +203,10 @@ // Animating background-image is not specified to be possible however we do it for backwards compatibility. // With this in mind we kept the implementation simple at the expense of this corner case because there is // no official specification to support. - {at: -0.3, expect: from + ', ' + from}, + {at: -0.3, expect: from}, {at: 0, expect: from}, - {at: 0.3, expect: 'cross-fade(' + from + ', ' + toA + ', 0.3), cross-fade(' + from + ', ' + toB + ', 0.3)'}, - {at: 0.6, expect: 'cross-fade(' + from + ', ' + toA + ', 0.6), cross-fade(' + from + ', ' + toB + ', 0.6)'}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, {at: 1, expect: to}, {at: 1.5, expect: to}, ]); @@ -172,10 +214,17 @@ // Multiple mismatched types from = 'url(../resources/blue-100.png), none'; to = 'url(../resources/stripes-100.png), url(../resources/green-100.png)'; -test_no_interpolation({ +test_interpolation({ property: 'background-image', from: from, to: to, -}); +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); </script> </body>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-lists/animations/list-style-image-interpolation-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-lists/animations/list-style-image-interpolation-expected.txt new file mode 100644 index 0000000..919c6a97 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-lists/animations/list-style-image-interpolation-expected.txt
@@ -0,0 +1,224 @@ +This is a testharness.js-based test. +Found 220 tests; 154 PASS, 66 FAIL, 0 TIMEOUT, 0 NOTRUN. +PASS CSS Transitions: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Transitions: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Transitions: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Transitions with transition: all: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions with transition: all: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS Web Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL Web Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL Web Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS Web Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from neutral to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +FAIL CSS Transitions: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +PASS CSS Transitions: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +FAIL CSS Transitions with transition: all: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +PASS CSS Transitions with transition: all: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] +PASS CSS Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0) should be [none] +PASS CSS Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.3) should be [none] +PASS CSS Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] +PASS Web Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0) should be [none] +PASS Web Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.3) should be [none] +PASS Web Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [initial] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS CSS Transitions: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL CSS Transitions: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL CSS Transitions with transition: all: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions with transition: all: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS CSS Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL CSS Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS Web Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL Web Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL Web Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS Web Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [inherit] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS CSS Transitions: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL CSS Transitions: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL CSS Transitions with transition: all: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions with transition: all: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS CSS Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL CSS Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] +PASS Web Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/blue-20.png)] +FAIL Web Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL Web Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / blue - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS Web Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png)] +FAIL CSS Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.5) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.5 ) " +FAIL CSS Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png)] +FAIL Web Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL Web Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.5) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.5 ) " +FAIL Web Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS Web Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [url(../resources/stripes-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +FAIL CSS Transitions: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +PASS CSS Transitions: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +FAIL CSS Transitions with transition: all: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_equals: expected "none " but got "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " +PASS CSS Transitions with transition: all: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] +PASS CSS Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0) should be [none] +PASS CSS Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.3) should be [none] +PASS CSS Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] +PASS Web Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0) should be [none] +PASS Web Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.3) should be [none] +PASS Web Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [none] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/green-20.png)] +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0) should be [url(../resources/green-20.png)] +FAIL Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.3 ) " +FAIL Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , url ( http : / / web - platform.test : 8001 / ... / stripes - 20.png ) , 0.6 ) " +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Transitions: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Transitions with transition: all: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/green-20.png)] +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/green-20.png)] +FAIL CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [url(../resources/green-20.png)] +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0) should be [url(../resources/green-20.png)] +FAIL Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [url(../resources/green-20.png)] assert_equals: expected "url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( url ( http : / / web - platform.test : 8001 / ... / green - 20.png ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS Web Animations: property <list-style-image> from [url(../resources/green-20.png)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Transitions: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] +PASS CSS Transitions: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] +FAIL CSS Transitions: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL CSS Transitions: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS CSS Transitions: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Transitions: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Transitions with transition: all: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] +PASS CSS Transitions with transition: all: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] +FAIL CSS Transitions with transition: all: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL CSS Transitions with transition: all: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS CSS Transitions with transition: all: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Transitions with transition: all: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] +PASS CSS Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] +FAIL CSS Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL CSS Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS CSS Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS CSS Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +PASS Web Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (-0.3) should be [linear-gradient(-45deg, red, yellow)] +PASS Web Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0) should be [linear-gradient(-45deg, red, yellow)] +FAIL Web Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.3) should be [linear-gradient(-45deg, red, yellow)] assert_equals: expected "linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.3 ) " +FAIL Web Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (0.6) should be [linear-gradient(45deg, blue, orange)] assert_equals: expected "linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) " but got "- webkit - cross - fade ( linear - gradient ( - 45deg , rgb ( 255 , 0 , 0 ) , rgb ( 255 , 255 , 0 ) ) , linear - gradient ( 45deg , rgb ( 0 , 0 , 255 ) , rgb ( 255 , 165 , 0 ) ) , 0.6 ) " +PASS Web Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1) should be [linear-gradient(45deg, blue, orange)] +PASS Web Animations: property <list-style-image> from [linear-gradient(-45deg, red, yellow)] to [linear-gradient(45deg, blue, orange)] at (1.5) should be [linear-gradient(45deg, blue, orange)] +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/css/css-lists/animations/list-style-image-interpolation.html b/third_party/blink/web_tests/external/wpt/css/css-lists/animations/list-style-image-interpolation.html new file mode 100644 index 0000000..b953d8c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-lists/animations/list-style-image-interpolation.html
@@ -0,0 +1,147 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<title>list-style-image interpolation</title> +<link rel="help" href="https://drafts.csswg.org/css-lists-3/#propdef-list-style-image"> +<meta name="assert" content="list-style-image supports animation"> + +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<script src="/css/support/interpolation-testcommon.js"></script> + +<style> +.parent { + list-style-image: url(../resources/blue-20.png); +} +.target { + background-color: black; + width: 100px; + list-style-image: url(../resources/green-20.png); +} +.expected { + background-color: green; +} +</style> + +<body> +<template id="target-template"> + <ul> + <li class="target"></li> + </ul> +</template> +<script> +test_interpolation({ + property: 'list-style-image', + from: neutralKeyframe, + to: 'url(../resources/stripes-20.png)', +}, [ + {at: -0.3, expect: 'url(../resources/green-20.png)'}, + {at: 0, expect: 'url(../resources/green-20.png)'}, + {at: 0.3, expect: 'url(../resources/green-20.png)'}, + {at: 0.6, expect: 'url(../resources/stripes-20.png)'}, + {at: 1, expect: 'url(../resources/stripes-20.png)'}, + {at: 1.5, expect: 'url(../resources/stripes-20.png)'}, +]); + +test_interpolation({ + property: 'list-style-image', + from: 'initial', + to: 'url(../resources/stripes-20.png)', +}, [ + {at: -0.3, expect: 'none'}, + {at: 0, expect: 'none'}, + {at: 0.3, expect: 'none'}, + {at: 0.6, expect: 'url(../resources/stripes-20.png)'}, + {at: 1, expect: 'url(../resources/stripes-20.png)'}, + {at: 1.5, expect: 'url(../resources/stripes-20.png)'}, +]); + +test_interpolation({ + property: 'list-style-image', + from: 'inherit', + to: 'url(../resources/stripes-20.png)', +}, [ + {at: -0.3, expect: 'url(../resources/blue-20.png)'}, + {at: 0, expect: 'url(../resources/blue-20.png)'}, + {at: 0.3, expect: 'url(../resources/blue-20.png)'}, + {at: 0.6, expect: 'url(../resources/stripes-20.png)'}, + {at: 1, expect: 'url(../resources/stripes-20.png)'}, + {at: 1.5, expect: 'url(../resources/stripes-20.png)'}, +]); + +test_interpolation({ + property: 'list-style-image', + from: 'unset', + to: 'url(../resources/stripes-20.png)', +}, [ + {at: -0.3, expect: 'url(../resources/blue-20.png)'}, + {at: 0, expect: 'url(../resources/blue-20.png)'}, + {at: 0.3, expect: 'url(../resources/blue-20.png)'}, + {at: 0.6, expect: 'url(../resources/stripes-20.png)'}, + {at: 1, expect: 'url(../resources/stripes-20.png)'}, + {at: 1.5, expect: 'url(../resources/stripes-20.png)'}, +]); + +// Constant image +test_no_interpolation({ + property: 'list-style-image', + from: 'url(../resources/stripes-20.png)', + to: 'url(../resources/stripes-20.png)', +}); + +// None to image +test_interpolation({ + property: 'list-style-image', + from: 'none', + to: 'url(../resources/stripes-20.png)', +}, [ + {at: -0.3, expect: 'none'}, + {at: 0, expect: 'none'}, + {at: 0.3, expect: 'none'}, + {at: 0.6, expect: 'url(../resources/stripes-20.png)'}, + {at: 1, expect: 'url(../resources/stripes-20.png)'}, + {at: 1.5, expect: 'url(../resources/stripes-20.png)'}, +]); + +// Image to image +test_interpolation({ + property: 'list-style-image', + from: 'url(../resources/green-20.png)', + to: 'url(../resources/stripes-20.png)', +}, [ + {at: -0.3, expect: 'url(../resources/green-20.png)'}, + {at: 0, expect: 'url(../resources/green-20.png)'}, + {at: 0.3, expect: 'url(../resources/green-20.png)'}, + {at: 0.6, expect: 'url(../resources/stripes-20.png)'}, + {at: 1, expect: 'url(../resources/stripes-20.png)'}, + {at: 1.5, expect: 'url(../resources/stripes-20.png)'}, +]); + +// Image to gradient +test_interpolation({ + property: 'list-style-image', + from: 'url(../resources/green-20.png)', + to: 'linear-gradient(45deg, blue, orange)', +}, [ + {at: -0.3, expect: 'url(../resources/green-20.png)'}, + {at: 0, expect: 'url(../resources/green-20.png)'}, + {at: 0.3, expect: 'url(../resources/green-20.png)'}, + {at: 0.6, expect: 'linear-gradient(45deg, blue, orange)'}, + {at: 1, expect: 'linear-gradient(45deg, blue, orange)'}, + {at: 1.5, expect: 'linear-gradient(45deg, blue, orange)'}, +]); + +// Gradient to gradient +test_interpolation({ + property: 'list-style-image', + from: 'linear-gradient(-45deg, red, yellow)', + to: 'linear-gradient(45deg, blue, orange)', +}, [ + {at: -0.3, expect: 'linear-gradient(-45deg, red, yellow)'}, + {at: 0, expect: 'linear-gradient(-45deg, red, yellow)'}, + {at: 0.3, expect: 'linear-gradient(-45deg, red, yellow)'}, + {at: 0.6, expect: 'linear-gradient(45deg, blue, orange)'}, + {at: 1, expect: 'linear-gradient(45deg, blue, orange)'}, + {at: 1.5, expect: 'linear-gradient(45deg, blue, orange)'}, +]); +</script> +</body>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-lists/resources/blue-20.png b/third_party/blink/web_tests/external/wpt/css/css-lists/resources/blue-20.png new file mode 100644 index 0000000..c464c75 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-lists/resources/blue-20.png Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/css/css-lists/resources/green-20.png b/third_party/blink/web_tests/external/wpt/css/css-lists/resources/green-20.png new file mode 100644 index 0000000..738d1db --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-lists/resources/green-20.png Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/css/css-lists/resources/stripes-20.png b/third_party/blink/web_tests/external/wpt/css/css-lists/resources/stripes-20.png new file mode 100644 index 0000000..de30887e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-lists/resources/stripes-20.png Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/animations/mask-image-interpolation-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-masking/animations/mask-image-interpolation-expected.txt new file mode 100644 index 0000000..2ac1de9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-masking/animations/mask-image-interpolation-expected.txt
@@ -0,0 +1,244 @@ +This is a testharness.js-based test. +Found 240 tests; 0 PASS, 240 FAIL, 0 TIMEOUT, 0 NOTRUN. +FAIL CSS Transitions: property <mask-image> from neutral to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from neutral to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from neutral to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'to' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [initial] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [inherit] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [unset] to [url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.6) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1.5) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.6) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1.5) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.6) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1.5) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (0.6) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [url(../resources/blue-20.png)] at (1.5) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.6) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1.5) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.6) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1.5) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.6) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1.5) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (-0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.3) should be [url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (0.6) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png)] to [linear-gradient(45deg, blue, transparent)] at (1.5) should be [linear-gradient(45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [none] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [none] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (-0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.3) should be [none] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (0.6) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [none] to [url(../resources/green-20.png)] at (1.5) should be [url(../resources/green-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (-0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.3) should be [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (0.6) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/stripes-20.png), linear-gradient(-45deg, blue, transparent)] to [url(../resources/blue-20.png), url(../resources/stripes-20.png)] at (1.5) should be [url(../resources/blue-20.png), url(../resources/stripes-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png)] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Transitions with transition: all: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL CSS Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (-0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.3) should be [url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (0.6) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +FAIL Web Animations: property <mask-image> from [url(../resources/blue-20.png), none] to [url(../resources/stripes-20.png), url(../resources/blue-20.png)] at (1.5) should be [url(../resources/stripes-20.png), url(../resources/blue-20.png)] assert_true: 'from' value should be supported expected true got false +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/animations/mask-image-interpolation.html b/third_party/blink/web_tests/external/wpt/css/css-masking/animations/mask-image-interpolation.html new file mode 100644 index 0000000..beb9c9e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-masking/animations/mask-image-interpolation.html
@@ -0,0 +1,180 @@ +<!DOCTYPE html> +<meta charset="UTF-8"> +<title>mask-image-interpolation</title> +<link rel="help" href="https://drafts.fxtf.org/css-masking-1/#the-mask-image"> +<meta name="assert" content="mask-image supports animation"> + +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<script src="/css/support/interpolation-testcommon.js"></script> + +<style> +.parent { + mask-image: url(../resources/blue-20.png); +} +.target { + width: 20px; + height: 20px; + display: inline-block; + background-color: black; + mask-image: url(../resources/stripes-20.png); +} +.expected { + background-color: green; + margin-right: 10px; +} +</style> + +<body> +<script> +// neutral +test_interpolation({ + property: 'mask-image', + from: neutralKeyframe, + to: 'url(../resources/green-20.png)', +}, [ + {at: -0.3, expect: 'url(../resources/stripes-20.png)'}, + {at: 0, expect: 'url(../resources/stripes-20.png)'}, + {at: 0.3, expect: 'url(../resources/stripes-20.png)'}, + {at: 0.6, expect: 'url(../resources/green-20.png)'}, + {at: 1, expect: 'url(../resources/green-20.png)'}, + {at: 1.5, expect: 'url(../resources/green-20.png)'}, +]); + +// initial +test_interpolation({ + property: 'mask-image', + from: 'initial', + to: 'url(../resources/green-20.png)', +}, [ + {at: -0.3, expect: 'none'}, + {at: 0, expect: 'none'}, + {at: 0.3, expect: 'none'}, + {at: 0.6, expect: 'url(../resources/green-20.png)'}, + {at: 1, expect: 'url(../resources/green-20.png)'}, + {at: 1.5, expect: 'url(../resources/green-20.png)'}, +]); + +// inherit +test_interpolation({ + property: 'mask-image', + from: 'inherit', + to: 'url(../resources/green-20.png)', +}, [ + {at: -0.3, expect: 'url(../resources/blue-20.png)'}, + {at: 0, expect: 'url(../resources/blue-20.png)'}, + {at: 0.3, expect: 'url(../resources/blue-20.png)'}, + {at: 0.6, expect: 'url(../resources/green-20.png)'}, + {at: 1, expect: 'url(../resources/green-20.png)'}, + {at: 1.5, expect: 'url(../resources/green-20.png)'}, +]); + +// unset +test_interpolation({ + property: 'mask-image', + from: 'unset', + to: 'url(../resources/stripes-20.png)', +}, [ + {at: -0.3, expect: 'none'}, + {at: 0, expect: 'none'}, + {at: 0.3, expect: 'none'}, + {at: 0.6, expect: 'url(../resources/stripes-20.png)'}, + {at: 1, expect: 'url(../resources/stripes-20.png)'}, + {at: 1.5, expect: 'url(../resources/stripes-20.png)'}, +]); + +// Image to image +test_interpolation({ + property: 'mask-image', + from: 'url(../resources/stripes-20.png)', + to: 'url(../resources/blue-20.png)', +}, [ + {at: -0.3, expect: 'url(../resources/stripes-20.png)'}, + {at: 0, expect: 'url(../resources/stripes-20.png)'}, + {at: 0.3, expect: 'url(../resources/stripes-20.png)'}, + {at: 0.6, expect: 'url(../resources/blue-20.png)'}, + {at: 1, expect: 'url(../resources/blue-20.png)'}, + {at: 1.5, expect: 'url(../resources/blue-20.png)'}, +]); + +//Image to gradient +test_interpolation({ + property: 'mask-image', + from: 'url(../resources/stripes-20.png)', + to: 'linear-gradient(45deg, blue, transparent)' +}, [ + {at: -0.3, expect: 'url(../resources/stripes-20.png)'}, + {at: 0, expect: 'url(../resources/stripes-20.png)'}, + {at: 0.3, expect: 'url(../resources/stripes-20.png)'}, + {at: 0.6, expect: 'linear-gradient(45deg, blue, transparent)'}, + {at: 1, expect: 'linear-gradient(45deg, blue, transparent)'}, + {at: 1.5, expect: 'linear-gradient(45deg, blue, transparent)'}, +]); + +// Keyword to image +test_interpolation({ + property: 'mask-image', + from: 'none', + to: 'url(../resources/green-20.png)', +}, [ + {at: -0.3, expect: 'none'}, + {at: 0, expect: 'none'}, + {at: 0.3, expect: 'none'}, + {at: 0.6, expect: 'url(../resources/green-20.png)'}, + {at: 1, expect: 'url(../resources/green-20.png)'}, + {at: 1.5, expect: 'url(../resources/green-20.png)'}, +]); + +// Multiple to multiple +var fromA = 'url(../resources/stripes-20.png)'; +var fromB = 'linear-gradient(-45deg, blue, transparent)'; +var toA = 'url(../resources/blue-20.png)'; +var toB = 'url(../resources/stripes-20.png)'; +var from = fromA + ', ' + fromB; +var to = toA + ', ' + toB; +test_interpolation({ + property: 'mask-image', + from: from, + to: to, +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); + +// Single to multiple +from = 'url(../resources/blue-20.png)'; +toA = 'url(../resources/stripes-20.png)'; +toB = 'url(../resources/blue-20.png)'; +to = toA + ', ' + toB; +test_interpolation({ + property: 'mask-image', + from: from, + to: to, +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); + +// Multiple mismatched types +test_interpolation({ + property: 'mask-image', + from: 'url(../resources/blue-20.png), none', + to: 'url(../resources/stripes-20.png), url(../resources/blue-20.png)', +}, [ + {at: -0.3, expect: from}, + {at: 0, expect: from}, + {at: 0.3, expect: from}, + {at: 0.6, expect: to}, + {at: 1, expect: to}, + {at: 1.5, expect: to}, +]); +</script> +</body>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/resources/blue-20.png b/third_party/blink/web_tests/external/wpt/css/css-masking/resources/blue-20.png new file mode 100644 index 0000000..c464c75 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-masking/resources/blue-20.png Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/resources/green-20.png b/third_party/blink/web_tests/external/wpt/css/css-masking/resources/green-20.png new file mode 100644 index 0000000..738d1db --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-masking/resources/green-20.png Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/css/css-masking/resources/stripes-20.png b/third_party/blink/web_tests/external/wpt/css/css-masking/resources/stripes-20.png new file mode 100644 index 0000000..de30887e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-masking/resources/stripes-20.png Binary files differ
diff --git a/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties-expected.txt index a91c4a20..86f8091 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties-expected.txt +++ b/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties-expected.txt
@@ -16,7 +16,7 @@ FAIL Property font-variant-position value 'sub' computes to 'sub' in ::marker assert_true: font-variant-position doesn't seem to be supported in the computed style expected true got false PASS Property font-weight value '900' computes to '900' in ::marker PASS Property color value 'rgb(0, 100, 200)' computes to 'rgb(0, 100, 200)' in ::marker -PASS Property text-combine-upright value 'none' computes to 'none' in ::marker +PASS Property text-combine-upright value 'all' computes to 'all' in ::marker PASS Property unicode-bidi value 'plaintext' computes to 'plaintext' in ::marker PASS Property direction value 'rtl' computes to 'rtl' in ::marker PASS Property content value '"foo"' computes to '"foo"' in ::marker
diff --git a/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties.html b/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties.html index 451aac14..a34fd76 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties.html +++ b/third_party/blink/web_tests/external/wpt/css/css-pseudo/parsing/marker-supported-properties.html
@@ -35,7 +35,7 @@ test_pseudo_computed_value("::marker", "color", "rgb(0, 100, 200)"); // ::marker supports `text-combine-upright`, `unicode-bidi` and `direction` -test_pseudo_computed_value("::marker", "text-combine-upright", "none"); +test_pseudo_computed_value("::marker", "text-combine-upright", "all"); test_pseudo_computed_value("::marker", "unicode-bidi", "plaintext"); test_pseudo_computed_value("::marker", "direction", "rtl");
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/echo-policy-nested.html b/third_party/blink/web_tests/external/wpt/document-policy/echo-policy-nested.html new file mode 100644 index 0000000..d572dcb --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/echo-policy-nested.html
@@ -0,0 +1,32 @@ +<!DOCTYPE html> +<body> +<script> +// This document will contain an iframe which will either host echo-policy.py, +// or will host another copy of this document, with the nesting level reduced +// by one. This way, an arbitrary nesting depth can be achieved, with the +// final inner-most frame reporting back the advertised required policy. + +// The 'id' URL parameter will be passed to the nested document. +// The 'level' URL paramater will be reduced by 1 and passed to the nested +// document if it was at least 1. (If it was 0, then echo-policy.py will be +// nested instead, and the level parameter will not be passed.) + +// This document is served with a Document Policy header that should satisfy +// any requests that include a required policy for the +// 'unoptimized-lossless-images' feature. +const params = new URLSearchParams(window.location.search); +const id = params.get('id'); +const level = params.get('level'); + +const iframe = document.createElement('iframe'); +var hostname; +if (level >= 1) { + params.set('level',level-1); + hostname = document.location.pathname + "?" + params.toString(); +} else { + params.delete('level'); + hostname = "/document-policy/echo-policy.py?" + params.toString(); +} +iframe.src = hostname; +document.body.appendChild(iframe); +</script>
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/echo-policy-nested.html.headers b/third_party/blink/web_tests/external/wpt/document-policy/echo-policy-nested.html.headers new file mode 100644 index 0000000..fe839ef5 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/echo-policy-nested.html.headers
@@ -0,0 +1 @@ +Document-Policy: unoptimized-lossless-images;bpp=0.0
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/echo-policy.py b/third_party/blink/web_tests/external/wpt/document-policy/echo-policy.py new file mode 100644 index 0000000..52a2bf97 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/echo-policy.py
@@ -0,0 +1,28 @@ +# This will echo the 'Sec-Required-Document-Policy' request header in the body +# of the response, as well as in the 'Document-Policy' response header (to +# ensure the response is loaded by a user agent which is implementing document +# policy.) +import json + +def main(request, response): + msg = {} + headers = [('Content-Type', 'text/html')] + + srdp = request.headers.get('Sec-Required-Document-Policy') + if srdp: + msg['requiredPolicy'] = srdp + headers.append(('Document-Policy', srdp)) + + frameId = request.GET.first('id',None) + if frameId: + msg['id'] = frameId + + content = """<!DOCTYPE html> +<script> +top.postMessage(%s, "*"); +</script> +%s +""" % (json.dumps(msg), srdp) + + return (200, 'OK'), headers, content +
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/required-policy/document-policy.html b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/document-policy.html new file mode 100644 index 0000000..d6bf3e9 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/document-policy.html
@@ -0,0 +1,54 @@ +<!DOCTYPE html> +<html> + <head> + <title>Test advertised required document policy</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> </head> + <body> + <h1>Test advertised required document policy</h1> +<script> +// The top-level document has a document policy, but not a required document +// policy. A request for a document in a frame should not include a +// `Sec-Required-Document-Policy` header, unless that frame requires it +// explicitly through the `policy` attribute. + +callbacks = {}; + +window.addEventListener('message', ev => { + var id = ev.data.id; + if (id && callbacks[id]) { + callbacks[id](ev.data.requiredPolicy || null); + } +}); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=1"; + callbacks["1"] = t.step_func_done(result => { + assert_equals(result, null); + }); + document.body.appendChild(iframe); +}, "Top-level document's policy should not affect child frame requests"); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=2"; + iframe.policy = "no-font-display-late-swap"; + callbacks["2"] = t.step_func_done(result => { + assert_equals(result, "no-font-display-late-swap"); + }); + document.body.appendChild(iframe); +}, "Child frame can have a required policy independent of the parent document."); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=3"; + iframe.policy = "unoptimized-lossless-images;bpp=4"; + callbacks["3"] = t.step_func_done(result => { + assert_equals(result, "unoptimized-lossless-images;bpp=4"); + }); + document.body.appendChild(iframe); +}, "Child frame can have a required policy which is less strict than the parent document's policy."); + </script> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/required-policy/document-policy.html.headers b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/document-policy.html.headers new file mode 100644 index 0000000..d321c26 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/document-policy.html.headers
@@ -0,0 +1 @@ +Document-Policy: unoptimized-lossless-images;bpp=1.1
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/required-policy/no-document-policy.html b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/no-document-policy.html new file mode 100644 index 0000000..9af2e51 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/no-document-policy.html
@@ -0,0 +1,44 @@ +<!DOCTYPE html> +<html> + <head> + <title>Test advertised required document policy</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> </head> + <body> + <h1>Test advertised required document policy</h1> +<script> +// The top-level document does not have any document-policy-related headers. +// A request for a document in a frame should not include a +// `Sec-Required-Document-Policy` header, unless that frame requires it +// explicitly through the `policy` attribute. + +callbacks = {}; + +window.addEventListener('message', ev => { + var id = ev.data.id; + if (id && callbacks[id]) { + callbacks[id](ev.data.requiredPolicy || null); + } +}); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=1"; + callbacks["1"] = t.step_func_done(result => { + assert_equals(result, null); + }); + document.body.appendChild(iframe); +}, "Child frame should have no required policy by default."); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=2"; + iframe.policy = "no-font-display-late-swap"; + callbacks["2"] = t.step_func_done(result => { + assert_equals(result, "no-font-display-late-swap"); + }); + document.body.appendChild(iframe); +}, "Child frame can have an explicit required policy."); + </script> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy-nested.html b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy-nested.html new file mode 100644 index 0000000..39e2a92 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy-nested.html
@@ -0,0 +1,65 @@ +<!DOCTYPE html> +<html> + <head> + <title>Test advertised required document policy</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> </head> + <body> + <h1>Test advertised required document policy</h1> +<script> +// The top-level document has no required document policy. Its child frames may, +// though, and those policies should be set for any subframes. + +callbacks = {}; + +window.addEventListener('message', ev => { + var id = ev.data.id; + if (id && callbacks[id]) { + callbacks[id](ev.data.requiredPolicy || null); + } +}); + +// Frame tree should be: +// Top: +// <iframe> +// <iframe> +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy-nested.html?id=1"; + callbacks["1"] = t.step_func_done(result => { + assert_equals(result, null); + }); + document.body.appendChild(iframe); +}, "test nested required document policy"); + +// Frame tree should be: +// Top: +// <iframe policy="unoptimized-lossless-images;bpp=1.1"> +// <iframe> +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy-nested.html?id=2"; + iframe.policy = "unoptimized-lossless-images;bpp=1.1"; + callbacks["2"] = t.step_func_done(result => { + assert_equals(result, "unoptimized-lossless-images;bpp=1.1"); + }); + document.body.appendChild(iframe); +}, "test nested required document policy when set by nested frame"); + +// Frame tree should be: +// Top: +// <iframe policy="unoptimized-lossless-images;bpp=1.1"> +// <iframe> +// <iframe> +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy-nested.html?id=3&level=1"; + iframe.policy = "unoptimized-lossless-images;bpp=1.1"; + callbacks["3"] = t.step_func_done(result => { + assert_equals(result, "unoptimized-lossless-images;bpp=1.1"); + }); + document.body.appendChild(iframe); +}, "test nested required document policy when set by intermediate nested frame"); + </script> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy.html b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy.html new file mode 100644 index 0000000..12cebdd --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy.html
@@ -0,0 +1,65 @@ +<!DOCTYPE html> +<html> + <head> + <title>Test advertised required document policy</title> + <script src="/resources/testharness.js"></script> + <script src="/resources/testharnessreport.js"></script> </head> + <body> + <h1>Test advertised required document policy</h1> +<script> +// The top-level document has a required document policy. Any requests for +// documents in child frames must be sent with a required policy header +// indicating a required policy at least as strict. (In this case, "at least as +// strict" means that the 'bpp' parameter must be less than or equal to the +// parent document's required value.) + +callbacks = {}; + +window.addEventListener('message', ev => { + var id = ev.data.id; + if (id && callbacks[id]) { + callbacks[id](ev.data.requiredPolicy || null); + } +}); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=1"; + callbacks["1"] = t.step_func_done(result => { + assert_equals(result, "unoptimized-lossless-images;bpp=1.1"); + }); + document.body.appendChild(iframe); +}, "Child frame with no explicit policy should have the same required policy as its parent."); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=2"; + iframe.policy = "unoptimized-lossless-images;bpp=4"; + callbacks["2"] = t.step_func_done(result => { + assert_equals(result, "unoptimized-lossless-images;bpp=1.1"); + }); + document.body.appendChild(iframe); +}, "Child frame with a less strict required policy should have the stricter value from the parent's policy applied."); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=3"; + iframe.policy = "unoptimized-lossless-images;bpp=1.0"; + callbacks["3"] = t.step_func_done(result => { + assert_equals(result, "unoptimized-lossless-images;bpp=1.0"); + }); + document.body.appendChild(iframe); +}, "Child frame may have a stricter policy than the parent."); + +async_test(t => { + var iframe = document.createElement('iframe'); + iframe.src = "/document-policy/echo-policy.py?id=4"; + iframe.policy = "no-font-display-late-swap"; + callbacks["4"] = t.step_func_done(result => { + assert_equals(result, "no-font-display-late-swap, unoptimized-lossless-images;bpp=1.1"); + }); + document.body.appendChild(iframe); +}, "Any unrelated policy directives should combine with the parent's required policy."); + </script> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy.html.headers b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy.html.headers new file mode 100644 index 0000000..066c0f83 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/document-policy/required-policy/required-document-policy.html.headers
@@ -0,0 +1 @@ +Required-Document-Policy: unoptimized-lossless-images;bpp=1.1
diff --git a/third_party/blink/web_tests/external/wpt/lint.whitelist b/third_party/blink/web_tests/external/wpt/lint.whitelist index 9a881a8..4f2ef9c 100644 --- a/third_party/blink/web_tests/external/wpt/lint.whitelist +++ b/third_party/blink/web_tests/external/wpt/lint.whitelist
@@ -201,7 +201,7 @@ SET TIMEOUT: trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html SET TIMEOUT: trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html SET TIMEOUT: user-timing/* -SET TIMEOUT: web-animations/timing-model/animations/reverse-running-animation.html +SET TIMEOUT: web-animations/timing-model/animations/* SET TIMEOUT: webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html SET TIMEOUT: webauthn/*timeout.https.html SET TIMEOUT: webdriver/*
diff --git a/third_party/blink/web_tests/external/wpt/svg/render/foreignObject-in-non-rendered-getComputedStyle.html b/third_party/blink/web_tests/external/wpt/svg/render/foreignObject-in-non-rendered-getComputedStyle.html new file mode 100644 index 0000000..409f1044 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/svg/render/foreignObject-in-non-rendered-getComputedStyle.html
@@ -0,0 +1,20 @@ +<!doctype html> +<title>SVG Test: Resolved width inside non-rendered foreignObject</title> +<link rel="help" href="https://www.w3.org/TR/SVG2/render.html#Rendered-vs-NonRendered"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> +<svg> + <radialGradient> + <pattern> + <foreignObject id="foreignObject"> + <div id="foRoot"></div> + </foreignObject> + </pattern> + </radialGradient> +</svg> +<script> + test(() => { + assert_equals(getComputedStyle(foreignObject).width, "auto", "Non-rendered foreignObject should have width computed to 'auto'."); + assert_equals(getComputedStyle(foRoot).width, "auto", "Non-rendered block inside foreignObject should have width computed to 'auto'."); + }, "Test that we don't generated boxes for foreignObject in non-rendered SVG."); +</script>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/sync-start-times-ref.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/sync-start-times-ref.html new file mode 100644 index 0000000..fc843a13 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/sync-start-times-ref.html
@@ -0,0 +1,20 @@ + +<!DOCTYPE html> +<meta charset="UTF-8"> +<title>Reference for sync start times</title> +<style> + #notes { + position: absolute; + left: 0px; + top: 100px; + } +</style> + +<body> + <p id="notes"> + This test creates a pair of animations, starts the first animation and then + syncs the second animation to align with the first. The test passes if the + box associated with the first animation is completely occluded by the + second. + </p> +</body>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/sync-start-times.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/sync-start-times.html new file mode 100644 index 0000000..06dcf03 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/sync-start-times.html
@@ -0,0 +1,68 @@ + +<!DOCTYPE html> +<html class="reftest-wait"> +<meta charset="UTF-8"> +<title>sync start times</title> +<link rel="match" href="sync-start-times-ref.html"> +<script src="/common/reftest-wait.js"></script> +<style> + #box-1, #box-2 { + border: 1px solid white; + height: 40px; + left: 40px; + position: absolute; + top: 40px; + width: 40px; + } + #box-1 { + background: blue; + z-index: 1; + } + #box-2 { + background: white; + z-index: 2; + } + #notes { + position: absolute; + left: 0px; + top: 100px; + } +</style> + +<body> + <div id="box-1"></div> + <div id="box-2"></div> + <p id="notes"> + This test creates a pair of animations, starts the first animation and then + syncs the second animation to align with the first. The test passes if the + box associated with the first animation is completely occluded by the + second. + </p> +</body> +<script> + onload = function() { + function createAnimation(elementId) { + const elem = document.getElementById(elementId); + const keyframes = [ + { transform: 'translateX(0px)' }, + { transform: 'translateX(200px)' } + ]; + const anim = elem.animate(keyframes, { duration: 1000 }); + anim.pause(); + return anim; + }; + + const anim1 = createAnimation('box-1'); + const anim2 = createAnimation('box-2'); + + anim1.currentTime = 500; + anim1.play(); + + anim1.ready.then(() => { + anim2.startTime = anim1.startTime; + requestAnimationFrame(() => { + takeScreenshot(); + }); + }); + }; +</script>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-fast-ref.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-fast-ref.html new file mode 100644 index 0000000..af69b261 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-fast-ref.html
@@ -0,0 +1,20 @@ +<!DOCTYPE html> +<title>Reference for update playback rate zero</title> +<style> + #notes { + position: absolute; + left: 0px; + top: 100px; + } + body { + background: white; + } +</style> +<body> + <div id="box"></div> + <p id="notes"> + This test creates a running animation and changes its playback rate + part way through. The animation finishes ahead of the screenshot. + If any blue pixels appear in the screenshot, the test fails. + </p> +</body>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-fast.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-fast.html new file mode 100644 index 0000000..63a76ba --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-fast.html
@@ -0,0 +1,62 @@ + +<!DOCTYPE html> +<html class="reftest-wait"> +<meta charset="UTF-8"> +<title>Update playback rate zero</title> +<link rel="match" href="update-playback-rate-fast-ref.html"> +<script src="/common/reftest-wait.js"></script> +<style> + #box-1, #box-2 { + border: 1px solid white; + height: 40px; + left: 40px; + position: absolute; + top: 40px; + width: 40px; + } + #box-1 { + background: blue; + z-index: 1; + } + #box-2 { + background: white; + transform: translateX(0px); + z-index: 2; + } + #notes { + position: absolute; + left: 0px; + top: 100px; + } + body { + background: white; + } +</style> + +<body> + <div id="box-1"></div> + <div id="box-2"></div> + <p id="notes"> + This test creates a running animation and changes its playback rate + part way through. The animation finishes ahead of the screenshot. + If any blue pixels appear in the screenshot, the test fails. + </p> +</body> +<script> + onload = function() { + const elem = document.getElementById('box-1'); + const anim = elem.animate([ + { transform: 'translateX(100px)' }, + { transform: 'translateX(100px)' }, + { transform: 'translateX(200px)' }, + { transform: 'translateX(200px)' } + ], { + duration: 1000 + }); + + anim.ready.then(() => { + anim.updatePlaybackRate(2); + takeScreenshotDelayed(750); + }); + }; +</script>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-slow-ref.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-slow-ref.html new file mode 100644 index 0000000..11b87de --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-slow-ref.html
@@ -0,0 +1,18 @@ +<!DOCTYPE html> +<title>Reference for update playback rate zero</title> +<style> + #notes { + position: absolute; + left: 0px; + top: 100px; + } +</style> +<body> + <div id="box"></div> + <p id="notes"> + This test creates a running animation and changes its playback rate + part way through. The animation slows down so that it does not finish + before the screenshot. If any blue pixels appear in the screenshot, + the test fails. + </p> +</body>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-slow.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-slow.html new file mode 100644 index 0000000..db449f2c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-slow.html
@@ -0,0 +1,62 @@ + +<!DOCTYPE html> +<html class="reftest-wait"> +<meta charset="UTF-8"> +<title>Update playback rate zero</title> +<link rel="match" href="update-playback-rate-slow-ref.html"> +<script src="/common/reftest-wait.js"></script> +<style> + #box-1, #box-2 { + border: 1px solid white; + height: 40px; + left: 40px; + position: absolute; + top: 40px; + width: 40px; + } + #box-1 { + background: blue; + z-index: 1; + } + #box-2 { + background: white; + transform: translateX(200px); + z-index: 2; + } + #notes { + position: absolute; + left: 0px; + top: 100px; + } +</style> + +<body> + <div id="box-1"></div> + <div id="box-2"></div> + <p id="notes"> + This test creates a running animation and changes its playback rate + part way through. The animation slows down so that it does not finish + before the screenshot. If any blue pixels appear in the screenshot, + the test fails. + </p> +</body> +<script> + onload = function() { + const elem = document.getElementById('box-1'); + const anim = elem.animate([ + { transform: 'translateX(100px)' }, + { transform: 'translateX(100px)' }, + { transform: 'translateX(200px)' }, + { transform: 'translateX(200px)' } + ], { + duration: 1000 + }); + + anim.ready.then(() => { + setTimeout(() => { + anim.updatePlaybackRate(0.5); + }, 500); + takeScreenshotDelayed(1000); + }); + }; +</script>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-zero-ref.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-zero-ref.html new file mode 100644 index 0000000..26293a3 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-zero-ref.html
@@ -0,0 +1,17 @@ +<!DOCTYPE html> +<title>Reference for update playback rate zero</title> +<style> + #notes { + position: absolute; + left: 0px; + top: 100px; + } +</style> +<body> + <div id="box"></div> + <p id="notes"> + This test creates a running animation and changes its playback rate + part way through. The animation should stop behind an occluding rectangle. + If not fully occluded, the test fails. + </p> +</body>
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-zero.html b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-zero.html new file mode 100644 index 0000000..bed08d63 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/animations/update-playback-rate-zero.html
@@ -0,0 +1,61 @@ + +<!DOCTYPE html> +<html class="reftest-wait"> +<meta charset="UTF-8"> +<title>Update playback rate zero</title> +<link rel="match" href="update-playback-rate-zero-ref.html"> +<script src="/common/reftest-wait.js"></script> +<style> + #box-1, #box-2 { + border: 1px solid white; + height: 40px; + left: 40px; + position: absolute; + top: 40px; + width: 40px; + } + #box-1 { + background: blue; + z-index: 1; + } + #box-2 { + background: white; + transform: translateX(200px); + z-index: 2; + } + #notes { + position: absolute; + left: 0px; + top: 100px; + } +</style> + +<body> + <div id="box-1"></div> + <div id="box-2"></div> + <p id="notes"> + This test creates a running animation and changes its playback rate + part way through. The animation should stop behind an occluding rectangle. + If not fully occluded, the test fails. + </p> +</body> +<script> + onload = function() { + const elem = document.getElementById('box-1'); + const anim = elem.animate([ + { transform: 'translateX(100px)' }, + { transform: 'translateX(100px)' }, + { transform: 'translateX(200px)' }, + { transform: 'translateX(200px)' } + ], { + duration: 1000 + }); + + anim.ready.then(() => { + setTimeout(() => { + anim.updatePlaybackRate(0); + }, 750); + takeScreenshotDelayed(1200); + }); + }; +</script>
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/network-extrainfo-main-request.js b/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/network-extrainfo-main-request.js index 8fa1d2ab..dac95ea 100644 --- a/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/network-extrainfo-main-request.js +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/service-worker/network-extrainfo-main-request.js
@@ -8,8 +8,9 @@ await session.navigate('resources/repeat-fetch-service-worker.html'); + const attachedPromise = dp.Target.onceAttachedToTarget(); swHelper.installSWAndWaitForActivated('/inspector-protocol/service-worker/resources/repeat-fetch-service-worker.js'); - const attachedToTarget = await dp.Target.onceAttachedToTarget(); + const attachedToTarget = await attachedPromise; const swdp = session.createChild(attachedToTarget.params.sessionId).protocol; await swdp.Network.enable();
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/target/oopif-no-discovery.js b/third_party/blink/web_tests/http/tests/inspector-protocol/target/oopif-no-discovery.js index 8aab24b..0a93f0f5 100644 --- a/third_party/blink/web_tests/http/tests/inspector-protocol/target/oopif-no-discovery.js +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/target/oopif-no-discovery.js
@@ -6,30 +6,33 @@ await dp.Page.onceLoadEventFired(); testRunner.log('Enabling auto-discovery...'); - dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false}); + const attachedPromise = dp.Target.onceAttachedToTarget(); + await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false}); - let attachedEvent = (await dp.Target.onceAttachedToTarget()).params; + const attachedEvent = (await attachedPromise).params; testRunner.log('Got auto-attached.'); - let frameId = attachedEvent.targetInfo.targetId; + const frameId = attachedEvent.targetInfo.targetId; testRunner.log('Navigating to in-process iframe...'); - let navigatePromise = dp.Page.navigate({frameId, url: testRunner.url('../resources/iframe.html')}); - let detachedPromise = dp.Target.onceDetachedFromTarget(); + const navigatePromise = dp.Page.navigate({frameId, url: testRunner.url('../resources/iframe.html')}); + const detachedPromise = dp.Target.onceDetachedFromTarget(); await Promise.all([navigatePromise, detachedPromise]); - let detachedEvent = (await detachedPromise).params; + const detachedEvent = (await detachedPromise).params; testRunner.log('Session id should match: ' + (attachedEvent.sessionId === detachedEvent.sessionId)); testRunner.log('Target id should match: ' + (attachedEvent.targetInfo.targetId === detachedEvent.targetId)); testRunner.log('Navigating back to out-of-process iframe...'); + const attachedPromise2 = dp.Target.onceAttachedToTarget(); dp.Page.navigate({frameId, url: 'http://devtools.oopif.test:8000/inspector-protocol/resources/iframe.html'}); - let attachedEvent2 = (await dp.Target.onceAttachedToTarget()).params; + const attachedEvent2 = (await attachedPromise2).params; testRunner.log('Target ids should match: ' + (attachedEvent.targetInfo.targetId === attachedEvent2.targetInfo.targetId)); - dp.Target.setAutoAttach({autoAttach: false, waitForDebuggerOnStart: false}); - let detachedEvent2 = (await dp.Target.onceDetachedFromTarget()).params; + const detachedPromise2 = dp.Target.onceDetachedFromTarget(); + await dp.Target.setAutoAttach({autoAttach: false, waitForDebuggerOnStart: false}); + const detachedEvent2 = (await detachedPromise2).params; testRunner.log('Session id should match: ' + (attachedEvent2.sessionId === detachedEvent2.sessionId)); testRunner.log('Target id should match: ' + (attachedEvent2.targetInfo.targetId === detachedEvent2.targetId));
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/target/target-setAutoAttach-windowOpen.js b/third_party/blink/web_tests/http/tests/inspector-protocol/target/target-setAutoAttach-windowOpen.js index ee752ecdb..1080190 100644 --- a/third_party/blink/web_tests/http/tests/inspector-protocol/target/target-setAutoAttach-windowOpen.js +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/target/target-setAutoAttach-windowOpen.js
@@ -6,25 +6,28 @@ await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: true, flatten: true, windowOpen: true}); + const attachedPromise = dp.Target.onceAttachedToTarget(); session.evaluate(` window.myWindow = window.open('../resources/inspector-protocol-page.html'); undefined; `); testRunner.log('Opened the window'); - await dp.Target.onceAttachedToTarget(); + await attachedPromise; testRunner.log('Attached to window'); + const changedPromise = dp.Target.onceTargetInfoChanged(); session.evaluate(` window.myWindow.location.assign('../resources/inspector-protocol-page.html?foo'); undefined; `); testRunner.log('Navigated the window'); - await dp.Target.onceTargetInfoChanged(); + await changedPromise; testRunner.log('Target info changed'); + const detachedPromise = dp.Target.onceDetachedFromTarget(); session.evaluate(` window.myWindow.close(); undefined; `); testRunner.log('Closed the window'); - await dp.Target.onceDetachedFromTarget(); + await detachedPromise; testRunner.log('Detached from window'); testRunner.completeTest();
diff --git a/third_party/blink/web_tests/http/tests/inspector-protocol/target/wait-for-debugger.js b/third_party/blink/web_tests/http/tests/inspector-protocol/target/wait-for-debugger.js index ea9b03b..5c9c7bc 100644 --- a/third_party/blink/web_tests/http/tests/inspector-protocol/target/wait-for-debugger.js +++ b/third_party/blink/web_tests/http/tests/inspector-protocol/target/wait-for-debugger.js
@@ -9,21 +9,25 @@ dp.Network.enable() ]); await dp.Network.setUserAgentOverride({userAgent: 'test'}); + const requestSentPromise = dp.Network.onceRequestWillBeSent(); + const attachedPromise = dp.Target.onceAttachedToTarget(); session.evaluate(` var iframe = document.createElement('iframe'); iframe.src = 'http://devtools.oopif.test:8000/inspector-protocol/network/resources/echo-headers.php?headers=HTTP_USER_AGENT'; document.body.appendChild(iframe); `); - let params = (await dp.Network.onceRequestWillBeSent()).params; - let sessionId = (await dp.Target.onceAttachedToTarget()).params.sessionId; - let dp1 = session.createChild(sessionId).protocol; + const params = (await requestSentPromise).params; + const sessionId = (await attachedPromise).params.sessionId; + const dp1 = session.createChild(sessionId).protocol; await dp1.Network.enable(); await dp1.Network.setUserAgentOverride({userAgent: 'test (subframe)'}); + + const loadingFinishedPromise = dp1.Network.onceLoadingFinished(); await dp1.Runtime.runIfWaitingForDebugger(); testRunner.log(`User-Agent = ${params.request.headers['User-Agent']}`); - await dp1.Network.onceLoadingFinished(); - let content = (await dp1.Network.getResponseBody({requestId: params.requestId})).result.body; + await loadingFinishedPromise; + const content = (await dp1.Network.getResponseBody({requestId: params.requestId})).result.body; testRunner.log(`content (should have user-agent header overriden): ${content}`); testRunner.completeTest();
diff --git a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker-loop.js b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker-loop.js index dd76cf3..8875acd 100644 --- a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker-loop.js +++ b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker-loop.js
@@ -5,6 +5,7 @@ await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); + const attachedPromise = dp.Target.onceAttachedToTarget(); await session.evaluate(` window.worker = new Worker('${testRunner.url('resources/dedicated-worker-loop.js')}'); var resolve; @@ -16,7 +17,7 @@ `); testRunner.log('Started worker'); - const sessionId = (await dp.Target.onceAttachedToTarget()).params.sessionId; + const sessionId = (await attachedPromise).params.sessionId; testRunner.log('Worker created'); testRunner.log('didConnectToWorker');
diff --git a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker.js b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker.js index 27b30b7..0b6f6cdb 100644 --- a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker.js +++ b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-pause-dedicated-worker.js
@@ -9,10 +9,11 @@ `); testRunner.log('Started worker'); - dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, + const attachedPromise = dp.Target.onceAttachedToTarget(); + await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); - const event = await dp.Target.onceAttachedToTarget(); + const event = await attachedPromise; const childSession = session.createChild(event.params.sessionId); testRunner.log('Worker created'); testRunner.log('didConnectToWorker');
diff --git a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-setTimeout-sourceUrl-dedicated-worker-loop.js b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-setTimeout-sourceUrl-dedicated-worker-loop.js index a067d39..8f716f7 100644 --- a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-setTimeout-sourceUrl-dedicated-worker-loop.js +++ b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-setTimeout-sourceUrl-dedicated-worker-loop.js
@@ -2,9 +2,10 @@ const {page, session, dp} = await testRunner.startBlank( 'Tests sourceURL in setTimeout from worker.'); - dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, + await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); + const attachedPromise = dp.Target.onceAttachedToTarget(); await session.evaluate(` window.worker = new Worker('${testRunner.url('resources/dedicated-worker-string-setTimeout.js')}'); window.worker.onmessage = function(event) { }; @@ -12,7 +13,7 @@ `); testRunner.log('Started worker'); - const messageObject = await dp.Target.onceAttachedToTarget(); + const messageObject = await attachedPromise; const childSession = session.createChild(messageObject.params.sessionId); testRunner.log('Worker created');
diff --git a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-step-into-dedicated-worker.js b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-step-into-dedicated-worker.js index ab6e059..6a859cd 100644 --- a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-step-into-dedicated-worker.js +++ b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-step-into-dedicated-worker.js
@@ -4,6 +4,7 @@ await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: true, flatten: true}); + const attachedPromise = dp.Target.onceAttachedToTarget(); await session.evaluate(` window.worker = new Worker('${testRunner.url('resources/dedicated-worker-step-into.js')}'); window.worker.onmessage = function(event) { }; @@ -11,7 +12,7 @@ `); testRunner.log('Started worker'); - const sessionId = (await dp.Target.onceAttachedToTarget()).params.sessionId; + const sessionId = (await attachedPromise).params.sessionId; testRunner.log('Worker created'); const childSession = session.createChild(sessionId);
diff --git a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-terminate-dedicated-worker-while-paused.js b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-terminate-dedicated-worker-while-paused.js index eda1be9..793aebdf 100644 --- a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-terminate-dedicated-worker-while-paused.js +++ b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-terminate-dedicated-worker-while-paused.js
@@ -5,13 +5,14 @@ dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); + const attachedPromise = dp.Target.onceAttachedToTarget(); await session.evaluate(` window.worker = new Worker('${testRunner.url('resources/dedicated-worker.js')}'); window.worker.onmessage = function(event) { }; window.worker.postMessage(1); `); testRunner.log('Started worker'); - const sessionId = (await dp.Target.onceAttachedToTarget()).params.sessionId; + const sessionId = (await attachedPromise).params.sessionId; const childSession = session.createChild(sessionId); testRunner.log('Worker created'); testRunner.log('didConnectToWorker');
diff --git a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-worker-pause-task-order.js b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-worker-pause-task-order.js index ea94e22..43b73e1 100644 --- a/third_party/blink/web_tests/inspector-protocol/debugger/debugger-worker-pause-task-order.js +++ b/third_party/blink/web_tests/inspector-protocol/debugger/debugger-worker-pause-task-order.js
@@ -4,6 +4,7 @@ await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: true, flatten: true}); + const attachedPromise = dp.Target.onceAttachedToTarget(); await session.evaluate(` const workerScript = \` self.count = 0; @@ -22,7 +23,7 @@ worker.postMessage(1); `); - const event = await dp.Target.onceAttachedToTarget(); + const event = await attachedPromise; const childSession = session.createChild(event.params.sessionId); testRunner.log('Worker created');
diff --git a/third_party/blink/web_tests/inspector-protocol/worker/exception-from-worker-contains-stack.js b/third_party/blink/web_tests/inspector-protocol/worker/exception-from-worker-contains-stack.js index 076ee104..7285ae7 100644 --- a/third_party/blink/web_tests/inspector-protocol/worker/exception-from-worker-contains-stack.js +++ b/third_party/blink/web_tests/inspector-protocol/worker/exception-from-worker-contains-stack.js
@@ -5,6 +5,7 @@ await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); + const attachedPromise = dp.Target.onceAttachedToTarget(); session.evaluate(` window.worker1 = new Worker('${testRunner.url('../resources/worker-with-throw.js')}'); window.worker1.onerror = function(e) { @@ -12,24 +13,27 @@ worker1.terminate(); } `); - let event = await dp.Target.onceAttachedToTarget(); + let event = await attachedPromise; const childSession = session.createChild(event.params.sessionId); testRunner.log('Worker created'); await childSession.protocol.Runtime.enable(); + const detachedPromise = dp.Target.onceDetachedFromTarget(); session.evaluate('worker1.postMessage(239);'); - await dp.Target.onceDetachedFromTarget(); + await detachedPromise; testRunner.log('Worker destroyed'); + const attachedPromise2 = dp.Target.onceAttachedToTarget(); session.evaluate(` window.worker2 = new Worker('${testRunner.url('../resources/worker-with-throw.js')}'); `); - event = await dp.Target.onceAttachedToTarget(); + event = await attachedPromise2; const childSession2 = session.createChild(event.params.sessionId); testRunner.log('\nWorker created'); await childSession2.protocol.Runtime.enable(); + const thrownPromise = childSession2.protocol.Runtime.onceExceptionThrown(); session.evaluate('worker2.postMessage(42);'); - event = await childSession2.protocol.Runtime.onceExceptionThrown(); + event = await thrownPromise; const callFrames = event.params.exceptionDetails.stackTrace ? event.params.exceptionDetails.stackTrace.callFrames : []; testRunner.log(callFrames.length > 0 ? 'Message with stack trace received.' : '[FAIL] Message contains empty stack trace');
diff --git a/third_party/blink/web_tests/inspector-protocol/worker/worker-console.js b/third_party/blink/web_tests/inspector-protocol/worker/worker-console.js index 0fb4f0f4..17fd953 100644 --- a/third_party/blink/web_tests/inspector-protocol/worker/worker-console.js +++ b/third_party/blink/web_tests/inspector-protocol/worker/worker-console.js
@@ -98,10 +98,11 @@ // an event that we're attached; which we receive below to create the // childSession instance. clientLog.push('Starting autoattach'); - dp.Target.setAutoAttach({ + const attachedPromise = dp.Target.onceAttachedToTarget(); + await dp.Target.setAutoAttach({ autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); const childSession = session.createChild( - (await dp.Target.onceAttachedToTarget()).params.sessionId); + (await attachedPromise).params.sessionId); childSession.protocol.Runtime.onConsoleAPICalled((event) => { consoleLog.push(event.params.args[0].value); }); @@ -139,13 +140,14 @@ // This time we start the worker only after Target.setAutoAttach, so // we may await the autoattach response. clientLog.push('Starting autoattach'); + const attachedPromise = dp.Target.onceAttachedToTarget(); await dp.Target.setAutoAttach({ autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); clientLog.push('Starting worker'); session.evaluate('startWorker()'); const childSession = session.createChild( - (await dp.Target.onceAttachedToTarget()).params.sessionId); + (await attachedPromise).params.sessionId); childSession.protocol.Runtime.onConsoleAPICalled((event) => { consoleLog.push(event.params.args[0].value); }); @@ -172,9 +174,10 @@ clientLog.push( '\n=== New worker, with auto-attach still enabled. ==='); clientLog.push('Starting worker'); + const attachedPromise = dp.Target.onceAttachedToTarget(); session.evaluate('startWorker()'); const childSession = session.createChild( - (await dp.Target.onceAttachedToTarget()).params.sessionId); + (await attachedPromise).params.sessionId); childSession.protocol.Runtime.onConsoleAPICalled((event) => { consoleLog.push(event.params.args[0].value); });
diff --git a/third_party/blink/web_tests/inspector-protocol/worker/worker-constructor-async-stacks.js b/third_party/blink/web_tests/inspector-protocol/worker/worker-constructor-async-stacks.js index 89c58259..13a96dfe 100644 --- a/third_party/blink/web_tests/inspector-protocol/worker/worker-constructor-async-stacks.js +++ b/third_party/blink/web_tests/inspector-protocol/worker/worker-constructor-async-stacks.js
@@ -13,6 +13,7 @@ testRunner.log('Set breakpoint before worker created'); await dp.Debugger.setBreakpointByUrl( {url: 'test.js', lineNumber: 2, columnNumber: 13}); + const attachedPromise = dp.Target.onceAttachedToTarget(); session.evaluate(` var blob = new Blob(['console.log(239);//# sourceURL=worker.js'], {type: 'application/javascript'}); var worker = new Worker(URL.createObjectURL(blob)); @@ -24,7 +25,7 @@ testRunner.log('Setup worker session'); const childSession = session.createChild( - (await dp.Target.onceAttachedToTarget()).params.sessionId); + (await attachedPromise).params.sessionId); const workerDebuggerId = (await childSession.protocol.Debugger.enable()).debuggerId;
diff --git a/third_party/blink/web_tests/inspector-protocol/worker/worker-name.js b/third_party/blink/web_tests/inspector-protocol/worker/worker-name.js index de3fceb..e184d61 100644 --- a/third_party/blink/web_tests/inspector-protocol/worker/worker-name.js +++ b/third_party/blink/web_tests/inspector-protocol/worker/worker-name.js
@@ -6,15 +6,15 @@ name: 'the name' }); `); - let workerCallback; - const workerPromise = new Promise(x => workerCallback = x); - dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, + const attachedPromise = dp.Target.onceAttachedToTarget(); + await dp.Target.setAutoAttach({autoAttach: true, waitForDebuggerOnStart: false, flatten: true}); - const {params: {sessionId, targetInfo}} = await dp.Target.onceAttachedToTarget(); + const {params: {sessionId, targetInfo}} = await attachedPromise; testRunner.log(`target title: "${targetInfo.title}"`); const childSession = session.createChild(sessionId); - childSession.protocol.Runtime.enable({}); - const event = await childSession.protocol.Runtime.onceExecutionContextCreated(); + const contextPromise = childSession.protocol.Runtime.onceExecutionContextCreated(); + await childSession.protocol.Runtime.enable({}); + const event = await contextPromise; testRunner.log(`execution context name: "${event.params.context.name}"`); testRunner.completeTest(); })
diff --git a/third_party/blink/web_tests/inspector-protocol/worker/worker-on-message-async-stacks.js b/third_party/blink/web_tests/inspector-protocol/worker/worker-on-message-async-stacks.js index c0eecc1..b28d5ab 100644 --- a/third_party/blink/web_tests/inspector-protocol/worker/worker-on-message-async-stacks.js +++ b/third_party/blink/web_tests/inspector-protocol/worker/worker-on-message-async-stacks.js
@@ -10,6 +10,7 @@ const pageDebuggerId = (await dp.Debugger.enable()).result.debuggerId; debuggers.set(pageDebuggerId, dp.Debugger); await dp.Debugger.setAsyncCallStackDepth({maxDepth: 32}); + const attachedPromise = dp.Target.onceAttachedToTarget(); session.evaluate(` var blob = new Blob(['postMessage(239);//# sourceURL=worker.js'], {type: 'application/javascript'}); var worker = new Worker(URL.createObjectURL(blob)); @@ -17,8 +18,7 @@ //# sourceURL=test.js`); testRunner.log('Setup worker session'); - const childSession = session.createChild( - (await dp.Target.onceAttachedToTarget()).params.sessionId); + const childSession = session.createChild((await attachedPromise).params.sessionId); const workerDebuggerId = (await childSession.protocol.Debugger.enable()).result.debuggerId; debuggers.set(workerDebuggerId, childSession.protocol.Debugger); @@ -29,14 +29,16 @@ {url: 'worker.js', lineNumber: 0, columnNumber: 0}); testRunner.log('Run worker'); + const pausedPromise = childSession.protocol.Debugger.oncePaused(); await childSession.protocol.Runtime.runIfWaitingForDebugger(); testRunner.log('Run stepInto with breakOnAsyncCall flag'); - await childSession.protocol.Debugger.oncePaused(); + await pausedPromise; + const pausedOnBreakPromise = dp.Debugger.oncePaused(); await childSession.protocol.Debugger.stepInto({breakOnAsyncCall: true}); - const {callFrames, asyncStackTraceId} = (await dp.Debugger.oncePaused()).params; + const {callFrames, asyncStackTraceId} = (await pausedOnBreakPromise).params; await testRunner.logStackTrace( debuggers, {callFrames, parentId: asyncStackTraceId}, pageDebuggerId); testRunner.completeTest();
diff --git a/third_party/blink/web_tests/inspector-protocol/worker/worker-post-message-async-stacks.js b/third_party/blink/web_tests/inspector-protocol/worker/worker-post-message-async-stacks.js index b9db2048..4f1dcefe 100644 --- a/third_party/blink/web_tests/inspector-protocol/worker/worker-post-message-async-stacks.js +++ b/third_party/blink/web_tests/inspector-protocol/worker/worker-post-message-async-stacks.js
@@ -13,6 +13,7 @@ testRunner.log('Set breakpoint before postMessage'); await dp.Debugger.setBreakpointByUrl( {url: 'test.js', lineNumber: 3, columnNumber: 7}); + const attachedPromise = dp.Target.onceAttachedToTarget(); session.evaluate(` var blob = new Blob(['onmessage = (e) => console.log(e.data);//# sourceURL=worker.js'], {type: 'application/javascript'}); var worker = new Worker(URL.createObjectURL(blob)); @@ -25,7 +26,7 @@ testRunner.log('Setup worker session'); const childSession = session.createChild( - (await dp.Target.onceAttachedToTarget()).params.sessionId); + (await attachedPromise).params.sessionId); const workerDebuggerId = (await childSession.protocol.Debugger.enable()).result.debuggerId;
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/comments-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/comments-expected.png deleted file mode 100644 index a90477f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/comments-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/comments-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/comments-expected.txt deleted file mode 100644 index 37d2e51..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/comments-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 921 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x921 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x921 - LayoutBlockFlow {BODY} at (8,8) size 769x905 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x240 - LayoutText {#text} at (0,0) size 336x240 - text run at (0,0) width 232: "/* This is a CSS1 comment. */" - text run at (232,0) width 0: " " - text run at (0,16) width 336: ".one {color: green;} /* Another comment */" - text run at (336,16) width 0: " " - text run at (0,32) width 288: "/* The following should not be used:" - text run at (288,32) width 0: " " - text run at (0,48) width 168: ".two {color: red;} */" - text run at (168,48) width 0: " " - text run at (0,64) width 320: ".three {color: green; /* color: red; */}" - text run at (320,64) width 0: " " - text run at (0,80) width 24: "/**" - text run at (24,80) width 0: " " - text run at (0,96) width 176: ".four {color: red;} */" - text run at (176,96) width 0: " " - text run at (0,112) width 168: ".five {color: green;}" - text run at (168,112) width 0: " " - text run at (0,128) width 32: "/**/" - text run at (32,128) width 0: " " - text run at (0,144) width 160: ".six {color: green;}" - text run at (160,144) width 0: " " - text run at (0,160) width 88: "/*********/" - text run at (88,160) width 0: " " - text run at (0,176) width 176: ".seven {color: green;}" - text run at (176,176) width 0: " " - text run at (0,192) width 128: "/* a comment **/" - text run at (128,192) width 0: " " - text run at (0,208) width 176: ".eight {color: green;}" - text run at (176,208) width 0: " " - text run at (0,224) width 0: " " - LayoutBlockFlow {P} at (0,307) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,343) size 769x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (0,379) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,415) size 769x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (0,451) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,487) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,523) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,559) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutTable {TABLE} at (0,595) size 216x310 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 214x308 - LayoutTableRow {TR} at (0,0) size 214x28 - LayoutTableCell {TD} at (0,0) size 214x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 214x280 - LayoutTableCell {TD} at (0,154) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 202x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 194x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (4,76) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,112) size 194x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (4,148) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,184) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,220) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,256) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." -layer at (8,297) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,289) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/containment-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/containment-expected.png deleted file mode 100644 index 01fff27..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/containment-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/containment-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/containment-expected.txt deleted file mode 100644 index 3e77590..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/containment-expected.txt +++ /dev/null
@@ -1,211 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1029 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1029 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1029 - LayoutBlockFlow {BODY} at (8,8) size 769x1013 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x160 - LayoutText {#text} at (0,0) size 728x160 - text run at (0,0) width 624: "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"linktest.css\" title=\"Default SS\">" - text run at (624,0) width 0: " " - text run at (0,16) width 728: "<LINK rel=\"alternate stylesheet\" type=\"text/css\" href=\"linktest2.css\" title=\"Alternate SS\">" - text run at (728,16) width 0: " " - text run at (0,32) width 208: "@import url(imptest1.css);" - text run at (208,32) width 0: " " - text run at (0,48) width 192: "@import \"imptest1a.css\";" - text run at (192,48) width 0: " " - text run at (0,64) width 128: "UL {color: red;}" - text run at (128,64) width 0: " " - text run at (0,80) width 176: ".four {color: purple;}" - text run at (176,80) width 0: " " - text run at (0,96) width 208: "@import url(imptest2.css);" - text run at (208,96) width 0: " " - text run at (0,112) width 32: "<!--" - text run at (32,112) width 0: " " - text run at (0,128) width 168: "P.six {color: green;}" - text run at (168,128) width 0: " " - text run at (0,144) width 24: "-->" - text run at (24,144) width 0: " " - LayoutBlockFlow {P} at (0,227) size 769x20 - LayoutText {#text} at (0,0) size 404x19 - text run at (0,0) width 404: "This sentence should be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (404,3) size 96x16 - text run at (404,3) width 96: "linktest.css" - LayoutText {#text} at (500,0) size 254x19 - text run at (500,0) width 254: ", the reference to which is shown above." - LayoutBlockFlow {P} at (0,263) size 769x40 - LayoutText {#text} at (0,0) size 442x19 - text run at (0,0) width 442: "This sentence should NOT be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 104x16 - LayoutText {#text} at (442,3) size 104x16 - text run at (442,3) width 104: "linktest2.css" - LayoutText {#text} at (546,0) size 8x19 - text run at (546,0) width 8: ", " - LayoutInline {STRONG} at (0,0) size 41x19 - LayoutText {#text} at (554,0) size 41x19 - text run at (554,0) width 41: "unless" - LayoutText {#text} at (595,0) size 741x39 - text run at (595,0) width 146: " the external style sheet" - text run at (0,20) width 325: "\"Alternate SS\" has been selected via the user agent." - LayoutBlockFlow {UL} at (0,319) size 769x60 [color=#FF0000] - LayoutListItem {LI} at (40,0) size 729x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 390x19 - text run at (0,0) width 390: "This sentence should be green due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 208x16 - LayoutText {#text} at (390,3) size 208x16 - text run at (390,3) width 208: "@import url(imptest1.css);" - LayoutText {#text} at (598,0) size 9x19 - text run at (598,0) width 9: "]." - LayoutListItem {LI} at (40,20) size 729x20 [color=#800080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "This sentence should be purple due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 184x16 - LayoutText {#text} at (395,3) size 184x16 - text run at (395,3) width 184: "@import \"imptest1a.css\"" - LayoutText {#text} at (579,0) size 9x19 - text run at (579,0) width 9: "]." - LayoutListItem {LI} at (40,40) size 729x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 393x19 - text run at (0,0) width 393: "This sentence should be green thanks to the STYLE attribute [" - LayoutInline {CODE} at (0,0) size 168x16 - LayoutText {#text} at (393,3) size 168x16 - text run at (393,3) width 168: "STYLE=\"color: green;\"" - LayoutText {#text} at (561,0) size 9x19 - text run at (561,0) width 9: "]." - LayoutBlockFlow {P} at (0,395) size 769x20 [color=#800080] - LayoutText {#text} at (0,0) size 500x19 - text run at (0,0) width 500: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - LayoutBlockFlow {OL} at (0,431) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 201x19 - text run at (0,0) width 201: "This list should NOT be purple." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "2" - LayoutText {#text} at (0,0) size 172x19 - text run at (0,0) width 172: "It should, instead, be black." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 501x19 - text run at (0,0) width 501: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - LayoutBlockFlow {P} at (0,507) size 769x40 - LayoutText {#text} at (0,0) size 697x19 - text run at (0,0) width 197: "This sentence should be black. " - text run at (197,0) width 500: "If it is red, then the browser has inappropriately imported the styles from the file" - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (0,23) size 96x16 - text run at (0,23) width 96: "imptest2.css" - LayoutText {#text} at (96,20) size 33x19 - text run at (96,20) width 33: " (see " - LayoutInline {A} at (0,0) size 68x19 [color=#0000FF] - LayoutText {#text} at (129,20) size 68x19 - text run at (129,20) width 68: "section 3.0" - LayoutText {#text} at (197,20) size 275x19 - text run at (197,20) width 275: " of the CSS1 specification for more details)." - LayoutBlockFlow {P} at (0,563) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This paragraph should be green." - LayoutTable {TABLE} at (0,599) size 769x414 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x412 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x384 - LayoutTableCell {TD} at (0,206) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x384 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 404x19 - text run at (0,0) width 404: "This sentence should be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (404,3) size 96x16 - text run at (404,3) width 96: "linktest.css" - LayoutText {#text} at (500,0) size 708x39 - text run at (500,0) width 208: ", the reference to which is shown" - text run at (0,20) width 42: "above." - LayoutBlockFlow {P} at (4,60) size 747x40 - LayoutText {#text} at (0,0) size 442x19 - text run at (0,0) width 442: "This sentence should NOT be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 104x16 - LayoutText {#text} at (442,3) size 104x16 - text run at (442,3) width 104: "linktest2.css" - LayoutText {#text} at (546,0) size 8x19 - text run at (546,0) width 8: ", " - LayoutInline {STRONG} at (0,0) size 41x19 - LayoutText {#text} at (554,0) size 41x19 - text run at (554,0) width 41: "unless" - LayoutText {#text} at (595,0) size 741x39 - text run at (595,0) width 146: " the external style sheet" - text run at (0,20) width 325: "\"Alternate SS\" has been selected via the user agent." - LayoutBlockFlow {UL} at (4,116) size 747x60 [color=#FF0000] - LayoutListItem {LI} at (40,0) size 707x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 390x19 - text run at (0,0) width 390: "This sentence should be green due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 208x16 - LayoutText {#text} at (390,3) size 208x16 - text run at (390,3) width 208: "@import url(imptest1.css);" - LayoutText {#text} at (598,0) size 9x19 - text run at (598,0) width 9: "]." - LayoutListItem {LI} at (40,20) size 707x20 [color=#800080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 395x19 - text run at (0,0) width 395: "This sentence should be purple due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 184x16 - LayoutText {#text} at (395,3) size 184x16 - text run at (395,3) width 184: "@import \"imptest1a.css\"" - LayoutText {#text} at (579,0) size 9x19 - text run at (579,0) width 9: "]." - LayoutListItem {LI} at (40,40) size 707x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 393x19 - text run at (0,0) width 393: "This sentence should be green thanks to the STYLE attribute [" - LayoutInline {CODE} at (0,0) size 168x16 - LayoutText {#text} at (393,3) size 168x16 - text run at (393,3) width 168: "STYLE=\"color: green;\"" - LayoutText {#text} at (561,0) size 9x19 - text run at (561,0) width 9: "]." - LayoutBlockFlow {P} at (4,192) size 747x20 [color=#800080] - LayoutText {#text} at (0,0) size 500x19 - text run at (0,0) width 500: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - LayoutBlockFlow {OL} at (4,228) size 747x60 - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 201x19 - text run at (0,0) width 201: "This list should NOT be purple." - LayoutListItem {LI} at (40,20) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "2" - LayoutText {#text} at (0,0) size 172x19 - text run at (0,0) width 172: "It should, instead, be black." - LayoutListItem {LI} at (40,40) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 501x19 - text run at (0,0) width 501: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - LayoutBlockFlow {P} at (4,304) size 747x40 - LayoutText {#text} at (0,0) size 697x19 - text run at (0,0) width 197: "This sentence should be black. " - text run at (197,0) width 500: "If it is red, then the browser has inappropriately imported the styles from the file" - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (0,23) size 96x16 - text run at (0,23) width 96: "imptest2.css" - LayoutText {#text} at (96,20) size 33x19 - text run at (96,20) width 33: " (see " - LayoutInline {A} at (0,0) size 68x19 [color=#0000FF] - LayoutText {#text} at (129,20) size 68x19 - text run at (129,20) width 68: "section 3.0" - LayoutText {#text} at (197,20) size 275x19 - text run at (197,20) width 275: " of the CSS1 specification for more details)." - LayoutBlockFlow {P} at (4,360) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This paragraph should be green." -layer at (8,217) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,209) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png deleted file mode 100644 index 97690e2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt deleted file mode 100644 index 0c57862..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt +++ /dev/null
@@ -1,83 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 472x64 - text run at (0,0) width 288: "P {color: navy; font-family: serif;}" - text run at (288,0) width 0: " " - text run at (0,16) width 472: "HTML BODY TABLE P {color: purple; font-family: sans-serif;}" - text run at (472,16) width 0: " " - text run at (0,32) width 224: "EM, UL LI LI {color: green;}" - text run at (224,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 625x19 - text run at (0,0) width 625: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - LayoutBlockFlow {P} at (0,167) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 559x19 - text run at (0,0) width 559: "This sentence should be normal for its section, except for the last word, which should be " - LayoutInline {EM} at (0,0) size 36x19 [color=#008000] - LayoutText {#text} at (559,0) size 36x19 - text run at (559,0) width 36: "green" - LayoutText {#text} at (594,0) size 5x19 - text run at (594,0) width 5: "." - LayoutBlockFlow {UL} at (0,203) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutBlockFlow (anonymous) at (0,0) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutInline {EM} at (0,0) size 39x19 [color=#008000] - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Hello." - LayoutText {#text} at (39,0) size 399x19 - text run at (39,0) width 4: " " - text run at (43,0) width 395: "The first \"hello\" should be green, but this part should be black." - LayoutBlockFlow {UL} at (0,20) size 744x20 - LayoutListItem {LI} at (40,0) size 704x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 136x19 - text run at (0,0) width 136: "This should be green." - LayoutTable {TABLE} at (0,259) size 722x165 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 720x163 - LayoutTableRow {TR} at (0,0) size 720x28 - LayoutTableCell {TD} at (0,0) size 720x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 720x135 - LayoutTableCell {TD} at (0,81) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 708x135 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 700x19 [color=#800080] - LayoutText {#text} at (0,0) size 700x18 - text run at (0,0) width 700: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - LayoutBlockFlow {P} at (4,39) size 700x20 [color=#800080] - LayoutText {#text} at (0,1) size 623x18 - text run at (0,1) width 623: "This sentence should be normal for its section, except for the last word, which should be " - LayoutInline {EM} at (0,0) size 41x19 [color=#008000] - LayoutText {#text} at (623,0) size 41x19 - text run at (623,0) width 41: "green" - LayoutText {#text} at (664,1) size 4x18 - text run at (664,1) width 4: "." - LayoutBlockFlow {UL} at (4,75) size 700x40 - LayoutListItem {LI} at (40,0) size 660x40 - LayoutBlockFlow (anonymous) at (0,0) size 660x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutInline {EM} at (0,0) size 39x19 [color=#008000] - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Hello." - LayoutText {#text} at (39,0) size 399x19 - text run at (39,0) width 4: " " - text run at (43,0) width 395: "The first \"hello\" should be green, but this part should be black." - LayoutBlockFlow {UL} at (0,20) size 660x20 - LayoutListItem {LI} at (40,0) size 620x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 136x19 - text run at (0,0) width 136: "This should be green." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/grouping-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/grouping-expected.png deleted file mode 100644 index 13d7815..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/grouping-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/grouping-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/grouping-expected.txt deleted file mode 100644 index 2b6ca6d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/grouping-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 272x32 - text run at (0,0) width 272: ".one, .two, .three {color: green;}" - text run at (272,0) width 0: " " - text run at (0,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,135) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,171) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutTable {TABLE} at (0,207) size 216x130 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 214x128 - LayoutTableRow {TR} at (0,0) size 214x28 - LayoutTableCell {TD} at (0,0) size 214x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 214x100 - LayoutTableCell {TD} at (0,64) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 202x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,76) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/id_as_selector-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/id_as_selector-expected.png deleted file mode 100644 index 967b12a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/id_as_selector-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt deleted file mode 100644 index 05ba2d1..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt +++ /dev/null
@@ -1,93 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 659 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x659 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x659 - LayoutBlockFlow {BODY} at (8,8) size 769x643 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x128 - LayoutText {#text} at (0,0) size 272x128 - text run at (0,0) width 160: "#one {color: green;}" - text run at (160,0) width 0: " " - text run at (0,16) width 152: "#a1 {color: green;}" - text run at (152,16) width 0: " " - text run at (0,32) width 224: "P#two, P#two2 {color: blue;}" - text run at (224,32) width 0: " " - text run at (0,48) width 272: "P#three, P#three2 {color: purple;}" - text run at (272,48) width 0: " " - text run at (0,64) width 168: "#four {color: green;}" - text run at (168,64) width 0: " " - text run at (0,80) width 152: "#a2 {color: green;}" - text run at (152,80) width 0: " " - text run at (0,96) width 240: "P#five, P#five2 {color: blue;}" - text run at (240,96) width 0: " " - text run at (0,112) width 240: "P#six, P#six2 {color: purple;}" - LayoutBlockFlow {P} at (0,195) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,231) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,267) size 769x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 200x19 - text run at (0,0) width 200: "This paragraph should be blue [" - LayoutInline {TT} at (0,0) size 64x16 - LayoutText {#text} at (200,3) size 64x16 - text run at (200,3) width 64: "ID=\"two\"" - LayoutText {#text} at (264,0) size 9x19 - text run at (264,0) width 9: "]." - LayoutBlockFlow {PRE} at (0,303) size 769x16 - LayoutText {#text} at (0,0) size 392x16 - text run at (0,0) width 392: "This sentence should NOT be blue [PRE ID=\"two2\"]." - text run at (392,0) width 0: " " - LayoutBlockFlow {PRE} at (0,332) size 769x16 - LayoutText {#text} at (0,0) size 472x16 - text run at (0,0) width 472: "This sentence should be black, not purple [PRE ID=\"three\"]." - text run at (472,0) width 0: " " - LayoutBlockFlow {UL} at (0,364) size 769x20 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 237x19 - text run at (0,0) width 237: "This sentence should NOT be purple." - LayoutTable {TABLE} at (0,400) size 422x243 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 420x241 - LayoutTableRow {TR} at (0,0) size 420x28 - LayoutTableCell {TD} at (0,0) size 420x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 420x213 - LayoutTableCell {TD} at (0,120) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 408x213 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 400x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 400x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,76) size 400x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 200x19 - text run at (0,0) width 200: "This paragraph should be blue [" - LayoutInline {TT} at (0,0) size 72x16 - LayoutText {#text} at (200,3) size 72x16 - text run at (200,3) width 72: "ID=\"five\"" - LayoutText {#text} at (272,0) size 9x19 - text run at (272,0) width 9: "]." - LayoutBlockFlow {PRE} at (4,112) size 400x16 - LayoutText {#text} at (0,0) size 400x16 - text run at (0,0) width 400: "This sentence should NOT be blue [PRE ID=\"five2\"]." - text run at (400,0) width 0: " " - LayoutBlockFlow {PRE} at (4,141) size 400x16 - LayoutText {#text} at (0,0) size 360x16 - text run at (0,0) width 360: "This sentence should be black [PRE ID=\"six\"]." - text run at (360,0) width 0: " " - LayoutBlockFlow {UL} at (4,173) size 400x20 - LayoutListItem {LI} at (40,0) size 360x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 237x19 - text run at (0,0) width 237: "This sentence should NOT be purple." -layer at (8,185) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,177) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/inheritance-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/inheritance-expected.png deleted file mode 100644 index f699062..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/inheritance-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/inheritance-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/inheritance-expected.txt deleted file mode 100644 index 385205e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/basic/inheritance-expected.txt +++ /dev/null
@@ -1,190 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 768 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x768 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x767.59 - LayoutBlockFlow {BODY} at (8,8) size 784x751.59 [color=#008000] [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x112 - LayoutText {#text} at (0,0) size 272x112 - text run at (0,0) width 160: "BODY {color: green;}" - text run at (160,0) width 0: " " - text run at (0,16) width 136: "H3 {color: blue;}" - text run at (136,16) width 0: " " - text run at (0,32) width 152: "EM {color: purple;}" - text run at (152,32) width 0: " " - text run at (0,48) width 208: ".one {font-style: italic;}" - text run at (208,48) width 0: " " - text run at (0,64) width 272: ".two {text-decoration: underline;}" - text run at (272,64) width 0: " " - text run at (0,80) width 152: "#two {color: navy;}" - text run at (152,80) width 0: " " - text run at (0,96) width 184: ".three {color: purple;}" - text run at (184,96) width 0: " " - LayoutBlockFlow {H3} at (0,181.72) size 784x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 220x22 - text run at (0,0) width 220: "This sentence should show " - LayoutInline {STRONG} at (0,0) size 35x22 - LayoutText {#text} at (220,0) size 35x22 - text run at (220,0) width 35: "blue" - LayoutText {#text} at (255,0) size 42x22 - text run at (255,0) width 42: " and " - LayoutInline {EM} at (0,0) size 51x22 [color=#800080] - LayoutText {#text} at (297,1) size 51x22 - text run at (297,1) width 51: "purple" - LayoutText {#text} at (348,0) size 5x22 - text run at (348,0) width 5: "." - LayoutBlockFlow {H3} at (0,224.44) size 784x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 197x22 - text run at (0,0) width 197: "This sentence should be " - LayoutInline {SPAN} at (0,0) size 34x22 - LayoutText {#text} at (197,1) size 34x22 - text run at (197,1) width 34: "blue" - LayoutText {#text} at (231,0) size 104x22 - text run at (231,0) width 104: " throughout." - LayoutBlockFlow {P} at (0,267.16) size 784x20 - LayoutText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This should be green except for the " - LayoutInline {EM} at (0,0) size 117x19 [color=#800080] - LayoutText {#text} at (226,0) size 117x19 - text run at (226,0) width 117: "emphasized words" - LayoutText {#text} at (342,0) size 161x19 - text run at (342,0) width 161: ", which should be purple." - LayoutBlockFlow {H3} at (0,305.88) size 784x23 [color=#0000FF] - LayoutText {#text} at (0,0) size 296x22 - text run at (0,0) width 296: "This should be blue and underlined." - LayoutBlockFlow {P} at (0,347.59) size 784x20 - LayoutText {#text} at (0,0) size 293x19 - text run at (0,0) width 293: "This sentence should be underlined, including " - LayoutInline {TT} at (0,0) size 72x16 - LayoutText {#text} at (293,3) size 72x16 - text run at (293,3) width 72: "this part" - LayoutText {#text} at (365,0) size 8x19 - text run at (365,0) width 8: ", " - LayoutInline {I} at (0,0) size 52x19 - LayoutText {#text} at (373,0) size 52x19 - text run at (373,0) width 52: "this part" - LayoutText {#text} at (425,0) size 8x19 - text run at (425,0) width 8: ", " - LayoutInline {EM} at (0,0) size 52x19 [color=#800080] - LayoutText {#text} at (433,0) size 52x19 - text run at (433,0) width 52: "this part" - LayoutText {#text} at (485,0) size 35x19 - text run at (485,0) width 35: ", and " - LayoutInline {STRONG} at (0,0) size 57x19 - LayoutText {#text} at (520,0) size 57x19 - text run at (520,0) width 57: "this part" - LayoutText {#text} at (577,0) size 4x19 - text run at (577,0) width 4: "." - LayoutBlockFlow {P} at (0,383.59) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 436x19 - text run at (0,0) width 436: "This sentence should also be underlined, as well as dark blue (navy), " - LayoutInline {TT} at (0,0) size 152x16 - LayoutText {#text} at (436,3) size 152x16 - text run at (436,3) width 152: "including this part" - LayoutText {#text} at (588,0) size 4x19 - text run at (588,0) width 4: "." - LayoutBlockFlow {P} at (0,419.59) size 784x20 [color=#800080] - LayoutText {#text} at (0,0) size 266x19 - text run at (0,0) width 266: "This sentence should be purple, including " - LayoutInline {STRONG} at (0,0) size 57x19 - LayoutText {#text} at (266,0) size 57x19 - text run at (266,0) width 57: "this part" - LayoutText {#text} at (323,0) size 31x19 - text run at (323,0) width 31: " and " - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (354,0) size 173x19 - text run at (354,0) width 173: "this part (which is spanned)" - LayoutText {#text} at (527,0) size 4x19 - text run at (527,0) width 4: "." - LayoutTable {TABLE} at (0,455.59) size 614x296 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 612x294 - LayoutTableRow {TR} at (0,0) size 612x28 - LayoutTableCell {TD} at (0,0) size 612x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 612x266 - LayoutTableCell {TD} at (0,147) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 600x265.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {H3} at (4,4) size 592x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 220x22 - text run at (0,0) width 220: "This sentence should show " - LayoutInline {STRONG} at (0,0) size 35x22 - LayoutText {#text} at (220,0) size 35x22 - text run at (220,0) width 35: "blue" - LayoutText {#text} at (255,0) size 42x22 - text run at (255,0) width 42: " and " - LayoutInline {EM} at (0,0) size 51x22 [color=#800080] - LayoutText {#text} at (297,1) size 51x22 - text run at (297,1) width 51: "purple" - LayoutText {#text} at (348,0) size 5x22 - text run at (348,0) width 5: "." - LayoutBlockFlow {H3} at (4,46.72) size 592x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 197x22 - text run at (0,0) width 197: "This sentence should be " - LayoutInline {SPAN} at (0,0) size 34x22 - LayoutText {#text} at (197,1) size 34x22 - text run at (197,1) width 34: "blue" - LayoutText {#text} at (231,0) size 104x22 - text run at (231,0) width 104: " throughout." - LayoutBlockFlow {P} at (4,89.44) size 592x20 - LayoutText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This should be green except for the " - LayoutInline {EM} at (0,0) size 117x19 [color=#800080] - LayoutText {#text} at (226,0) size 117x19 - text run at (226,0) width 117: "emphasized words" - LayoutText {#text} at (342,0) size 161x19 - text run at (342,0) width 161: ", which should be purple." - LayoutBlockFlow {H3} at (4,128.16) size 592x23 [color=#0000FF] - LayoutText {#text} at (0,0) size 296x22 - text run at (0,0) width 296: "This should be blue and underlined." - LayoutBlockFlow {P} at (4,169.88) size 592x20 - LayoutText {#text} at (0,0) size 293x19 - text run at (0,0) width 293: "This sentence should be underlined, including " - LayoutInline {TT} at (0,0) size 72x16 - LayoutText {#text} at (293,3) size 72x16 - text run at (293,3) width 72: "this part" - LayoutText {#text} at (365,0) size 8x19 - text run at (365,0) width 8: ", " - LayoutInline {I} at (0,0) size 52x19 - LayoutText {#text} at (373,0) size 52x19 - text run at (373,0) width 52: "this part" - LayoutText {#text} at (425,0) size 8x19 - text run at (425,0) width 8: ", " - LayoutInline {EM} at (0,0) size 52x19 [color=#800080] - LayoutText {#text} at (433,0) size 52x19 - text run at (433,0) width 52: "this part" - LayoutText {#text} at (485,0) size 35x19 - text run at (485,0) width 35: ", and " - LayoutInline {STRONG} at (0,0) size 57x19 - LayoutText {#text} at (520,0) size 57x19 - text run at (520,0) width 57: "this part" - LayoutText {#text} at (577,0) size 4x19 - text run at (577,0) width 4: "." - LayoutBlockFlow {P} at (4,205.88) size 592x20 [color=#000080] - LayoutText {#text} at (0,0) size 436x19 - text run at (0,0) width 436: "This sentence should also be underlined, as well as dark blue (navy), " - LayoutInline {TT} at (0,0) size 152x16 - LayoutText {#text} at (436,3) size 152x16 - text run at (436,3) width 152: "including this part" - LayoutText {#text} at (588,0) size 4x19 - text run at (588,0) width 4: "." - LayoutBlockFlow {P} at (4,241.88) size 592x20 [color=#800080] - LayoutText {#text} at (0,0) size 266x19 - text run at (0,0) width 266: "This sentence should be purple, including " - LayoutInline {STRONG} at (0,0) size 57x19 - LayoutText {#text} at (266,0) size 57x19 - text run at (266,0) width 57: "this part" - LayoutText {#text} at (323,0) size 31x19 - text run at (323,0) width 31: " and " - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (354,0) size 173x19 - text run at (354,0) width 173: "this part (which is spanned)" - LayoutText {#text} at (527,0) size 4x19 - text run at (527,0) width 4: "." -layer at (8,169) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/acid_test-expected.png deleted file mode 100644 index a4c5de28..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/acid_test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border-expected.png deleted file mode 100644 index 72a9bb5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border-expected.txt deleted file mode 100644 index 088e98e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border-expected.txt +++ /dev/null
@@ -1,187 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1475 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1475 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1475 - LayoutBlockFlow {BODY} at (8,8) size 769x1459 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 272x144 - text run at (0,0) width 272: ".one {border: medium black solid;}" - text run at (272,0) width 0: " " - text run at (0,16) width 264: ".two {border: thin maroon ridge;}" - text run at (264,16) width 0: " " - text run at (0,32) width 272: ".three {border: 10px teal outset;}" - text run at (272,32) width 0: " " - text run at (0,48) width 264: ".four {border: 10px olive inset;}" - text run at (264,48) width 0: " " - text run at (0,64) width 224: ".five {border: 10px maroon;}" - text run at (224,64) width 0: " " - text run at (0,80) width 232: ".six {border: maroon double;}" - text run at (232,80) width 0: " " - text run at (0,96) width 256: ".seven {border: left red solid;}" - text run at (256,96) width 0: " " - text run at (0,112) width 168: ".eight {border: 0px;}" - text run at (168,112) width 0: " " - text run at (0,128) width 232: "TD {border: 2px solid green;}" - text run at (232,128) width 0: " " - LayoutBlockFlow {P} at (0,211) size 769x40 - LayoutText {#text} at (0,0) size 748x39 - text run at (0,0) width 627: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (627,0) width 121: "This border applies" - text run at (0,20) width 317: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,267) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 483x19 - text run at (3,3) width 483: "This paragraph should have a medium black solid border all the way around." - LayoutBlockFlow {P} at (0,309) size 769x22 [border: (1px ridge #800000)] - LayoutText {#text} at (1,1) size 480x19 - text run at (1,1) width 480: "This paragraph should have a thin maroon ridged border all the way around." - LayoutBlockFlow {P} at (0,347) size 769x40 [border: (10px outset #008080)] - LayoutText {#text} at (10,10) size 518x19 - text run at (10,10) width 518: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - LayoutBlockFlow {P} at (0,403) size 769x40 [border: (10px inset #808000)] - LayoutText {#text} at (10,10) size 519x19 - text run at (10,10) width 519: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - LayoutBlockFlow {P} at (0,459) size 769x20 - LayoutText {#text} at (0,0) size 348x19 - text run at (0,0) width 348: "This paragraph should have no border around it, as the " - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (348,3) size 96x16 - text run at (348,3) width 96: "border-style" - LayoutText {#text} at (444,0) size 322x19 - text run at (444,0) width 322: " was not set, and it should not be offset in any way." - LayoutBlockFlow {P} at (0,495) size 769x46 [border: (3px double #800000)] - LayoutText {#text} at (3,3) size 535x19 - text run at (3,3) width 535: "This paragraph should have a medium maroon double border around it, even though " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (538,6) size 96x16 - text run at (538,6) width 96: "border-width" - LayoutText {#text} at (634,3) size 746x39 - text run at (634,3) width 115: " was not explicitly" - text run at (3,23) width 21: "set." - LayoutBlockFlow {P} at (0,557) size 769x20 - LayoutText {#text} at (0,0) size 621x19 - text run at (0,0) width 621: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - LayoutBlockFlow {P} at (0,593) size 769x20 - LayoutInline {A} at (0,0) size 25x19 - LayoutText {#text} at (0,0) size 25x19 - text run at (0,0) width 25: "The" - LayoutText {#text} at (25,0) size 715x19 - text run at (25,0) width 715: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " - LayoutInline {A} at (0,0) size 16x19 [color=#0000FF] - LayoutImage {IMG} at (739.70,0) size 15x15 - LayoutText {#text} at (754,0) size 5x19 - text run at (754,0) width 5: "." - LayoutTable {TABLE} at (0,629) size 769x121 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x119 - LayoutTableRow {TR} at (0,5) size 767x46 - LayoutTableCell {TD} at (5,5) size 757x46 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,3) size 711x39 - text run at (3,3) width 405: "Every cell in this table should have a 2-pixel solid green border. " - text run at (407,3) width 307: "This is also true of the table-testing section in the" - text run at (3,23) width 175: "second half of the test page." - LayoutTableRow {TR} at (0,56) size 767x58 - LayoutTableCell {TD} at (5,72) size 194x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 53x19 - text run at (3,3) width 53: "Cell one" - LayoutTableCell {TD} at (204,56) size 558x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,3) size 552x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (3,23) size 163x32 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 161x30 - LayoutTableRow {TR} at (0,2) size 161x26 - LayoutTableCell {TD} at (2,2) size 157x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 151x19 - text run at (3,3) width 151: "Nested single-cell table!" - LayoutBlockFlow {P} at (0,766) size 769x20 - LayoutText {#text} at (0,0) size 175x19 - text run at (0,0) width 175: "This is an unstyled element." - LayoutTable {TABLE} at (0,802) size 769x657 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x655 - LayoutTableRow {TR} at (0,0) size 767x30 - LayoutTableCell {TD} at (0,0) size 767x30 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (5,5) size 161x19 - text run at (5,5) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,30) size 767x625 - LayoutTableCell {TD} at (0,327) size 14x30 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (5,5) size 4x19 - text run at (5,5) width 4: " " - LayoutTableCell {TD} at (14,30) size 753x625 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (5,5) size 743x40 - LayoutText {#text} at (0,0) size 700x39 - text run at (0,0) width 627: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (627,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (5,61) size 743x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 483x19 - text run at (3,3) width 483: "This paragraph should have a medium black solid border all the way around." - LayoutBlockFlow {P} at (5,103) size 743x22 [border: (1px ridge #800000)] - LayoutText {#text} at (1,1) size 480x19 - text run at (1,1) width 480: "This paragraph should have a thin maroon ridged border all the way around." - LayoutBlockFlow {P} at (5,141) size 743x40 [border: (10px outset #008080)] - LayoutText {#text} at (10,10) size 518x19 - text run at (10,10) width 518: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - LayoutBlockFlow {P} at (5,197) size 743x40 [border: (10px inset #808000)] - LayoutText {#text} at (10,10) size 519x19 - text run at (10,10) width 519: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - LayoutBlockFlow {P} at (5,253) size 743x40 - LayoutText {#text} at (0,0) size 348x19 - text run at (0,0) width 348: "This paragraph should have no border around it, as the " - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (348,3) size 96x16 - text run at (348,3) width 96: "border-style" - LayoutText {#text} at (444,0) size 732x39 - text run at (444,0) width 288: " was not set, and it should not be offset in any" - text run at (0,20) width 30: "way." - LayoutBlockFlow {P} at (5,309) size 743x46 [border: (3px double #800000)] - LayoutText {#text} at (3,3) size 535x19 - text run at (3,3) width 535: "This paragraph should have a medium maroon double border around it, even though " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (538,6) size 96x16 - text run at (538,6) width 96: "border-width" - LayoutText {#text} at (634,3) size 684x39 - text run at (634,3) width 53: " was not" - text run at (3,23) width 83: "explicitly set." - LayoutBlockFlow {P} at (5,371) size 743x20 - LayoutText {#text} at (0,0) size 621x19 - text run at (0,0) width 621: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - LayoutBlockFlow {P} at (5,407) size 743x40 - LayoutInline {A} at (0,0) size 25x19 - LayoutText {#text} at (0,0) size 25x19 - text run at (0,0) width 25: "The" - LayoutText {#text} at (25,0) size 715x19 - text run at (25,0) width 715: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " - LayoutInline {A} at (0,0) size 15x19 [color=#0000FF] - LayoutImage {IMG} at (0,20) size 15x15 - LayoutText {#text} at (15,20) size 4x19 - text run at (15,20) width 4: "." - LayoutTable {TABLE} at (5,463) size 743x121 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 741x119 - LayoutTableRow {TR} at (0,5) size 741x46 - LayoutTableCell {TD} at (5,5) size 731x46 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,3) size 711x39 - text run at (3,3) width 405: "Every cell in this table should have a 2-pixel solid green border. " - text run at (407,3) width 307: "This is also true of the table-testing section in the" - text run at (3,23) width 175: "second half of the test page." - LayoutTableRow {TR} at (0,56) size 741x58 - LayoutTableCell {TD} at (5,72) size 187x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 53x19 - text run at (3,3) width 53: "Cell one" - LayoutTableCell {TD} at (197,56) size 539x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,3) size 533x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (3,23) size 163x32 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 161x30 - LayoutTableRow {TR} at (0,2) size 161x26 - LayoutTableCell {TD} at (2,2) size 157x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 151x19 - text run at (3,3) width 151: "Nested single-cell table!" - LayoutBlockFlow {P} at (5,600) size 743x20 - LayoutText {#text} at (0,0) size 175x19 - text run at (0,0) width 175: "This is an unstyled element." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png deleted file mode 100644 index d27a587..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt deleted file mode 100644 index e44fb27..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt +++ /dev/null
@@ -1,164 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1063 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1063 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1063 - LayoutBlockFlow {BODY} at (8,8) size 769x1047 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 344x64 - text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" - text run at (328,0) width 0: " " - text run at (0,16) width 320: ".two {border-bottom: purple thin solid;}" - text run at (320,16) width 0: " " - text run at (0,32) width 344: ".three {border-bottom: black medium solid;}" - text run at (344,32) width 0: " " - text run at (0,48) width 288: "TD {border-bottom: green 2px solid;}" - text run at (288,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x40 - LayoutText {#text} at (0,0) size 731x39 - text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (658,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,187) size 769x30 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "This paragraph should have a purple, double, 10-pixel bottom border." - LayoutBlockFlow {P} at (0,233) size 769x21 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "This paragraph should have a thin purple bottom border." - LayoutTable {TABLE} at (0,270) size 769x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x116 - LayoutTableRow {TR} at (0,5) size 767x45 - LayoutTableCell {TD} at (5,5) size 757x45 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 736x39 - text run at (2,2) width 453: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (454,2) width 284: "This is also true of the table-testing section in" - text run at (2,22) width 198: "the second half of the test page." - LayoutTableRow {TR} at (0,55) size 767x56 - LayoutTableCell {TD} at (5,70) size 192x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 53x19 - text run at (2,2) width 53: "Cell one" - LayoutTableCell {TD} at (202,55) size 560x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 556x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (2,22) size 161x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 159x29 - LayoutTableRow {TR} at (0,2) size 159x25 - LayoutTableCell {TD} at (2,2) size 155x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 151x19 - text run at (2,2) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,404) size 769x149 - LayoutListItem {LI} at (40,0) size 729x83 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 729x60 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 729x23 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 158x19 - text run at (0,0) width 158: "This is a second list item." - LayoutListItem {LI} at (40,106) size 729x43 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 722x39 - text run at (0,0) width 722: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means that" - text run at (0,20) width 104: "it should appear " - LayoutInline {EM} at (0,0) size 50x19 - LayoutText {#text} at (104,20) size 50x19 - text run at (104,20) width 50: "beneath" - LayoutText {#text} at (154,20) size 390x19 - text run at (154,20) width 390: " the nested list (below the line \"...nested within the list item.\")." - LayoutTable {TABLE} at (0,569) size 769x478 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x476 - LayoutTableRow {TR} at (0,0) size 767x29 - LayoutTableCell {TD} at (0,0) size 767x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,29) size 767x447 - LayoutTableCell {TD} at (0,238) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,29) size 755x447 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 731x39 - text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (658,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,60) size 747x30 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 438x19 - text run at (0,0) width 438: "This paragraph should have a purple, double, 10-pixel bottom border." - LayoutBlockFlow {P} at (4,106) size 747x21 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "This paragraph should have a thin purple bottom border." - LayoutTable {TABLE} at (4,143) size 747x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 745x116 - LayoutTableRow {TR} at (0,5) size 745x45 - LayoutTableCell {TD} at (5,5) size 735x45 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 720x39 - text run at (2,2) width 453: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (454,2) width 268: "This is also true of the table-testing section" - text run at (2,22) width 214: "in the second half of the test page." - LayoutTableRow {TR} at (0,55) size 745x56 - LayoutTableCell {TD} at (5,70) size 186x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 53x19 - text run at (2,2) width 53: "Cell one" - LayoutTableCell {TD} at (196,55) size 544x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 540x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (2,22) size 161x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 159x29 - LayoutTableRow {TR} at (0,2) size 159x25 - LayoutTableCell {TD} at (2,2) size 155x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 151x19 - text run at (2,2) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,277) size 747x149 - LayoutListItem {LI} at (40,0) size 707x83 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 707x60 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 707x23 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 158x19 - text run at (0,0) width 158: "This is a second list item." - LayoutListItem {LI} at (40,106) size 707x43 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 695x39 - text run at (0,0) width 695: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means" - text run at (0,20) width 131: "that it should appear " - LayoutInline {EM} at (0,0) size 50x19 - LayoutText {#text} at (131,20) size 50x19 - text run at (131,20) width 50: "beneath" - LayoutText {#text} at (181,20) size 390x19 - text run at (181,20) width 390: " the nested list (below the line \"...nested within the list item.\")." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png deleted file mode 100644 index 3bc2598..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt deleted file mode 100644 index 46324cd2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 328x48 - text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" - text run at (328,0) width 0: " " - text run at (0,16) width 320: ".two {border-bottom: purple thin solid;}" - text run at (320,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 666x19 - text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 58x29 [border: none (10px double #800080) none] - LayoutText {#text} at (665,0) size 58x19 - text run at (665,0) width 58: "class one" - LayoutText {#text} at (722,0) size 770x39 - text run at (722,0) width 48: ", which" - text run at (0,20) width 362: "should have a 10-pixel purple double bottom border; and " - LayoutInline {SPAN} at (0,0) size 58x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (362,20) size 58x19 - text run at (362,20) width 58: "class two" - LayoutText {#text} at (420,20) size 761x39 - text run at (420,20) width 341: ", which should have a thin solid purple bottom border." - text run at (0,40) width 429: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 666x19 - text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 58x29 [border: none (10px double #800080) none] - LayoutText {#text} at (665,0) size 58x19 - text run at (665,0) width 58: "class one" - LayoutText {#text} at (722,0) size 727x39 - text run at (722,0) width 5: "," - text run at (0,20) width 405: "which should have a 10-pixel purple double bottom border; and " - LayoutInline {SPAN} at (0,0) size 58x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (405,20) size 58x19 - text run at (405,20) width 58: "class two" - LayoutText {#text} at (463,20) size 755x39 - text run at (463,20) width 292: ", which should have a thin solid purple bottom" - text run at (0,40) width 49: "border. " - text run at (48,40) width 430: "The line-height of the parent element should not change on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png deleted file mode 100644 index 26248fd0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt deleted file mode 100644 index 46eecd0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt +++ /dev/null
@@ -1,104 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 919 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x919 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x919 - LayoutBlockFlow {BODY} at (8,8) size 769x903 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 464x96 - text run at (0,0) width 456: ".zero {background-color: silver; border-bottom-width: 0;}" - text run at (456,0) width 0: " " - text run at (0,16) width 432: ".one {border-bottom-width: 50px; border-style: solid;}" - text run at (432,16) width 0: " " - text run at (0,32) width 440: ".two {border-bottom-width: thick; border-style: solid;}" - text run at (440,32) width 0: " " - text run at (0,48) width 464: ".three {border-bottom-width: medium; border-style: solid;}" - text run at (464,48) width 0: " " - text run at (0,64) width 440: ".four {border-bottom-width: thin; border-style: solid;}" - text run at (440,64) width 0: " " - text run at (0,80) width 272: ".five {border-bottom-width: 25px;}" - text run at (272,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x73 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 387x19 - text run at (3,3) width 387: "This element should have a bottom border width of 50 pixels." - LayoutBlockFlow {P} at (0,324) size 769x28 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 344x19 - text run at (3,3) width 344: "This element should have a thick bottom border width." - LayoutBlockFlow {P} at (0,368) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 364x19 - text run at (3,3) width 364: "This element should have a medium bottom border width." - LayoutBlockFlow {P} at (0,410) size 769x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This element should have a thin bottom border width." - LayoutBlockFlow {P} at (0,450) size 769x20 - LayoutText {#text} at (0,0) size 537x19 - text run at (0,0) width 537: "This element should have no border and no extra \"padding\" on its bottom side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (537,3) size 96x16 - text run at (537,3) width 96: "border-style" - LayoutText {#text} at (633,0) size 54x19 - text run at (633,0) width 54: " was set." - LayoutBlockFlow {P} at (0,486) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutTable {TABLE} at (0,522) size 709x381 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 707x379 - LayoutTableRow {TR} at (0,0) size 707x28 - LayoutTableCell {TD} at (0,0) size 707x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 707x351 - LayoutTableCell {TD} at (0,189) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 695x351 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 687x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 687x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 687x73 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 387x19 - text run at (3,3) width 387: "This element should have a bottom border width of 50 pixels." - LayoutBlockFlow {P} at (4,165) size 687x28 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 344x19 - text run at (3,3) width 344: "This element should have a thick bottom border width." - LayoutBlockFlow {P} at (4,209) size 687x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 364x19 - text run at (3,3) width 364: "This element should have a medium bottom border width." - LayoutBlockFlow {P} at (4,251) size 687x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This element should have a thin bottom border width." - LayoutBlockFlow {P} at (4,291) size 687x20 - LayoutText {#text} at (0,0) size 537x19 - text run at (0,0) width 537: "This element should have no border and no extra \"padding\" on its bottom side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (537,3) size 96x16 - text run at (537,3) width 96: "border-style" - LayoutText {#text} at (633,0) size 54x19 - text run at (633,0) width 54: " was set." - LayoutBlockFlow {P} at (4,327) size 687x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png deleted file mode 100644 index 4e61d83e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt deleted file mode 100644 index aaa790c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt +++ /dev/null
@@ -1,88 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 432x48 - text run at (0,0) width 432: ".one {border-bottom-width: 25px; border-style: solid;}" - text run at (432,0) width 0: " " - text run at (0,16) width 432: ".two {border-bottom-width: thin; border-style: solid;}" - text run at (432,16) width 0: " " - text run at (0,32) width 280: ".three {border-bottom-width: 25px;}" - text run at (280,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x108 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 172x19 - text run at (3,3) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (175,6) size 24x16 - text run at (175,6) width 24: "one" - LayoutText {#text} at (199,3) size 162x19 - text run at (199,3) width 8: ". " - text run at (207,3) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 174x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (363,3) size 144x19 - text run at (363,3) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (506,6) size 25x16 - text run at (506,6) width 25: "two" - LayoutText {#text} at (533,3) size 767x59 - text run at (533,3) width 221: ", which should result in a thin solid" - text run at (3,23) width 716: "border on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (719,23) width 51: "There is" - text run at (3,43) width 48: "also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (51,43) size 143x19 - text run at (51,43) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (194,46) size 40x16 - text run at (194,46) width 40: "three" - LayoutText {#text} at (234,43) size 770x39 - text run at (234,43) width 539: ", which should have no bottom border width or visible border because no border style" - text run at (3,63) width 50: "was set." - LayoutTable {TABLE} at (0,239) size 784x146 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x144 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x116 - LayoutTableCell {TD} at (0,72) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x116 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x108 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 172x19 - text run at (3,3) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (175,6) size 24x16 - text run at (175,6) width 24: "one" - LayoutText {#text} at (199,3) size 162x19 - text run at (199,3) width 8: ". " - text run at (207,3) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 174x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (363,3) size 144x19 - text run at (363,3) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (506,6) size 25x16 - text run at (506,6) width 25: "two" - LayoutText {#text} at (533,3) size 753x59 - text run at (533,3) width 221: ", which should result in a thin solid" - text run at (3,23) width 716: "border on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (719,23) width 37: "There" - text run at (3,43) width 62: "is also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (65,43) size 143x19 - text run at (65,43) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (208,46) size 40x16 - text run at (208,46) width 40: "three" - LayoutText {#text} at (248,43) size 751x39 - text run at (248,43) width 506: ", which should have no bottom border width or visible border because no border" - text run at (3,63) width 83: "style was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color-expected.png deleted file mode 100644 index bdfef32a1..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color-expected.txt deleted file mode 100644 index 0a59aac0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 728x48 - text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" - text run at (392,0) width 0: " " - text run at (0,16) width 568: ".two {border-color: purple; border-width: medium; border-style: solid;}" - text run at (568,16) width 0: " " - text run at (0,32) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - text run at (728,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 357x19 - text run at (3,3) width 357: "This element should have a purple border surrounding it." - LayoutBlockFlow {P} at (0,157) size 784x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 453x19 - text run at (3,3) width 453: "This element should have a medium-width purple border surrounding it." - LayoutBlockFlow {P} at (0,199) size 784x46 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (3,3) size 763x39 - text run at (3,3) width 763: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the" - text run at (3,23) width 222: "bottom, and yellow on the left side." - LayoutTable {TABLE} at (0,261) size 784x168 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x166 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x138 - LayoutTableCell {TD} at (0,83) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x138 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 357x19 - text run at (3,3) width 357: "This element should have a purple border surrounding it." - LayoutBlockFlow {P} at (4,46) size 762x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 453x19 - text run at (3,3) width 453: "This element should have a medium-width purple border surrounding it." - LayoutBlockFlow {P} at (4,88) size 762x46 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (3,3) size 740x39 - text run at (3,3) width 740: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on" - text run at (3,23) width 245: "the bottom, and yellow on the left side." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png deleted file mode 100644 index c1275a3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt deleted file mode 100644 index 28bc9a3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt +++ /dev/null
@@ -1,75 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 728x48 - text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" - text run at (392,0) width 0: " " - text run at (0,16) width 568: ".two {border-color: purple; border-width: medium; border-style: solid;}" - text run at (568,16) width 0: " " - text run at (0,32) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - text run at (728,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x80 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 677x19 - text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 64x25 [border: (3px solid #800080)] - LayoutText {#text} at (679,0) size 58x19 - text run at (679,0) width 58: "class one" - LayoutText {#text} at (739,0) size 9x19 - text run at (739,0) width 9: ", " - LayoutInline {SPAN} at (0,0) size 781x45 [border: (3px solid #800080)] - LayoutText {#text} at (750,0) size 781x39 - text run at (750,0) width 31: "class" - text run at (0,20) width 24: "two" - LayoutText {#text} at (27,20) size 35x19 - text run at (27,20) width 35: ", and " - LayoutInline {SPAN} at (0,0) size 71x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (65,20) size 65x19 - text run at (65,20) width 65: "class three" - LayoutText {#text} at (133,20) size 764x59 - text run at (133,20) width 8: ". " - text run at (141,20) width 623: "The effect for each inline element should be to have a purple medium-width solid border in the first" - text run at (0,40) width 569: "and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (569,40) width 179: "The line-height of the parent" - text run at (0,60) width 284: "element should not change at all, on any line." - LayoutTable {TABLE} at (0,211) size 784x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x116 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x88 - LayoutTableCell {TD} at (0,58) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x80 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 677x19 - text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 64x25 [border: (3px solid #800080)] - LayoutText {#text} at (679,0) size 58x19 - text run at (679,0) width 58: "class one" - LayoutText {#text} at (739,0) size 5x19 - text run at (739,0) width 5: "," - LayoutInline {SPAN} at (0,0) size 64x25 [border: (3px solid #800080)] - LayoutText {#text} at (3,20) size 58x19 - text run at (3,20) width 58: "class two" - LayoutText {#text} at (64,20) size 35x19 - text run at (64,20) width 35: ", and " - LayoutInline {SPAN} at (0,0) size 71x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (102,20) size 65x19 - text run at (102,20) width 65: "class three" - LayoutText {#text} at (170,20) size 756x59 - text run at (170,20) width 8: ". " - text run at (178,20) width 572: "The effect for each inline element should be to have a purple medium-width solid border in" - text run at (0,40) width 620: "the first and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (620,40) width 136: "The line-height of the" - text run at (0,60) width 327: "parent element should not change at all, on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_inline-expected.png deleted file mode 100644 index 69627cc..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt deleted file mode 100644 index 9e6aee4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 256x48 - text run at (0,0) width 256: ".one {border: 10px teal outset;}" - text run at (256,0) width 0: " " - text run at (0,16) width 256: ".two {border: 10px olive inset;}" - text run at (256,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 677x19 - text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 78x39 [border: (10px outset #008080)] - LayoutText {#text} at (686,0) size 58x19 - text run at (686,0) width 58: "class one" - LayoutText {#text} at (753,0) size 758x39 - text run at (753,0) width 5: "," - text run at (0,20) width 353: "which should result in a 10-pixel outset teal border; and " - LayoutInline {SPAN} at (0,0) size 78x39 [border: (10px inset #808000)] - LayoutText {#text} at (363,20) size 58x19 - text run at (363,20) width 58: "class two" - LayoutText {#text} at (431,20) size 762x39 - text run at (431,20) width 331: ", which should result in a 10-pixel inset olive border." - text run at (0,40) width 429: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 677x19 - text run at (0,0) width 677: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 78x39 [border: (10px outset #008080)] - LayoutText {#text} at (686,0) size 58x19 - text run at (686,0) width 58: "class one" - LayoutText {#text} at (753,0) size 758x39 - text run at (753,0) width 5: "," - text run at (0,20) width 353: "which should result in a 10-pixel outset teal border; and " - LayoutInline {SPAN} at (0,0) size 78x39 [border: (10px inset #808000)] - LayoutText {#text} at (363,20) size 58x19 - text run at (363,20) width 58: "class two" - LayoutText {#text} at (431,20) size 762x39 - text run at (431,20) width 331: ", which should result in a 10-pixel inset olive border." - text run at (0,40) width 429: "The line-height of the parent element should not change on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left-expected.png deleted file mode 100644 index eca0a7f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left-expected.txt deleted file mode 100644 index e8bd419..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1103 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1103 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1103 - LayoutBlockFlow {BODY} at (8,8) size 769x1087 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (20,0) size 749x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 344x112 - text run at (0,0) width 176: "P {margin-left: 20px;}" - text run at (176,0) width 0: " " - text run at (0,16) width 312: ".one {border-left: purple double 10px;}" - text run at (312,16) width 0: " " - text run at (0,32) width 304: ".two {border-left: purple thin solid;}" - text run at (304,32) width 0: " " - text run at (0,48) width 336: ".threea {border-left: black medium solid;}" - text run at (336,48) width 0: " " - text run at (0,64) width 344: ".threeb {border-left: purple medium solid;}" - text run at (344,64) width 0: " " - text run at (0,80) width 328: ".threec {border-left: blue medium solid;}" - text run at (328,80) width 0: " " - text run at (0,96) width 272: "TD {border-left: green 2px solid;}" - text run at (272,96) width 0: " " - LayoutBlockFlow {P} at (20,179) size 749x40 - LayoutText {#text} at (0,0) size 707x39 - text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (634,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (20,235) size 749x20 [border: none (10px double #800080)] - LayoutText {#text} at (10,0) size 414x19 - text run at (10,0) width 414: "This paragraph should have a purple, double, 10-pixel left border." - LayoutBlockFlow {P} at (20,271) size 749x20 [border: none (1px solid #800080)] - LayoutText {#text} at (1,0) size 331x19 - text run at (1,0) width 331: "This paragraph should have a thin purple left border." - LayoutTable {TABLE} at (0,307) size 769x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x113 - LayoutTableRow {TR} at (0,5) size 767x44 - LayoutTableCell {TD} at (5,5) size 757x44 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,2) size 735x39 - text run at (3,2) width 429: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (431,2) width 307: "This is also true of the table-testing section in the" - text run at (3,22) width 175: "second half of the test page." - LayoutTableRow {TR} at (0,54) size 767x54 - LayoutTableCell {TD} at (5,69) size 193x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 53x19 - text run at (3,2) width 53: "Cell one" - LayoutTableCell {TD} at (203,54) size 559x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,2) size 554x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (3,22) size 162x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 160x28 - LayoutTableRow {TR} at (0,2) size 160x24 - LayoutTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 151x19 - text run at (3,2) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,438) size 769x160 - LayoutListItem {LI} at (40,0) size 729x80 [border: none (3px solid #000000)] - LayoutBlockFlow (anonymous) at (3,0) size 726x20 - LayoutListMarker (anonymous) at (-21,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (3,20) size 726x60 - LayoutListItem {LI} at (40,0) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 729x20 [border: none (3px solid #800080)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 158x19 - text run at (3,0) width 158: "This is a second list item." - LayoutListItem {LI} at (40,100) size 729x60 [border: none (3px solid #0000FF)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 720x59 - text run at (3,0) width 695: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors. " - text run at (698,0) width 25: "The" - text run at (3,20) width 719: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within" - text run at (3,40) width 490: "the list item.\"), even though the nested list does not have any border styles set." - LayoutTable {TABLE} at (0,614) size 769x473 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x471 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (5,4) size 161x19 - text run at (5,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x443 - LayoutTableCell {TD} at (0,235) size 13x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (5,4) size 4x19 - text run at (5,4) width 4: " " - LayoutTableCell {TD} at (13,28) size 754x443 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (25,4) size 725x40 - LayoutText {#text} at (0,0) size 707x39 - text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (634,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (25,60) size 725x20 [border: none (10px double #800080)] - LayoutText {#text} at (10,0) size 414x19 - text run at (10,0) width 414: "This paragraph should have a purple, double, 10-pixel left border." - LayoutBlockFlow {P} at (25,96) size 725x20 [border: none (1px solid #800080)] - LayoutText {#text} at (1,0) size 331x19 - text run at (1,0) width 331: "This paragraph should have a thin purple left border." - LayoutTable {TABLE} at (5,132) size 745x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 743x113 - LayoutTableRow {TR} at (0,5) size 743x44 - LayoutTableCell {TD} at (5,5) size 733x44 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,2) size 712x39 - text run at (3,2) width 429: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (431,2) width 284: "This is also true of the table-testing section in" - text run at (3,22) width 198: "the second half of the test page." - LayoutTableRow {TR} at (0,54) size 743x54 - LayoutTableCell {TD} at (5,69) size 187x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 53x19 - text run at (3,2) width 53: "Cell one" - LayoutTableCell {TD} at (197,54) size 541x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,2) size 536x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (3,22) size 162x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 160x28 - LayoutTableRow {TR} at (0,2) size 160x24 - LayoutTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 151x19 - text run at (3,2) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (5,263) size 745x160 - LayoutListItem {LI} at (40,0) size 705x80 [border: none (3px solid #000000)] - LayoutBlockFlow (anonymous) at (3,0) size 702x20 - LayoutListMarker (anonymous) at (-21,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (3,20) size 702x60 - LayoutListItem {LI} at (40,0) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 705x20 [border: none (3px solid #800080)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 158x19 - text run at (3,0) width 158: "This is a second list item." - LayoutListItem {LI} at (40,100) size 705x60 [border: none (3px solid #0000FF)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 691x59 - text run at (3,0) width 691: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors." - text run at (3,20) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" - text run at (3,40) width 597: "\"...nested within the list item.\"), even though the nested list does not have any border styles set." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png deleted file mode 100644 index a229c84..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt deleted file mode 100644 index 2ba28bc1..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt +++ /dev/null
@@ -1,62 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (20,0) size 764x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 312x64 - text run at (0,0) width 176: "P {margin-left: 20px;}" - text run at (176,0) width 0: " " - text run at (0,16) width 312: ".one {border-left: purple double 10px;}" - text run at (312,16) width 0: " " - text run at (0,32) width 304: ".two {border-left: purple thin solid;}" - text run at (304,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (20,131) size 764x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 760x19 - text run at (0,0) width 760: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes of" - LayoutInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080)] - LayoutText {#text} at (10,20) size 57x19 - text run at (10,20) width 57: "class one" - LayoutText {#text} at (67,20) size 389x19 - text run at (67,20) width 389: ", which should have a 10-pixel purple double left border; and " - LayoutInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080)] - LayoutText {#text} at (457,20) size 58x19 - text run at (457,20) width 58: "class two" - LayoutText {#text} at (515,20) size 759x39 - text run at (515,20) width 244: ", which should have a thin solid purple" - text run at (0,40) width 73: "left border. " - text run at (72,40) width 430: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,207) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (24,4) size 742x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 696x39 - text run at (0,0) width 696: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with" - text run at (0,20) width 64: "classes of " - LayoutInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080)] - LayoutText {#text} at (74,20) size 57x19 - text run at (74,20) width 57: "class one" - LayoutText {#text} at (131,20) size 389x19 - text run at (131,20) width 389: ", which should have a 10-pixel purple double left border; and " - LayoutInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080)] - LayoutText {#text} at (521,20) size 58x19 - text run at (521,20) width 58: "class two" - LayoutText {#text} at (579,20) size 717x39 - text run at (579,20) width 138: ", which should have a" - text run at (0,40) width 179: "thin solid purple left border. " - text run at (178,40) width 430: "The line-height of the parent element should not change on any line." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png deleted file mode 100644 index 0b1197a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt deleted file mode 100644 index c86cbcfa..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt +++ /dev/null
@@ -1,104 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 873 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x873 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x873 - LayoutBlockFlow {BODY} at (8,8) size 769x857 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 448x96 - text run at (0,0) width 440: ".zero {background-color: silver; border-left-width: 0;}" - text run at (440,0) width 0: " " - text run at (0,16) width 416: ".one {border-left-width: 50px; border-style: solid;}" - text run at (416,16) width 0: " " - text run at (0,32) width 424: ".two {border-left-width: thick; border-style: solid;}" - text run at (424,32) width 0: " " - text run at (0,48) width 448: ".three {border-left-width: medium; border-style: solid;}" - text run at (448,48) width 0: " " - text run at (0,64) width 424: ".four {border-left-width: thin; border-style: solid;}" - text run at (424,64) width 0: " " - text run at (0,80) width 256: ".five {border-left-width: 25px;}" - text run at (256,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x46 [border: (3px solid #000000) (50px solid #000000)] - LayoutText {#text} at (50,3) size 713x39 - text run at (50,3) width 713: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more than" - text run at (50,23) width 86: "one line long." - LayoutBlockFlow {P} at (0,297) size 769x26 [border: (3px solid #000000) (5px solid #000000)] - LayoutText {#text} at (5,3) size 760x19 - text run at (5,3) width 760: "This element should have a thick left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,339) size 769x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 744x39 - text run at (3,3) width 744: "This element should have a medium left border width, which will be more obvious if the element is more than one line" - text run at (3,23) width 32: "long." - LayoutBlockFlow {P} at (0,401) size 769x26 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (1,3) size 753x19 - text run at (1,3) width 753: "This element should have a thin left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,443) size 769x20 - LayoutText {#text} at (0,0) size 513x19 - text run at (0,0) width 513: "This element should have no border and no extra \"padding\" on its left side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (513,3) size 96x16 - text run at (513,3) width 96: "border-style" - LayoutText {#text} at (609,0) size 54x19 - text run at (609,0) width 54: " was set." - LayoutTable {TABLE} at (0,479) size 769x378 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x376 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x348 - LayoutTableCell {TD} at (0,188) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x348 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 747x46 [border: (3px solid #000000) (50px solid #000000)] - LayoutText {#text} at (50,3) size 682x39 - text run at (50,3) width 682: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more" - text run at (50,23) width 117: "than one line long." - LayoutBlockFlow {P} at (4,138) size 747x46 [border: (3px solid #000000) (5px solid #000000)] - LayoutText {#text} at (5,3) size 724x39 - text run at (5,3) width 724: "This element should have a thick left border width, which will be more obvious if the element is more than one line" - text run at (5,23) width 32: "long." - LayoutBlockFlow {P} at (4,200) size 747x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 717x39 - text run at (3,3) width 717: "This element should have a medium left border width, which will be more obvious if the element is more than one" - text run at (3,23) width 59: "line long." - LayoutBlockFlow {P} at (4,262) size 747x46 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (1,3) size 717x39 - text run at (1,3) width 717: "This element should have a thin left border width, which will be more obvious if the element is more than one line" - text run at (1,23) width 32: "long." - LayoutBlockFlow {P} at (4,324) size 747x20 - LayoutText {#text} at (0,0) size 513x19 - text run at (0,0) width 513: "This element should have no border and no extra \"padding\" on its left side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (513,3) size 96x16 - text run at (513,3) width 96: "border-style" - LayoutText {#text} at (609,0) size 54x19 - text run at (609,0) width 54: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png deleted file mode 100644 index 29c5264c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt deleted file mode 100644 index 289bb38..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 416x48 - text run at (0,0) width 416: ".one {border-left-width: 25px; border-style: solid;}" - text run at (416,0) width 0: " " - text run at (0,16) width 416: ".two {border-left-width: thin; border-style: solid;}" - text run at (416,16) width 0: " " - text run at (0,32) width 264: ".three {border-left-width: 25px;}" - text run at (264,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x86 [border: (3px solid #000000) (25px solid #000000)] - LayoutText {#text} at (25,3) size 172x19 - text run at (25,3) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (197,6) size 24x16 - text run at (197,6) width 24: "one" - LayoutText {#text} at (221,3) size 162x19 - text run at (221,3) width 8: ". " - text run at (229,3) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x25 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (383,3) size 144x19 - text run at (383,3) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (526,6) size 25x16 - text run at (526,6) width 25: "two" - LayoutText {#text} at (553,3) size 749x39 - text run at (553,3) width 221: ", which should result in a thin solid" - text run at (25,23) width 181: "border on the left side of the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (206,23) size 27x19 - text run at (206,23) width 27: "first" - LayoutText {#text} at (233,23) size 750x39 - text run at (233,23) width 505: " box in the inline element (and the UA's default border on the other three sides). " - text run at (738,23) width 37: "There" - text run at (25,43) width 62: "is also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (87,43) size 143x19 - text run at (87,43) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (230,46) size 40x16 - text run at (230,46) width 40: "three" - LayoutText {#text} at (270,43) size 727x39 - text run at (270,43) width 482: ", which should have no left border width or visible border because no border" - text run at (25,63) width 83: "style was set." - LayoutTable {TABLE} at (0,217) size 784x124 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x122 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x94 - LayoutTableCell {TD} at (0,61) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x86 [border: (3px solid #000000) (25px solid #000000)] - LayoutText {#text} at (25,3) size 172x19 - text run at (25,3) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (197,6) size 24x16 - text run at (197,6) width 24: "one" - LayoutText {#text} at (221,3) size 162x19 - text run at (221,3) width 8: ". " - text run at (229,3) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x25 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (383,3) size 144x19 - text run at (383,3) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (526,6) size 25x16 - text run at (526,6) width 25: "two" - LayoutText {#text} at (553,3) size 715x39 - text run at (553,3) width 187: ", which should result in a thin" - text run at (25,23) width 215: "solid border on the left side of the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (240,23) size 27x19 - text run at (240,23) width 27: "first" - LayoutText {#text} at (267,23) size 699x39 - text run at (267,23) width 457: " box in the inline element (and the UA's default border on the other three" - text run at (25,43) width 44: "sides). " - text run at (69,43) width 103: "There is also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (172,43) size 143x19 - text run at (172,43) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (315,46) size 40x16 - text run at (315,46) width 40: "three" - LayoutText {#text} at (355,43) size 693x39 - text run at (355,43) width 363: ", which should have no left border width or visible border" - text run at (25,63) width 202: "because no border style was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right-expected.png deleted file mode 100644 index ba4205aa..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right-expected.txt deleted file mode 100644 index 550508a9..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 764x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 320x64 - text run at (0,0) width 184: "P {margin-right: 20px;}" - text run at (184,0) width 0: " " - text run at (0,16) width 320: ".one {border-right: purple double 10px;}" - text run at (320,16) width 0: " " - text run at (0,32) width 312: ".two {border-right: purple thin solid;}" - text run at (312,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 764x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 752: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with classes" - text run at (0,20) width 17: "of " - LayoutInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080) none] - LayoutText {#text} at (17,20) size 57x19 - text run at (17,20) width 57: "class one" - LayoutText {#text} at (84,20) size 398x19 - text run at (84,20) width 398: ", which should have a 10-pixel purple double right border; and " - LayoutInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (482,20) size 58x19 - text run at (482,20) width 58: "class two" - LayoutText {#text} at (541,20) size 741x39 - text run at (541,20) width 200: ", which should have a thin solid" - text run at (0,40) width 126: "purple right border. " - text run at (125,40) width 430: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,207) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 742x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 705x39 - text run at (0,0) width 705: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with" - text run at (0,20) width 64: "classes of " - LayoutInline {SPAN} at (0,0) size 67x19 [border: none (10px double #800080) none] - LayoutText {#text} at (64,20) size 57x19 - text run at (64,20) width 57: "class one" - LayoutText {#text} at (131,20) size 398x19 - text run at (131,20) width 398: ", which should have a 10-pixel purple double right border; and " - LayoutInline {SPAN} at (0,0) size 59x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (529,20) size 58x19 - text run at (529,20) width 58: "class two" - LayoutText {#text} at (588,20) size 726x39 - text run at (588,20) width 138: ", which should have a" - text run at (0,40) width 188: "thin solid purple right border. " - text run at (187,40) width 430: "The line-height of the parent element should not change on any line." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png deleted file mode 100644 index ce1af30d6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt deleted file mode 100644 index e6faca3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt +++ /dev/null
@@ -1,167 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1163 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1163 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1163 - LayoutBlockFlow {BODY} at (8,8) size 769x1147 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 749x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 352x112 - text run at (0,0) width 184: "P {margin-right: 20px;}" - text run at (184,0) width 0: " " - text run at (0,16) width 320: ".one {border-right: purple double 10px;}" - text run at (320,16) width 0: " " - text run at (0,32) width 312: ".two {border-right: purple thin solid;}" - text run at (312,32) width 0: " " - text run at (0,48) width 344: ".threea {border-right: black medium solid;}" - text run at (344,48) width 0: " " - text run at (0,64) width 352: ".threeb {border-right: purple medium solid;}" - text run at (352,64) width 0: " " - text run at (0,80) width 336: ".threec {border-right: blue medium solid;}" - text run at (336,80) width 0: " " - text run at (0,96) width 280: "TD {border-right: green 2px solid;}" - text run at (280,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 749x40 - LayoutText {#text} at (0,0) size 716x39 - text run at (0,0) width 643: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (643,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,235) size 749x20 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 423x19 - text run at (0,0) width 423: "This paragraph should have a purple, double, 10-pixel right border." - LayoutBlockFlow {P} at (0,271) size 749x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 340x19 - text run at (0,0) width 340: "This paragraph should have a thin purple right border." - LayoutTable {TABLE} at (0,307) size 769x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x113 - LayoutTableRow {TR} at (0,5) size 767x44 - LayoutTableCell {TD} at (5,5) size 757x44 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 744x39 - text run at (2,2) width 438: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (439,2) width 307: "This is also true of the table-testing section in the" - text run at (2,22) width 175: "second half of the test page." - LayoutTableRow {TR} at (0,54) size 767x54 - LayoutTableCell {TD} at (5,69) size 193x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 53x19 - text run at (2,2) width 53: "Cell one" - LayoutTableCell {TD} at (203,54) size 559x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 554x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (2,22) size 162x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 160x28 - LayoutTableRow {TR} at (0,2) size 160x24 - LayoutTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 151x19 - text run at (2,2) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,438) size 769x180 - LayoutListItem {LI} at (40,0) size 729x80 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 726x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 726x60 - LayoutListItem {LI} at (40,0) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 729x20 [border: none (3px solid #800080) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 158x19 - text run at (0,0) width 158: "This is a second list item." - LayoutListItem {LI} at (40,100) size 729x80 [border: none (3px solid #0000FF) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 707x79 - text run at (0,0) width 700: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors." - text run at (0,20) width 704: "The first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested" - text run at (0,40) width 538: "within the list item.\"), even though the nested list does not have any border styles set. " - text run at (538,40) width 169: "The borders should line up" - text run at (0,60) width 620: "together at the right edge of the document's body, as each list element has a default width of 100%." - LayoutTable {TABLE} at (0,634) size 769x513 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x511 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x483 - LayoutTableCell {TD} at (0,255) size 13x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (13,28) size 754x483 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 725x40 - LayoutText {#text} at (0,0) size 716x39 - text run at (0,0) width 643: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (643,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,60) size 725x20 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 423x19 - text run at (0,0) width 423: "This paragraph should have a purple, double, 10-pixel right border." - LayoutBlockFlow {P} at (4,96) size 725x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 340x19 - text run at (0,0) width 340: "This paragraph should have a thin purple right border." - LayoutTable {TABLE} at (4,132) size 745x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 743x113 - LayoutTableRow {TR} at (0,5) size 743x44 - LayoutTableCell {TD} at (5,5) size 733x44 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 721x39 - text run at (2,2) width 438: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (439,2) width 284: "This is also true of the table-testing section in" - text run at (2,22) width 198: "the second half of the test page." - LayoutTableRow {TR} at (0,54) size 743x54 - LayoutTableCell {TD} at (5,69) size 186x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 53x19 - text run at (2,2) width 53: "Cell one" - LayoutTableCell {TD} at (196,54) size 542x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 537x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (2,22) size 162x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 160x28 - LayoutTableRow {TR} at (0,2) size 160x24 - LayoutTableCell {TD} at (2,2) size 156x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 151x19 - text run at (2,2) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,263) size 745x200 - LayoutListItem {LI} at (40,0) size 705x80 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 702x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 702x60 - LayoutListItem {LI} at (40,0) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 705x20 [border: none (3px solid #800080) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 158x19 - text run at (0,0) width 158: "This is a second list item." - LayoutListItem {LI} at (40,100) size 705x100 [border: none (3px solid #0000FF) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 700x99 - text run at (0,0) width 700: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors." - text run at (0,20) width 641: "The first item's border should travel the entire height the nested list (to end near the baseline of the line" - text run at (0,40) width 601: "\"...nested within the list item.\"), even though the nested list does not have any border styles set. " - text run at (601,40) width 76: "The borders" - text run at (0,60) width 668: "should line up together at the right edge of the document's body, as each list element has a default width of" - text run at (0,80) width 41: "100%." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png deleted file mode 100644 index 18fc7139..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt deleted file mode 100644 index d2aa7db..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt +++ /dev/null
@@ -1,105 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 893 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x893 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x893 - LayoutBlockFlow {BODY} at (8,8) size 769x877 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 456x96 - text run at (0,0) width 448: ".zero {background-color: silver; border-right-width: 0;}" - text run at (448,0) width 0: " " - text run at (0,16) width 424: ".one {border-right-width: 25px; border-style: solid;}" - text run at (424,16) width 0: " " - text run at (0,32) width 432: ".two {border-right-width: thick; border-style: solid;}" - text run at (432,32) width 0: " " - text run at (0,48) width 456: ".three {border-right-width: medium; border-style: solid;}" - text run at (456,48) width 0: " " - text run at (0,64) width 432: ".four {border-right-width: thin; border-style: solid;}" - text run at (432,64) width 0: " " - text run at (0,80) width 272: ".five {border-right-width: 100px;}" - text run at (272,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x46 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 722x39 - text run at (3,3) width 722: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than" - text run at (3,23) width 86: "one line long." - LayoutBlockFlow {P} at (0,297) size 769x46 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 733x39 - text run at (3,3) width 733: "This element should have a thick right border width, which will be more obvious if the element is more than one line" - text run at (3,23) width 32: "long." - LayoutBlockFlow {P} at (0,359) size 769x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 753x39 - text run at (3,3) width 753: "This element should have a medium right border width, which will be more obvious if the element is more than one line" - text run at (3,23) width 32: "long." - LayoutBlockFlow {P} at (0,421) size 769x26 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 762x19 - text run at (3,3) width 762: "This element should have a thin right border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,463) size 769x20 - LayoutText {#text} at (0,0) size 522x19 - text run at (0,0) width 522: "This element should have no border and no extra \"padding\" on its right side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (522,3) size 96x16 - text run at (522,3) width 96: "border-style" - LayoutText {#text} at (618,0) size 54x19 - text run at (618,0) width 54: " was set." - LayoutTable {TABLE} at (0,499) size 769x378 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x376 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x348 - LayoutTableCell {TD} at (0,188) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x348 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 747x46 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 691x39 - text run at (3,3) width 691: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more" - text run at (3,23) width 117: "than one line long." - LayoutBlockFlow {P} at (4,138) size 747x46 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 733x39 - text run at (3,3) width 733: "This element should have a thick right border width, which will be more obvious if the element is more than one line" - text run at (3,23) width 32: "long." - LayoutBlockFlow {P} at (4,200) size 747x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 726x39 - text run at (3,3) width 726: "This element should have a medium right border width, which will be more obvious if the element is more than one" - text run at (3,23) width 59: "line long." - LayoutBlockFlow {P} at (4,262) size 747x46 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 726x39 - text run at (3,3) width 726: "This element should have a thin right border width, which will be more obvious if the element is more than one line" - text run at (3,23) width 32: "long." - LayoutBlockFlow {P} at (4,324) size 747x20 - LayoutText {#text} at (0,0) size 522x19 - text run at (0,0) width 522: "This element should have no border and no extra \"padding\" on its right side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (522,3) size 96x16 - text run at (522,3) width 96: "border-style" - LayoutText {#text} at (618,0) size 54x19 - text run at (618,0) width 54: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png deleted file mode 100644 index 5a74601ad..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt deleted file mode 100644 index bb033458..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 424x48 - text run at (0,0) width 424: ".one {border-right-width: 25px; border-style: solid;}" - text run at (424,0) width 0: " " - text run at (0,16) width 424: ".two {border-right-width: thin; border-style: solid;}" - text run at (424,16) width 0: " " - text run at (0,32) width 272: ".three {border-right-width: 25px;}" - text run at (272,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x86 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 172x19 - text run at (3,3) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (175,6) size 24x16 - text run at (175,6) width 24: "one" - LayoutText {#text} at (199,3) size 162x19 - text run at (199,3) width 8: ". " - text run at (207,3) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (363,3) size 144x19 - text run at (363,3) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (506,6) size 25x16 - text run at (506,6) width 25: "two" - LayoutText {#text} at (531,3) size 749x39 - text run at (531,3) width 221: ", which should result in a thin solid" - text run at (3,23) width 190: "border on the right side of the " - LayoutInline {STRONG} at (0,0) size 23x19 - LayoutText {#text} at (193,23) size 23x19 - text run at (193,23) width 23: "last" - LayoutText {#text} at (216,23) size 756x39 - text run at (216,23) width 506: " box of the inline element (and the UA's default border on the other three sides). " - text run at (722,23) width 37: "There" - text run at (3,43) width 62: "is also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (65,43) size 143x19 - text run at (65,43) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (208,46) size 40x16 - text run at (208,46) width 40: "three" - LayoutText {#text} at (248,43) size 736x39 - text run at (248,43) width 491: ", which should have no right border width or visible border because no border" - text run at (3,63) width 83: "style was set." - LayoutTable {TABLE} at (0,217) size 784x124 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x122 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x94 - LayoutTableCell {TD} at (0,61) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x86 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 172x19 - text run at (3,3) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (175,6) size 24x16 - text run at (175,6) width 24: "one" - LayoutText {#text} at (199,3) size 162x19 - text run at (199,3) width 8: ". " - text run at (207,3) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (363,3) size 144x19 - text run at (363,3) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (506,6) size 25x16 - text run at (506,6) width 25: "two" - LayoutText {#text} at (531,3) size 715x39 - text run at (531,3) width 187: ", which should result in a thin" - text run at (3,23) width 224: "solid border on the right side of the " - LayoutInline {STRONG} at (0,0) size 23x19 - LayoutText {#text} at (227,23) size 23x19 - text run at (227,23) width 23: "last" - LayoutText {#text} at (250,23) size 705x39 - text run at (250,23) width 458: " box of the inline element (and the UA's default border on the other three" - text run at (3,43) width 44: "sides). " - text run at (47,43) width 103: "There is also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (150,43) size 143x19 - text run at (150,43) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (293,46) size 40x16 - text run at (293,46) width 40: "three" - LayoutText {#text} at (333,43) size 702x39 - text run at (333,43) width 372: ", which should have no right border width or visible border" - text run at (3,63) width 202: "because no border style was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style-expected.png deleted file mode 100644 index 96ef668..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style-expected.txt deleted file mode 100644 index bfd7463..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style-expected.txt +++ /dev/null
@@ -1,122 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1369 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1369 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1369 - LayoutBlockFlow {BODY} at (8,8) size 769x1353 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x192 - LayoutText {#text} at (0,0) size 632x192 - text run at (0,0) width 560: ".one {border-style: dotted; border-color: black; border-width: thick;}" - text run at (560,0) width 0: " " - text run at (0,16) width 560: ".two {border-style: dashed; border-color: black; border-width: thick;}" - text run at (560,16) width 0: " " - text run at (0,32) width 568: ".three {border-style: solid; border-color: black; border-width: thick;}" - text run at (568,32) width 0: " " - text run at (0,48) width 568: ".four {border-style: double; border-color: black; border-width: thick;}" - text run at (568,48) width 0: " " - text run at (0,64) width 568: ".five {border-style: groove; border-color: olive; border-width: thick;}" - text run at (568,64) width 0: " " - text run at (0,80) width 552: ".six {border-style: ridge; border-color: olive; border-width: thick;}" - text run at (552,80) width 0: " " - text run at (0,96) width 568: ".seven {border-style: inset; border-color: olive; border-width: thick;}" - text run at (568,96) width 0: " " - text run at (0,112) width 576: ".eight {border-style: outset; border-color: olive; border-width: thick;}" - text run at (576,112) width 0: " " - text run at (0,128) width 632: ".nine {border-style: double groove; border-color: purple; border-width: thick;}" - text run at (632,128) width 0: " " - text run at (0,144) width 368: ".ten {border-style: double groove ridge inset;" - text run at (368,144) width 0: " " - text run at (0,160) width 368: " border-color: purple; border-width: thick;}" - text run at (368,160) width 0: " " - text run at (0,176) width 552: ".eleven {border-style: none; border-color: red; border-width: thick;}" - text run at (552,176) width 0: " " - LayoutBlockFlow {P} at (0,259) size 769x30 [border: (5px dotted #000000)] - LayoutText {#text} at (5,5) size 472x19 - text run at (5,5) width 472: "This paragraph should have a thick black dotted border all the way around." - LayoutBlockFlow {P} at (0,305) size 769x30 [border: (5px dashed #000000)] - LayoutText {#text} at (5,5) size 477x19 - text run at (5,5) width 477: "This paragraph should have a thick black dashed border all the way around." - LayoutBlockFlow {P} at (0,351) size 769x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 463x19 - text run at (5,5) width 463: "This paragraph should have a thick black solid border all the way around." - LayoutBlockFlow {P} at (0,397) size 769x30 [border: (5px double #000000)] - LayoutText {#text} at (5,5) size 476x19 - text run at (5,5) width 476: "This paragraph should have a thick black double border all the way around." - LayoutBlockFlow {P} at (0,443) size 769x30 [border: (5px groove #808000)] - LayoutText {#text} at (5,5) size 474x19 - text run at (5,5) width 474: "This paragraph should have a thick olive groove border all the way around." - LayoutBlockFlow {P} at (0,489) size 769x30 [border: (5px ridge #808000)] - LayoutText {#text} at (5,5) size 462x19 - text run at (5,5) width 462: "This paragraph should have a thick olive ridge border all the way around." - LayoutBlockFlow {P} at (0,535) size 769x30 [border: (5px inset #808000)] - LayoutText {#text} at (5,5) size 459x19 - text run at (5,5) width 459: "This paragraph should have a thick olive inset border all the way around." - LayoutBlockFlow {P} at (0,581) size 769x30 [border: (5px outset #808000)] - LayoutText {#text} at (5,5) size 467x19 - text run at (5,5) width 467: "This paragraph should have a thick olive outset border all the way around." - LayoutBlockFlow {P} at (0,627) size 769x50 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - LayoutText {#text} at (5,5) size 744x39 - text run at (5,5) width 617: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (622,5) width 127: "The color of all four" - text run at (5,25) width 204: "sides should be based on purple." - LayoutBlockFlow {P} at (0,693) size 769x50 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - LayoutText {#text} at (5,5) size 727x39 - text run at (5,5) width 702: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " - text run at (706,5) width 26: "The" - text run at (5,25) width 306: "color of all four sides should be based on purple." - LayoutBlockFlow {P} at (0,759) size 769x20 - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This paragraph should have no border at all." - LayoutTable {TABLE} at (0,795) size 769x558 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x556 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x528 - LayoutTableCell {TD} at (0,278) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x528 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x30 [border: (5px dotted #000000)] - LayoutText {#text} at (5,5) size 472x19 - text run at (5,5) width 472: "This paragraph should have a thick black dotted border all the way around." - LayoutBlockFlow {P} at (4,50) size 747x30 [border: (5px dashed #000000)] - LayoutText {#text} at (5,5) size 477x19 - text run at (5,5) width 477: "This paragraph should have a thick black dashed border all the way around." - LayoutBlockFlow {P} at (4,96) size 747x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 463x19 - text run at (5,5) width 463: "This paragraph should have a thick black solid border all the way around." - LayoutBlockFlow {P} at (4,142) size 747x30 [border: (5px double #000000)] - LayoutText {#text} at (5,5) size 476x19 - text run at (5,5) width 476: "This paragraph should have a thick black double border all the way around." - LayoutBlockFlow {P} at (4,188) size 747x30 [border: (5px groove #808000)] - LayoutText {#text} at (5,5) size 474x19 - text run at (5,5) width 474: "This paragraph should have a thick olive groove border all the way around." - LayoutBlockFlow {P} at (4,234) size 747x30 [border: (5px ridge #808000)] - LayoutText {#text} at (5,5) size 462x19 - text run at (5,5) width 462: "This paragraph should have a thick olive ridge border all the way around." - LayoutBlockFlow {P} at (4,280) size 747x30 [border: (5px inset #808000)] - LayoutText {#text} at (5,5) size 459x19 - text run at (5,5) width 459: "This paragraph should have a thick olive inset border all the way around." - LayoutBlockFlow {P} at (4,326) size 747x30 [border: (5px outset #808000)] - LayoutText {#text} at (5,5) size 467x19 - text run at (5,5) width 467: "This paragraph should have a thick olive outset border all the way around." - LayoutBlockFlow {P} at (4,372) size 747x50 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - LayoutText {#text} at (5,5) size 714x39 - text run at (5,5) width 617: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (622,5) width 97: "The color of all" - text run at (5,25) width 234: "four sides should be based on purple." - LayoutBlockFlow {P} at (4,438) size 747x50 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - LayoutText {#text} at (5,5) size 727x39 - text run at (5,5) width 702: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " - text run at (706,5) width 26: "The" - text run at (5,25) width 306: "color of all four sides should be based on purple." - LayoutBlockFlow {P} at (4,504) size 747x20 - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This paragraph should have no border at all." -layer at (8,249) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,241) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png deleted file mode 100644 index 08c3d1f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt deleted file mode 100644 index 8ff3921f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt +++ /dev/null
@@ -1,71 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 568x48 - text run at (0,0) width 560: ".one {border-style: dashed; border-color: black; border-width: thick;}" - text run at (560,0) width 0: " " - text run at (0,16) width 544: ".two {border-style: groove; border-color: red; border-width: thick;}" - text run at (544,16) width 0: " " - text run at (0,32) width 568: ".three {border-style: none; border-color: purple; border-width: thick;}" - text run at (568,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 664x19 - text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 68x29 [border: (5px dashed #000000)] - LayoutText {#text} at (668,0) size 58x19 - text run at (668,0) width 58: "class one" - LayoutText {#text} at (730,0) size 778x39 - text run at (730,0) width 48: ", which" - text run at (0,20) width 263: "will result in a dashed thick black border; " - LayoutInline {SPAN} at (0,0) size 68x29 [border: (5px groove #FF0000)] - LayoutText {#text} at (268,20) size 58x19 - text run at (268,20) width 58: "class two" - LayoutText {#text} at (331,20) size 373x19 - text run at (331,20) width 373: ", which should result in a grooved thick purple border, and " - LayoutInline {SPAN} at (0,0) size 66x19 - LayoutText {#text} at (703,20) size 66x19 - text run at (703,20) width 66: "class three" - LayoutText {#text} at (768,20) size 773x39 - text run at (768,20) width 5: "," - text run at (0,40) width 246: "which should result in no border at all. " - text run at (246,40) width 433: "The line-height of the parent element should not change, on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 664x19 - text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 68x29 [border: (5px dashed #000000)] - LayoutText {#text} at (668,0) size 58x19 - text run at (668,0) width 58: "class one" - LayoutText {#text} at (730,0) size 735x39 - text run at (730,0) width 5: "," - text run at (0,20) width 306: "which will result in a dashed thick black border; " - LayoutInline {SPAN} at (0,0) size 68x29 [border: (5px groove #FF0000)] - LayoutText {#text} at (311,20) size 58x19 - text run at (311,20) width 58: "class two" - LayoutText {#text} at (374,20) size 369x19 - text run at (374,20) width 369: ", which should result in a grooved thick purple border, and" - LayoutInline {SPAN} at (0,0) size 65x19 - LayoutText {#text} at (0,40) size 65x19 - text run at (0,40) width 65: "class three" - LayoutText {#text} at (65,40) size 687x19 - text run at (65,40) width 254: ", which should result in no border at all. " - text run at (319,40) width 433: "The line-height of the parent element should not change, on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top-expected.png deleted file mode 100644 index f06c5ff..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top-expected.txt deleted file mode 100644 index 4bcea375..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top-expected.txt +++ /dev/null
@@ -1,152 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1023 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1023 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1023 - LayoutBlockFlow {BODY} at (8,8) size 769x1007 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 320x64 - text run at (0,0) width 304: ".one {border-top: purple double 10px;}" - text run at (304,0) width 0: " " - text run at (0,16) width 296: ".two {border-top: purple thin solid;}" - text run at (296,16) width 0: " " - text run at (0,32) width 320: ".three {border-top: black medium solid;}" - text run at (320,32) width 0: " " - text run at (0,48) width 264: "TD {border-top: green 2px solid;}" - text run at (264,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x40 - LayoutText {#text} at (0,0) size 755x39 - text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (634,0) width 121: "This border applies" - text run at (0,20) width 317: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,187) size 769x30 [border: (10px double #800080) none] - LayoutText {#text} at (0,10) size 414x19 - text run at (0,10) width 414: "This paragraph should have a purple, double, 10-pixel top border." - LayoutBlockFlow {P} at (0,233) size 769x21 [border: (1px solid #800080) none] - LayoutText {#text} at (0,1) size 331x19 - text run at (0,1) width 331: "This paragraph should have a thin purple top border." - LayoutTable {TABLE} at (0,270) size 769x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x116 - LayoutTableRow {TR} at (0,5) size 767x45 - LayoutTableCell {TD} at (5,5) size 757x45 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,3) size 735x39 - text run at (2,3) width 429: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (430,3) width 307: "This is also true of the table-testing section in the" - text run at (2,23) width 175: "second half of the test page." - LayoutTableRow {TR} at (0,55) size 767x56 - LayoutTableCell {TD} at (5,70) size 192x25 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 53x19 - text run at (2,3) width 53: "Cell one" - LayoutTableCell {TD} at (202,55) size 560x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,3) size 556x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (2,23) size 161x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 159x29 - LayoutTableRow {TR} at (0,2) size 159x25 - LayoutTableCell {TD} at (2,2) size 155x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 151x19 - text run at (2,3) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,404) size 769x129 - LayoutListItem {LI} at (40,0) size 729x83 [border: (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,3) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (0,23) size 729x60 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 729x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 158x19 - text run at (0,3) width 158: "This is a second list item." - LayoutListItem {LI} at (40,106) size 729x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 480x19 - text run at (0,3) width 480: "Each list item in this list should have a medium-width black border at its top." - LayoutTable {TABLE} at (0,549) size 769x458 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x456 - LayoutTableRow {TR} at (0,0) size 767x29 - LayoutTableCell {TD} at (0,0) size 767x29 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,5) size 161x19 - text run at (4,5) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,29) size 767x427 - LayoutTableCell {TD} at (0,228) size 12x29 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,5) size 4x19 - text run at (4,5) width 4: " " - LayoutTableCell {TD} at (12,29) size 755x427 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,5) size 747x40 - LayoutText {#text} at (0,0) size 707x39 - text run at (0,0) width 634: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (634,0) width 73: "This border" - text run at (0,20) width 365: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,61) size 747x30 [border: (10px double #800080) none] - LayoutText {#text} at (0,10) size 414x19 - text run at (0,10) width 414: "This paragraph should have a purple, double, 10-pixel top border." - LayoutBlockFlow {P} at (4,107) size 747x21 [border: (1px solid #800080) none] - LayoutText {#text} at (0,1) size 331x19 - text run at (0,1) width 331: "This paragraph should have a thin purple top border." - LayoutTable {TABLE} at (4,144) size 747x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 745x116 - LayoutTableRow {TR} at (0,5) size 745x45 - LayoutTableCell {TD} at (5,5) size 735x45 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,3) size 712x39 - text run at (2,3) width 429: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (430,3) width 284: "This is also true of the table-testing section in" - text run at (2,23) width 198: "the second half of the test page." - LayoutTableRow {TR} at (0,55) size 745x56 - LayoutTableCell {TD} at (5,70) size 187x25 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 53x19 - text run at (2,3) width 53: "Cell one" - LayoutTableCell {TD} at (197,55) size 543x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,3) size 539x20 - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Cell two" - LayoutTable {TABLE} at (2,23) size 161x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 159x29 - LayoutTableRow {TR} at (0,2) size 159x25 - LayoutTableCell {TD} at (2,2) size 155x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 151x19 - text run at (2,3) width 151: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,278) size 747x129 - LayoutListItem {LI} at (40,0) size 707x83 [border: (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,3) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 118x19 - text run at (0,0) width 118: "This is a list item..." - LayoutBlockFlow {UL} at (0,23) size 707x60 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 73x19 - text run at (0,0) width 73: "...and this..." - LayoutListItem {LI} at (40,20) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 115x19 - text run at (0,0) width 115: "...is a second list..." - LayoutListItem {LI} at (40,40) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 176x19 - text run at (0,0) width 176: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 707x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 158x19 - text run at (0,3) width 158: "This is a second list item." - LayoutListItem {LI} at (40,106) size 707x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 480x19 - text run at (0,3) width 480: "Each list item in this list should have a medium-width black border at its top." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png deleted file mode 100644 index 2324fb74..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt deleted file mode 100644 index 65b75a3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 304x48 - text run at (0,0) width 304: ".one {border-top: purple double 10px;}" - text run at (304,0) width 0: " " - text run at (0,16) width 296: ".two {border-top: purple thin solid;}" - text run at (296,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 666x19 - text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 58x29 [border: (10px double #800080) none] - LayoutText {#text} at (665,0) size 58x19 - text run at (665,0) width 58: "class one" - LayoutText {#text} at (722,0) size 770x39 - text run at (722,0) width 48: ", which" - text run at (0,20) width 338: "should have a 10-pixel purple double top border; and " - LayoutInline {SPAN} at (0,0) size 58x20 [border: (1px solid #800080) none] - LayoutText {#text} at (338,20) size 58x19 - text run at (338,20) width 58: "class two" - LayoutText {#text} at (396,20) size 774x39 - text run at (396,20) width 321: ", which should have a thin solid purple top border. " - text run at (716,20) width 58: "The line-" - text run at (0,40) width 372: "height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 666x19 - text run at (0,0) width 666: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 58x29 [border: (10px double #800080) none] - LayoutText {#text} at (665,0) size 58x19 - text run at (665,0) width 58: "class one" - LayoutText {#text} at (722,0) size 727x39 - text run at (722,0) width 5: "," - text run at (0,20) width 381: "which should have a 10-pixel purple double top border; and " - LayoutInline {SPAN} at (0,0) size 58x20 [border: (1px solid #800080) none] - LayoutText {#text} at (381,20) size 58x19 - text run at (381,20) width 58: "class two" - LayoutText {#text} at (439,20) size 756x39 - text run at (439,20) width 317: ", which should have a thin solid purple top border." - text run at (0,40) width 429: "The line-height of the parent element should not change on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png deleted file mode 100644 index b263abe4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt deleted file mode 100644 index 6b05407..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 797 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x797 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x797 - LayoutBlockFlow {BODY} at (8,8) size 769x781 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 440x96 - text run at (0,0) width 432: ".zero {background-color: silver; border-top-width: 0;}" - text run at (432,0) width 0: " " - text run at (0,16) width 408: ".one {border-top-width: 25px; border-style: solid;}" - text run at (408,16) width 0: " " - text run at (0,32) width 416: ".two {border-top-width: thick; border-style: solid;}" - text run at (416,32) width 0: " " - text run at (0,48) width 440: ".three {border-top-width: medium; border-style: solid;}" - text run at (440,48) width 0: " " - text run at (0,64) width 416: ".four {border-top-width: thin; border-style: solid;}" - text run at (416,64) width 0: " " - text run at (0,80) width 248: ".five {border-top-width: 25px;}" - text run at (248,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x48 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 377x19 - text run at (3,25) width 377: "This paragraph should have a top border width of 25 pixels." - LayoutBlockFlow {P} at (0,299) size 769x28 [border: (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,5) size 334x19 - text run at (3,5) width 334: "This paragraph should have a thick top border width." - LayoutBlockFlow {P} at (0,343) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 354x19 - text run at (3,3) width 354: "This paragraph should have a medium top border width." - LayoutBlockFlow {P} at (0,385) size 769x24 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,1) size 327x19 - text run at (3,1) width 327: "This paragraph should have a thin top border width." - LayoutBlockFlow {P} at (0,425) size 769x20 - LayoutText {#text} at (0,0) size 527x19 - text run at (0,0) width 527: "This paragraph should have no border and no extra \"padding\" on its top side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (527,3) size 96x16 - text run at (527,3) width 96: "border-style" - LayoutText {#text} at (623,0) size 54x19 - text run at (623,0) width 54: " was set." - LayoutTable {TABLE} at (0,461) size 699x320 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 697x318 - LayoutTableRow {TR} at (0,0) size 697x28 - LayoutTableCell {TD} at (0,0) size 697x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 697x290 - LayoutTableCell {TD} at (0,159) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 685x290 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 677x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 677x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 677x48 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 377x19 - text run at (3,25) width 377: "This paragraph should have a top border width of 25 pixels." - LayoutBlockFlow {P} at (4,140) size 677x28 [border: (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,5) size 334x19 - text run at (3,5) width 334: "This paragraph should have a thick top border width." - LayoutBlockFlow {P} at (4,184) size 677x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 354x19 - text run at (3,3) width 354: "This paragraph should have a medium top border width." - LayoutBlockFlow {P} at (4,226) size 677x24 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,1) size 327x19 - text run at (3,1) width 327: "This paragraph should have a thin top border width." - LayoutBlockFlow {P} at (4,266) size 677x20 - LayoutText {#text} at (0,0) size 527x19 - text run at (0,0) width 527: "This paragraph should have no border and no extra \"padding\" on its top side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (527,3) size 96x16 - text run at (527,3) width 96: "border-style" - LayoutText {#text} at (623,0) size 54x19 - text run at (623,0) width 54: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png deleted file mode 100644 index 6e896ab..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt deleted file mode 100644 index 62c8bdd4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt +++ /dev/null
@@ -1,87 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 408x48 - text run at (0,0) width 408: ".one {border-top-width: 25px; border-style: solid;}" - text run at (408,0) width 0: " " - text run at (0,16) width 408: ".two {border-top-width: thin; border-style: solid;}" - text run at (408,16) width 0: " " - text run at (0,32) width 256: ".three {border-top-width: 25px;}" - text run at (256,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x88 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 172x19 - text run at (3,25) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (175,28) size 24x16 - text run at (175,28) width 24: "one" - LayoutText {#text} at (199,25) size 162x19 - text run at (199,25) width 8: ". " - text run at (207,25) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 174x23 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (363,25) size 144x19 - text run at (363,25) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (506,28) size 25x16 - text run at (506,28) width 25: "two" - LayoutText {#text} at (533,25) size 772x59 - text run at (533,25) width 221: ", which should result in a thin solid" - text run at (3,45) width 692: "border on the top side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (695,45) width 80: "There is also" - text run at (3,65) width 19: "an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (22,65) size 143x19 - text run at (22,65) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (165,68) size 40x16 - text run at (165,68) width 40: "three" - LayoutText {#text} at (205,65) size 569x19 - text run at (205,65) width 569: ", which should have no top border width or visible border because no border style was set." - LayoutTable {TABLE} at (0,219) size 784x146 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x144 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x116 - LayoutTableCell {TD} at (0,72) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x116 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x108 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 172x19 - text run at (3,25) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (175,28) size 24x16 - text run at (175,28) width 24: "one" - LayoutText {#text} at (199,25) size 162x19 - text run at (199,25) width 8: ". " - text run at (207,25) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 174x23 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (363,25) size 144x19 - text run at (363,25) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (506,28) size 25x16 - text run at (506,28) width 25: "two" - LayoutText {#text} at (533,25) size 751x59 - text run at (533,25) width 221: ", which should result in a thin solid" - text run at (3,45) width 692: "border on the top side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (695,45) width 51: "There is" - text run at (3,65) width 48: "also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (51,65) size 143x19 - text run at (51,65) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (194,68) size 40x16 - text run at (194,68) width 40: "three" - LayoutText {#text} at (234,65) size 746x39 - text run at (234,65) width 515: ", which should have no top border width or visible border because no border style" - text run at (3,85) width 50: "was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width-expected.png deleted file mode 100644 index 05713d6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width-expected.txt deleted file mode 100644 index fda2646..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 941 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x941 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x941 - LayoutBlockFlow {BODY} at (8,8) size 769x925 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 408x96 - text run at (0,0) width 400: ".zero {background-color: silver; border-width: 0;}" - text run at (400,0) width 0: " " - text run at (0,16) width 376: ".one {border-width: 50px; border-style: solid;}" - text run at (376,16) width 0: " " - text run at (0,32) width 384: ".two {border-width: thick; border-style: solid;}" - text run at (384,32) width 0: " " - text run at (0,48) width 408: ".three {border-width: medium; border-style: solid;}" - text run at (408,48) width 0: " " - text run at (0,64) width 384: ".four {border-width: thin; border-style: solid;}" - text run at (384,64) width 0: " " - text run at (0,80) width 216: ".five {border-width: 25px;}" - text run at (216,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x120 [border: (50px solid #000000)] - LayoutText {#text} at (50,50) size 394x19 - text run at (50,50) width 394: "This element should have an overall border width of 50 pixels." - LayoutBlockFlow {P} at (0,371) size 769x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 343x19 - text run at (5,5) width 343: "This element should have a thick overall border width." - LayoutBlockFlow {P} at (0,417) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 363x19 - text run at (3,3) width 363: "This element should have a medium overall border width." - LayoutBlockFlow {P} at (0,459) size 769x22 [border: (1px solid #000000)] - LayoutText {#text} at (1,1) size 336x19 - text run at (1,1) width 336: "This element should have a thin overall border width." - LayoutBlockFlow {P} at (0,497) size 769x20 - LayoutText {#text} at (0,0) size 498x19 - text run at (0,0) width 498: "This element should have no border and no extra \"padding\" on any side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (498,3) size 96x16 - text run at (498,3) width 96: "border-style" - LayoutText {#text} at (594,0) size 54x19 - text run at (594,0) width 54: " was set." - LayoutTable {TABLE} at (0,533) size 670x392 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 668x390 - LayoutTableRow {TR} at (0,0) size 668x28 - LayoutTableCell {TD} at (0,0) size 668x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 668x362 - LayoutTableCell {TD} at (0,195) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 656x362 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 648x20 - LayoutText {#text} at (0,0) size 157x19 - text run at (0,0) width 157: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (157,3) size 96x16 - text run at (157,3) width 96: "border-style" - LayoutText {#text} at (253,0) size 89x19 - text run at (253,0) width 89: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 648x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 648x120 [border: (50px solid #000000)] - LayoutText {#text} at (50,50) size 394x19 - text run at (50,50) width 394: "This element should have an overall border width of 50 pixels." - LayoutBlockFlow {P} at (4,212) size 648x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 343x19 - text run at (5,5) width 343: "This element should have a thick overall border width." - LayoutBlockFlow {P} at (4,258) size 648x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 363x19 - text run at (3,3) width 363: "This element should have a medium overall border width." - LayoutBlockFlow {P} at (4,300) size 648x22 [border: (1px solid #000000)] - LayoutText {#text} at (1,1) size 336x19 - text run at (1,1) width 336: "This element should have a thin overall border width." - LayoutBlockFlow {P} at (4,338) size 648x20 - LayoutText {#text} at (0,0) size 498x19 - text run at (0,0) width 498: "This element should have no border and no extra \"padding\" on any side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (498,3) size 96x16 - text run at (498,3) width 96: "border-style" - LayoutText {#text} at (594,0) size 54x19 - text run at (594,0) width 54: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png deleted file mode 100644 index f040266..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt deleted file mode 100644 index 6465ff64..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt +++ /dev/null
@@ -1,86 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 376x48 - text run at (0,0) width 376: ".one {border-width: 25px; border-style: solid;}" - text run at (376,0) width 0: " " - text run at (0,16) width 376: ".two {border-width: thin; border-style: solid;}" - text run at (376,16) width 0: " " - text run at (0,32) width 224: ".three {border-width: 25px;}" - text run at (224,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x110 [border: (25px solid #000000)] - LayoutText {#text} at (25,25) size 172x19 - text run at (25,25) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (197,28) size 24x16 - text run at (197,28) width 24: "one" - LayoutText {#text} at (221,25) size 162x19 - text run at (221,25) width 8: ". " - text run at (229,25) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 170x21 [border: (1px solid #000000)] - LayoutText {#text} at (383,25) size 144x19 - text run at (383,25) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (526,28) size 25x16 - text run at (526,28) width 25: "two" - LayoutText {#text} at (551,25) size 713x39 - text run at (551,25) width 187: ", which should result in a thin" - text run at (25,45) width 374: "solid border on each side of each box in the inline element. " - text run at (399,45) width 103: "There is also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (502,45) size 143x19 - text run at (502,45) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (645,48) size 40x16 - text run at (645,48) width 40: "three" - LayoutText {#text} at (685,45) size 707x39 - text run at (685,45) width 47: ", which" - text run at (25,65) width 387: "should have no border width because no border style was set." - LayoutTable {TABLE} at (0,241) size 784x148 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x146 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x118 - LayoutTableCell {TD} at (0,73) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x118 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x110 [border: (25px solid #000000)] - LayoutText {#text} at (25,25) size 172x19 - text run at (25,25) width 172: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (197,28) size 24x16 - text run at (197,28) width 24: "one" - LayoutText {#text} at (221,25) size 162x19 - text run at (221,25) width 8: ". " - text run at (229,25) width 154: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 170x21 [border: (1px solid #000000)] - LayoutText {#text} at (383,25) size 144x19 - text run at (383,25) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (526,28) size 25x16 - text run at (526,28) width 25: "two" - LayoutText {#text} at (551,25) size 685x39 - text run at (551,25) width 159: ", which should result in a" - text run at (25,45) width 402: "thin solid border on each side of each box in the inline element. " - text run at (427,45) width 103: "There is also an " - LayoutInline {SPAN} at (0,0) size 183x19 - LayoutText {#text} at (530,45) size 143x19 - text run at (530,45) width 143: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (673,48) size 40x16 - text run at (673,48) width 40: "three" - LayoutText {#text} at (713,45) size 692x39 - text run at (713,45) width 4: "," - text run at (25,65) width 430: "which should have no border width because no border style was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear-expected.png deleted file mode 100644 index 2fa89e0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear-expected.txt deleted file mode 100644 index 345d819..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear-expected.txt +++ /dev/null
@@ -1,92 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1005 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1005 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1005 - LayoutBlockFlow {BODY} at (8,8) size 769x989 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 168x64 - text run at (0,0) width 152: ".one {clear: left;}" - text run at (152,0) width 0: " " - text run at (0,16) width 160: ".two {clear: right;}" - text run at (160,16) width 0: " " - text run at (0,32) width 168: ".three {clear: both;}" - text run at (168,32) width 0: " " - text run at (0,48) width 160: ".four {clear: none;}" - text run at (160,48) width 0: " " - LayoutImage (floating) {IMG} at (0,123) size 15x50 - LayoutBlockFlow {P} at (0,131) size 769x20 - LayoutText {#text} at (18,0) size 594x19 - text run at (18,0) width 594: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - LayoutBlockFlow (anonymous) at (0,167) size 769x20 - LayoutBR {BR} at (18,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutBlockFlow {P} at (0,237) size 769x20 - LayoutText {#text} at (0,0) size 649x19 - text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - LayoutBlockFlow (anonymous) at (0,273) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (754,20) size 15x50 - LayoutBlockFlow {P} at (0,343) size 769x20 - LayoutText {#text} at (0,0) size 658x19 - text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - LayoutBlockFlow (anonymous) at (0,379) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutImage (floating) {IMG} at (754,20) size 15x50 - LayoutBlockFlow {P} at (0,449) size 769x20 - LayoutText {#text} at (0,0) size 602x19 - text run at (0,0) width 602: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - LayoutImage (floating) {IMG} at (0,485) size 15x50 - LayoutImage (floating) {IMG} at (754,485) size 15x50 - LayoutBlockFlow {P} at (0,485) size 769x20 - LayoutText {#text} at (18,0) size 390x19 - text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles." - LayoutBlockFlow (anonymous) at (0,521) size 769x20 - LayoutBR {BR} at (18,0) size 0x19 - LayoutTable {TABLE} at (0,541) size 680x448 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 678x446 - LayoutTableRow {TR} at (0,0) size 678x28 - LayoutTableCell {TD} at (0,0) size 678x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 678x418 - LayoutTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 666x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutImage (floating) {IMG} at (4,4) size 15x50 - LayoutBlockFlow {P} at (4,4) size 658x20 - LayoutText {#text} at (18,0) size 594x19 - text run at (18,0) width 594: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - LayoutBlockFlow (anonymous) at (4,40) size 658x20 - LayoutBR {BR} at (18,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutBlockFlow {P} at (4,110) size 658x20 - LayoutText {#text} at (0,0) size 649x19 - text run at (0,0) width 649: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - LayoutBlockFlow (anonymous) at (4,146) size 658x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (643,20) size 15x50 - LayoutBlockFlow {P} at (4,216) size 658x20 - LayoutText {#text} at (0,0) size 658x19 - text run at (0,0) width 658: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - LayoutBlockFlow (anonymous) at (4,252) size 658x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutImage (floating) {IMG} at (643,20) size 15x50 - LayoutBlockFlow {P} at (4,322) size 658x20 - LayoutText {#text} at (0,0) size 602x19 - text run at (0,0) width 602: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - LayoutImage (floating) {IMG} at (4,358) size 15x50 - LayoutImage (floating) {IMG} at (647,358) size 15x50 - LayoutBlockFlow {P} at (4,358) size 658x20 - LayoutText {#text} at (18,0) size 390x19 - text run at (18,0) width 390: "This paragraph should be between both tall orange rectangles." - LayoutBlockFlow (anonymous) at (4,394) size 658x20 - LayoutBR {BR} at (18,0) size 0x19 -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear_float-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear_float-expected.png deleted file mode 100644 index 9a2e9e2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear_float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt deleted file mode 100644 index 088bc55..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt +++ /dev/null
@@ -1,161 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 826 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x826 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x825.88 - LayoutBlockFlow {BODY} at (8,8) size 784x809.88 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,33) size 784x144 - LayoutText {#text} at (0,0) size 616x144 - text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" - text run at (392,0) width 0: " " - text run at (0,16) width 0: " " - text run at (0,32) width 384: "DIV.menu {float: left; clear: left; width: 11em;" - text run at (384,32) width 0: " " - text run at (0,48) width 464: " margin: 0; margin-bottom: 10px; padding: 0.5em;}" - text run at (464,48) width 0: " " - text run at (0,64) width 432: "DIV.menu H1 {font-size: 1.2em; margin: 0; padding: 0;}" - text run at (432,64) width 0: " " - text run at (0,80) width 448: "DIV.menu UL {margin: 0.2em 0.3em 0.2em 1em; padding: 0;}" - text run at (448,80) width 0: " " - text run at (0,96) width 616: "DIV.article {padding: 0.5em; margin: 0; margin-left: 14em; margin-right: 2em;" - text run at (616,96) width 0: " " - text run at (0,112) width 480: " color: black; background: yellow; clear: none;}" - text run at (480,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow (floating) {DIV} at (0,200) size 192x125.38 [color=#FFFFFF] [bgcolor=#008000] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 84x22 - text run at (0,0) width 84: "Top menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 35x19 - text run at (0,0) width 35: "green" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 94x19 - text run at (0,0) width 94: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 87x19 - text run at (0,0) width 87: "0.5em margin" - LayoutBlockFlow (floating) {DIV} at (0,335.38) size 192x125.38 [color=#FFFFFF] [bgcolor=#0000FF] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 112x22 - text run at (0,0) width 112: "Bottom menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "blue background" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 94x19 - text run at (0,0) width 94: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 87x19 - text run at (0,0) width 87: "0.5em margin" - LayoutBlockFlow {DIV} at (224,200) size 528x235.88 [bgcolor=#FFFF00] - LayoutBlockFlow {H1} at (8,29.44) size 512x37 - LayoutText {#text} at (0,0) size 275x36 - text run at (0,0) width 275: "The 'clear' property" - LayoutBlockFlow {P} at (8,87.88) size 512x100 - LayoutText {#text} at (0,0) size 512x99 - text run at (0,0) width 512: "This page has two floating \"menus\" on the side; one has a green background," - text run at (0,20) width 238: "and the other a blue background. " - text run at (238,20) width 274: "Due to settings on the 'float' and 'clear'" - text run at (0,40) width 512: "properties, the two menus should appear on the left side of the page, the blue" - text run at (0,60) width 512: "below the green. There should be a 10px gap between the two menus. There" - text run at (0,80) width 459: "should also be a 10px gap between the top menu and the top of the page." - LayoutBlockFlow {P} at (8,187.88) size 512x40 - LayoutText {#text} at (0,0) size 512x39 - text run at (0,0) width 512: "The top of the yellow rectangle (to which this paragraph belongs) should be" - text run at (0,20) width 331: "vertically aligned with the top of the green rectangle." - LayoutTable {TABLE} at (192,435.88) size 592x374 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 590x372 - LayoutTableRow {TR} at (0,0) size 590x28 - LayoutTableCell {TD} at (0,0) size 590x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 590x344 - LayoutTableCell {TD} at (0,186) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 578x343.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (floating) {DIV} at (4,4) size 192x125.38 [color=#FFFFFF] [bgcolor=#008000] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 84x22 - text run at (0,0) width 84: "Top menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 35x19 - text run at (0,0) width 35: "green" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 94x19 - text run at (0,0) width 94: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 87x19 - text run at (0,0) width 87: "0.5em margin" - LayoutBlockFlow (floating) {DIV} at (4,139.38) size 192x125.38 [color=#FFFFFF] [bgcolor=#0000FF] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 112x22 - text run at (0,0) width 112: "Bottom menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "blue background" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 94x19 - text run at (0,0) width 94: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 87x19 - text run at (0,0) width 87: "0.5em margin" - LayoutBlockFlow {DIV} at (228,4) size 314x335.88 [bgcolor=#FFFF00] - LayoutBlockFlow {H1} at (8,29.44) size 298x37 - LayoutText {#text} at (0,0) size 275x36 - text run at (0,0) width 275: "The 'clear' property" - LayoutBlockFlow {P} at (8,87.88) size 298x180 - LayoutText {#text} at (0,0) size 298x179 - text run at (0,0) width 298: "This page has two floating \"menus\" on the" - text run at (0,20) width 298: "side; one has a green background, and the" - text run at (0,40) width 161: "other a blue background. " - text run at (161,40) width 137: "Due to settings on the" - text run at (0,60) width 298: "'float' and 'clear' properties, the two menus" - text run at (0,80) width 298: "should appear on the left side of the page, the" - text run at (0,100) width 298: "blue below the green. There should be a 10px" - text run at (0,120) width 298: "gap between the two menus. There should also" - text run at (0,140) width 298: "be a 10px gap between the top menu and the" - text run at (0,160) width 98: "top of the page." - LayoutBlockFlow {P} at (8,267.88) size 298x60 - LayoutText {#text} at (0,0) size 298x59 - text run at (0,0) width 298: "The top of the yellow rectangle (to which this" - text run at (0,20) width 298: "paragraph belongs) should be vertically aligned" - text run at (0,40) width 219: "with the top of the green rectangle." -layer at (8,198) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,190) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float-expected.png deleted file mode 100644 index 145777c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float-expected.txt deleted file mode 100644 index d306f80..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 160x48 - text run at (0,0) width 152: ".one {float: left;}" - text run at (152,0) width 0: " " - text run at (0,16) width 160: ".two {float: right;}" - text run at (160,16) width 0: " " - text run at (0,32) width 0: " " - LayoutImage (floating) {IMG} at (0,107) size 15x50 - LayoutBlockFlow {P} at (0,115) size 784x40 - LayoutText {#text} at (15,0) size 763x39 - text run at (15,0) width 598: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (612,0) width 166: "In this case, it is the image" - text run at (15,20) width 212: "which has been floated to the left." - LayoutBlockFlow (anonymous) at (0,171) size 784x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (769,209) size 15x50 - LayoutBlockFlow {P} at (0,217) size 784x40 - LayoutText {#text} at (0,0) size 730x39 - text run at (0,0) width 607: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (606,0) width 124: "In this case, it is the" - text run at (0,20) width 263: "image which has been floated to the right." - LayoutTable {TABLE} at (0,273) size 784x182 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x180 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x152 - LayoutTableCell {TD} at (0,90) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x152 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutImage (floating) {IMG} at (4,4) size 15x50 - LayoutBlockFlow {P} at (4,4) size 762x40 - LayoutText {#text} at (15,0) size 721x39 - text run at (15,0) width 598: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (612,0) width 124: "In this case, it is the" - text run at (15,20) width 254: "image which has been floated to the left." - LayoutBlockFlow (anonymous) at (4,60) size 762x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (751,98) size 15x50 - LayoutBlockFlow {P} at (4,106) size 762x40 - LayoutText {#text} at (0,0) size 730x39 - text run at (0,0) width 607: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (606,0) width 124: "In this case, it is the" - text run at (0,20) width 263: "image which has been floated to the right." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,207) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,199) size 784x2 [border: (1px inset #EEEEEE)] -layer at (25,398) size 762x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,88) size 762x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png deleted file mode 100644 index a6d4d61..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt deleted file mode 100644 index 527a8af1..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt +++ /dev/null
@@ -1,244 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 732 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x732 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x732 - LayoutBlockFlow {BODY} at (8,8) size 769x704 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,33) size 769x208 - LayoutText {#text} at (0,0) size 512x208 - text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" - text run at (392,0) width 0: " " - text run at (0,16) width 0: " " - text run at (0,32) width 336: "DIV.yellow, DIV.blue, DIV.red, DIV.green {" - text run at (336,32) width 0: " " - text run at (0,48) width 336: " width: 60px; padding: 20px; margin: 10px;" - text run at (336,48) width 0: " " - text run at (0,64) width 472: " border: 20px solid black; float: left; text-align: center;" - text run at (472,64) width 0: " " - text run at (0,80) width 360: " font-family: \"Times New Roman\",Times,serif;}" - text run at (360,80) width 0: " " - text run at (0,96) width 512: "DIV.yellow {margin-left: 0px; background: yellow; color: black;}" - text run at (512,96) width 0: " " - text run at (0,112) width 336: "DIV.blue {background: blue; color: white;}" - text run at (336,112) width 0: " " - text run at (0,128) width 320: "DIV.red {background: red; color: black;}" - text run at (320,128) width 0: " " - text run at (0,144) width 352: "DIV.green {background: green; color: white;}" - text run at (352,144) width 0: " " - text run at (0,160) width 192: "DIV.below {clear: both;}" - text run at (192,160) width 0: " " - text run at (0,176) width 200: "TABLE {margin: 20px 0px;}" - text run at (200,176) width 0: " " - text run at (0,192) width 0: " " - LayoutBlockFlow {P} at (0,264) size 769x40 - LayoutText {#text} at (0,0) size 769x39 - text run at (0,0) width 769: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this page" - text run at (0,20) width 404: "indicates how the DIV elements should be laid out horizontally. " - text run at (403,20) width 220: "They should align with each other." - LayoutBlockFlow (floating) {DIV} at (0,314) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 46x19 - text run at (0,0) width 46: "Yellow" - LayoutBlockFlow (floating) {DIV} at (160,314) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 30x19 - text run at (0,0) width 30: "Blue" - LayoutBlockFlow (floating) {DIV} at (320,314) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 26x19 - text run at (0,0) width 26: "Red" - LayoutBlockFlow (floating) {DIV} at (480,314) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Green" - LayoutBlockFlow {DIV} at (0,424) size 769x21 - LayoutTable {TABLE} at (0,0) size 620x21 - LayoutTableSection {TBODY} at (0,0) size 620x21 - LayoutTableRow {TR} at (0,0) size 620x21 - LayoutTableCell {TD} at (0,10) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (20,10) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (120,10) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - LayoutTableCell {TD} at (140,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (160,10) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (180,10) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (280,10) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (300,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (320,10) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (340,10) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (440,0) size 20x21 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutText {#text} at (0,1) size 4x19 - text run at (0,1) width 4: ";" - LayoutTableCell {TD} at (460,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (480,10) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (500,10) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (600,10) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTable {TABLE} at (0,465) size 769x239 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x237 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x209 - LayoutTableCell {TD} at (0,118) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x209 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 747x39 - text run at (0,0) width 747: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this" - text run at (0,20) width 438: "page indicates how the DIV elements should be laid out horizontally. " - text run at (437,20) width 220: "They should align with each other." - LayoutBlockFlow (floating) {DIV} at (4,54) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 46x19 - text run at (0,0) width 46: "Yellow" - LayoutBlockFlow (floating) {DIV} at (164,54) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 30x19 - text run at (0,0) width 30: "Blue" - LayoutBlockFlow (floating) {DIV} at (324,54) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 26x19 - text run at (0,0) width 26: "Red" - LayoutBlockFlow (floating) {DIV} at (484,54) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Green" - LayoutBlockFlow {DIV} at (4,164) size 747x21 - LayoutTable {TABLE} at (0,0) size 620x21 - LayoutTableSection {TBODY} at (0,0) size 620x21 - LayoutTableRow {TR} at (0,0) size 620x21 - LayoutTableCell {TD} at (0,10) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (20,10) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (120,10) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - LayoutTableCell {TD} at (140,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (160,10) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (180,10) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (280,10) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (300,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (320,10) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (340,10) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (440,0) size 20x21 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutText {#text} at (0,1) size 4x19 - text run at (0,1) width 4: ";" - LayoutTableCell {TD} at (460,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (480,10) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (500,10) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (600,10) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 -layer at (8,262) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,254) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (28,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (148,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (168,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (188,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (288,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (308,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (328,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (348,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (448,432) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (468,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (488,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (508,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (608,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (25,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (45,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (165,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (185,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (205,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (305,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (325,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (345,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (365,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (465,666) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (485,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (505,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (525,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (625,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_margin-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_margin-expected.png deleted file mode 100644 index 74ce629..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt deleted file mode 100644 index b620475..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt +++ /dev/null
@@ -1,166 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1915 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1915 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1915 - LayoutBlockFlow {BODY} at (8,8) size 769x1899 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 560x144 - text run at (0,0) width 344: "P.test {background: white; font-size: 20px;" - text run at (344,0) width 0: " " - text run at (0,16) width 560: " margin-left: 30px; margin-right: 10px; padding: 0; border: 0;}" - text run at (560,16) width 0: " " - text run at (0,32) width 312: "IMG {padding: 0; border: 0; margin: 0;}" - text run at (312,32) width 0: " " - text run at (0,48) width 200: "P.test IMG {float: left;}" - text run at (200,48) width 0: " " - text run at (0,64) width 352: "#img2 {margin-top: 30px; margin-left: 30px;}" - text run at (352,64) width 0: " " - text run at (0,80) width 368: "#img3 {margin-top: -30px; margin-left: -30px;}" - text run at (368,80) width 0: " " - text run at (0,96) width 384: "#img4 {margin-right: 30px; margin-bottom: 30px;}" - text run at (384,96) width 0: " " - text run at (0,112) width 400: "#img5 {margin-right: -30px; margin-bottom: -30px;}" - text run at (400,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow {P} at (30,215) size 729x92 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 729x91 - text run at (0,0) width 663: "This paragraph should have a white background which extends to the edges of the" - text run at (0,23) width 122: "element's box. " - text run at (122,23) width 441: "There is no padding set on this paragraph whatsoever. " - text run at (562,23) width 167: "If the background of" - text run at (0,46) width 721: "the entire box is not white, this may cause problems with the following tests; at any rate," - text run at (0,69) width 240: "it must be taken into account." - LayoutBlockFlow {P} at (30,327) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (60,0) size 719x114 - text run at (60,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 119: "nothing more. " - text run at (179,23) width 540: "The edges of the white background should line up with the top and" - text run at (60,46) width 196: "left edges of the image. " - text run at (256,46) width 454: "This paragraph should have a white background, first of" - text run at (0,69) width 428: "all, which extends to the edges of the element's box. " - text run at (428,69) width 249: "There is no padding set on this" - text run at (0,92) width 182: "paragraph whatsoever." - LayoutBlockFlow {P} at (30,462) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (30,30) size 60x60 - LayoutText {#text} at (90,0) size 717x114 - text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,23) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,46) width 403: "box, and displace the paragraph text accordingly. " - text run at (492,46) width 225: "This paragraph should have" - text run at (90,69) width 613: "a white background, first of all, which extends to the edges of the element's" - text run at (0,92) width 40: "box. " - text run at (40,92) width 436: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,597) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (-30,-30) size 60x60 - LayoutText {#text} at (30,0) size 721x114 - text run at (30,0) width 676: "The image in the upper left corner of this paragraph should be pushed up and to the" - text run at (30,23) width 691: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing the" - text run at (0,46) width 633: "edges of the white background to align with the thick gray lines in the image. " - text run at (633,46) width 36: "This" - text run at (0,69) width 719: "paragraph should have a white background, first of all, which extends to the edges of the" - text run at (0,92) width 122: "element's box. " - text run at (122,92) width 436: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,732) size 729x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (90,0) size 728x137 - text run at (90,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (90,23) width 618: "the edges of the white background should line up with the top and left edges" - text run at (90,46) width 112: "of the image. " - text run at (202,46) width 504: "However, there should be 30 pixels of space between the right" - text run at (90,69) width 524: "and bottom edges of the image and the paragraph text around it. " - text run at (614,69) width 36: "This" - text run at (0,92) width 719: "paragraph should have a white background, first of all, which extends to the edges of the" - text run at (0,115) width 122: "element's box. " - text run at (122,115) width 436: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,890) size 729x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (30,0) size 706x137 - text run at (30,0) width 668: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,23) width 640: "edges of the white background should line up with the top and left edges of the" - text run at (0,46) width 60: "image. " - text run at (60,46) width 636: "However, the text should overlap the image's right and bottom sides, lining up" - text run at (0,69) width 313: "with the thick gray lines in the image. " - text run at (313,69) width 393: "This paragraph should have a white background," - text run at (0,92) width 489: "first of all, which extends to the edges of the element's box. " - text run at (489,92) width 214: "There is no padding set on" - text run at (0,115) width 217: "this paragraph whatsoever." - LayoutTable {TABLE} at (0,1048) size 769x851 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x849 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x821 - LayoutTableCell {TD} at (0,424) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x821 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (34,4) size 707x92 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 707x91 - text run at (0,0) width 663: "This paragraph should have a white background which extends to the edges of the" - text run at (0,23) width 122: "element's box. " - text run at (122,23) width 441: "There is no padding set on this paragraph whatsoever. " - text run at (562,23) width 145: "If the background" - text run at (0,46) width 702: "of the entire box is not white, this may cause problems with the following tests; at any" - text run at (0,69) width 281: "rate, it must be taken into account." - LayoutBlockFlow {P} at (34,116) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (60,0) size 703x114 - text run at (60,0) width 638: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 119: "nothing more. " - text run at (179,23) width 506: "The edges of the white background should line up with the top" - text run at (60,46) width 230: "and left edges of the image. " - text run at (290,46) width 393: "This paragraph should have a white background," - text run at (0,69) width 489: "first of all, which extends to the edges of the element's box. " - text run at (489,69) width 214: "There is no padding set on" - text run at (0,92) width 217: "this paragraph whatsoever." - LayoutBlockFlow {P} at (34,251) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (30,30) size 60x60 - LayoutText {#text} at (90,0) size 705x114 - text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,23) width 611: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,46) width 403: "box, and displace the paragraph text accordingly. " - text run at (492,46) width 182: "This paragraph should" - text run at (90,69) width 574: "have a white background, first of all, which extends to the edges of the" - text run at (0,92) width 122: "element's box. " - text run at (122,92) width 436: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,386) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (-30,-30) size 60x60 - LayoutText {#text} at (30,0) size 706x114 - text run at (30,0) width 676: "The image in the upper left corner of this paragraph should be pushed up and to the" - text run at (30,23) width 661: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing" - text run at (0,46) width 663: "the edges of the white background to align with the thick gray lines in the image. " - text run at (663,46) width 36: "This" - text run at (0,69) width 689: "paragraph should have a white background, first of all, which extends to the edges of" - text run at (0,92) width 152: "the element's box. " - text run at (152,92) width 436: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,521) size 707x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (90,0) size 694x137 - text run at (90,0) width 604: "The image in the upper left corner of this paragraph should be floated left," - text run at (90,23) width 601: "and the edges of the white background should line up with the top and left" - text run at (90,46) width 163: "edges of the image. " - text run at (253,46) width 430: "However, there should be 30 pixels of space between" - text run at (90,69) width 593: "the right and bottom edges of the image and the paragraph text around it." - text run at (0,92) width 657: "This paragraph should have a white background, first of all, which extends to the" - text run at (0,115) width 225: "edges of the element's box. " - text run at (225,115) width 436: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,679) size 707x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (30,0) size 706x137 - text run at (30,0) width 668: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,23) width 640: "edges of the white background should line up with the top and left edges of the" - text run at (0,46) width 60: "image. " - text run at (60,46) width 636: "However, the text should overlap the image's right and bottom sides, lining up" - text run at (0,69) width 313: "with the thick gray lines in the image. " - text run at (313,69) width 393: "This paragraph should have a white background," - text run at (0,92) width 489: "first of all, which extends to the edges of the element's box. " - text run at (489,92) width 214: "There is no padding set on" - text run at (0,115) width 217: "this paragraph whatsoever." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png deleted file mode 100644 index 897dd92..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt deleted file mode 100644 index d883c0ad..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt +++ /dev/null
@@ -1,370 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2946 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2946 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2946 - LayoutBlockFlow {BODY} at (8,8) size 769x2930 [bgcolor=#CCCCCC] - LayoutBlockFlow (floating) {P} at (0,0) size 384.50x40 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 384x39 - text run at (0,0) width 384: "This paragraph is of class \"one\". It has a width of 50% and" - text run at (0,20) width 124: "is floated to the left." - LayoutBlockFlow {P} at (0,0) size 769x100 - LayoutText {#text} at (384,0) size 769x99 - text run at (384,0) width 385: "This paragraph should start on the right side of a yellow box" - text run at (384,20) width 385: "which contains the previous paragraph. Since the text of this" - text run at (0,40) width 769: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no" - text run at (0,60) width 769: "padding, border or margins on this and the previous element, so the text of the two elements should be very close to each" - text run at (0,80) width 36: "other." - LayoutBlockFlow (anonymous) at (0,100) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (anonymous) at (0,138) size 769x100 - LayoutBlockFlow (floating) {P} at (0,0) size 769x80 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 769x79 - text run at (0,0) width 769: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" - text run at (0,20) width 769: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a" - text run at (0,40) width 769: "orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this" - text run at (0,60) width 217: "paragraph for diagnostic purposes." - LayoutImage {IMG} at (0,80) size 15x15 - LayoutText {#text} at (15,80) size 4x19 - text run at (15,80) width 4: " " - LayoutBR {BR} at (19,95) size 0x0 - LayoutBlockFlow (anonymous) at (0,256) size 769x120 - LayoutBlockFlow (floating) {P} at (0,0) size 384.50x120 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 385x119 - text run at (0,0) width 384: "This paragraph is floated to the left and the orange square" - text run at (0,20) width 384: "image should appear to the right of the paragraph. This" - text run at (0,40) width 384: "paragraph has a yellow background and no padding, margin" - text run at (0,60) width 385: "or border. The right edge of this yellow box should be" - text run at (0,80) width 384: "horizontally aligned with the left edge of the yellow box" - text run at (0,100) width 79: "undernearth." - LayoutImage {IMG} at (384.50,0) size 15x15 - LayoutText {#text} at (399,0) size 5x19 - text run at (399,0) width 5: " " - LayoutBR {BR} at (403,15) size 1x0 - LayoutBlockFlow (anonymous) at (0,394) size 769x120 - LayoutBlockFlow (floating) {P} at (384.50,0) size 384.50x120 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 384x119 - text run at (0,0) width 384: "This paragraph is floated to the right (using a STYLE" - text run at (0,20) width 384: "attribute) and the orange square image should appear to the" - text run at (0,40) width 384: "left of the paragraph. This paragraph has a yellow" - text run at (0,60) width 384: "background and no padding, margin or border. The left edge" - text run at (0,80) width 384: "of this yellow box should be horizonally aligned with the" - text run at (0,100) width 224: "right edge of the yellow box above." - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 4x19 - text run at (15,0) width 4: " " - LayoutBR {BR} at (19,15) size 0x0 - LayoutBlockFlow {P} at (0,532) size 769x60 - LayoutBlockFlow (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 21x36 - text run at (0,0) width 21: "T" - LayoutText {#text} at (48,0) size 769x59 - text run at (48,0) width 721: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as" - text run at (48,20) width 496: "well as bold, with a content width of 1.5em and a background-color of silver. " - text run at (543,20) width 226: "The top of the big letter \"T\" should" - text run at (0,40) width 675: "be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." - LayoutBlockFlow (anonymous) at (0,592) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {P} at (423,640) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - LayoutText {#text} at (8,8) size 320x199 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort" - text run at (8,28) width 320: "of like a 'sidebar' in a magazine article. Its width is" - text run at (8,48) width 320: "20em so the box should not be reformatted when" - text run at (8,68) width 320: "the size of the viewport is changed (e.g. when the" - text run at (8,88) width 320: "window is resized). The background color of the" - text run at (8,108) width 320: "element is yellow, and there should be a 3px solid" - text run at (8,128) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,148) width 320: "element has a 10px wide margin around it where" - text run at (8,168) width 320: "the blue background of the paragraph in the" - text run at (8,188) width 217: "normal flow should shine through." - LayoutBlockFlow {P} at (0,630) size 769x220 [bgcolor=#66CCFF] - LayoutText {#text} at (0,0) size 413x219 - text run at (0,0) width 413: "This paragraph is not floating. If there is enough room, the textual" - text run at (0,20) width 413: "content of the paragraph should appear on the left side of the" - text run at (0,40) width 193: "yellow \"sidebar\" on the right. " - text run at (193,40) width 220: "The content of this element should" - text run at (0,60) width 220: "flow around the floated element. " - text run at (220,60) width 193: "However, the floated element" - text run at (0,80) width 413: "may or may not be obscured by the blue background of this" - text run at (0,100) width 413: "element, as the specification does not say which is drawn \"on" - text run at (0,120) width 37: "top.\" " - text run at (37,120) width 376: "Even if the floated element is obscured, it still forces the" - text run at (0,140) width 263: "content of this element to flow around it. " - text run at (263,140) width 150: "If the floated element is" - text run at (0,160) width 413: "not obscured, then the blue rectangle of this paragraph should" - text run at (0,180) width 413: "extend 10px above and to the right of the sidebar's red border," - text run at (0,200) width 319: "due to the margin styles set for the floated element." - LayoutBlockFlow (anonymous) at (0,850) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow {DIV} at (0,888) size 769x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - LayoutBlockFlow (floating) {DIV} at (425,14) size 330x250 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (5,5) size 320x240 - LayoutText {#text} at (0,0) size 320x239 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element" - text run at (0,20) width 320: "which is floated to the right. The width of the DIV" - text run at (0,40) width 320: "element is 20em. The background is yellow and" - text run at (0,60) width 320: "there is a 5px padding, a 10px margin and no" - text run at (0,80) width 320: "border. Since it is floated, the yellow box should" - text run at (0,100) width 320: "be rendered on top of the background and borders" - text run at (0,120) width 320: "of adjacent non-floated elements. To the left of this" - text run at (0,140) width 320: "yellow box there should be a short paragraph with" - text run at (0,160) width 320: "a blue background and a red border. The yellow" - text run at (0,180) width 320: "box should be rendered on top of the bottom red" - text run at (0,200) width 320: "border. I.e., the bottom red border will appear" - text run at (0,220) width 318: "broken where it's overlaid by the yellow rectangle." - LayoutBlockFlow {P} at (4,4) size 761x20 - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "See description in the box on the right side" - LayoutBlockFlow (anonymous) at (0,916) size 769x246 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {DIV} at (0,1180) size 192.25x80 [bgcolor=#66CCFF] - LayoutBlockFlow {P} at (0,0) size 192.25x80 - LayoutText {#text} at (0,0) size 192x79 - text run at (0,0) width 192: "This paragraph is inside a" - text run at (0,20) width 192: "DIV which is floated left. Its" - text run at (0,40) width 192: "background is blue and the" - text run at (0,60) width 87: "width is 25%." - LayoutBlockFlow (floating) {DIV} at (576.75,1180) size 192.25x80 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 192.25x80 - LayoutText {#text} at (0,0) size 192x79 - text run at (0,0) width 192: "This paragraph is inside a" - text run at (0,20) width 192: "DIV which is floated right. Its" - text run at (0,40) width 192: "background is yellow and the" - text run at (0,60) width 87: "width is 25%." - LayoutBlockFlow {P} at (0,1180) size 769x40 - LayoutText {#text} at (192,0) size 385x39 - text run at (192,0) width 385: "This paragraph should appear between a blue box (on the" - text run at (192,20) width 30: "left) " - text run at (221,20) width 200: "and a yellow box (on the right)." - LayoutBlockFlow (anonymous) at (0,1220) size 769x40 - LayoutBR {BR} at (192,0) size 1x19 - LayoutBlockFlow (anonymous) at (0,1278) size 769x140 - LayoutBlockFlow (floating) {DIV} at (0,0) size 576.75x140 [bgcolor=#66CCFF] - LayoutBlockFlow (floating) {DIV} at (422.56,0) size 144.19x40 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 144.19x40 - LayoutText {#text} at (0,0) size 144x39 - text run at (0,0) width 144: "See description in the" - text run at (0,20) width 124: "box on the left side." - LayoutBlockFlow {P} at (0,0) size 576.75x140 - LayoutText {#text} at (0,0) size 577x139 - text run at (0,0) width 422: "This paragraph is inside a DIV which is floated left. The" - text run at (0,20) width 422: "background of the DIV element is blue and its width is 75%. This" - text run at (0,40) width 365: "text should all be inside the blue rectangle. The blue DIV " - text run at (365,40) width 211: "element has another DIV element" - text run at (0,60) width 166: "as a child. It has a yellow " - text run at (166,60) width 362: "background color and is floated to the right. Since it is a " - text run at (528,60) width 48: "child of" - text run at (0,80) width 373: "the blue DIV, the yellow DIV should appear inside the " - text run at (372,80) width 204: "blue rectangle. Due to it being" - text run at (0,100) width 193: "floated to the right and having " - text run at (193,100) width 384: "a 10px right margin, the yellow rectange should have a 10px" - text run at (0,120) width 31: "blue " - text run at (31,120) width 138: "stripe on its right side." - LayoutBR {BR} at (576,0) size 1x19 - LayoutTable {TABLE} at (0,1436) size 769x1494 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1492 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1464 - LayoutTableCell {TD} at (0,746) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1464 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (floating) {P} at (4,4) size 373.50x40 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 373x39 - text run at (0,0) width 373: "This paragraph is of class \"one\". It has a width of 50% and" - text run at (0,20) width 124: "is floated to the left." - LayoutBlockFlow {P} at (4,4) size 747x100 - LayoutText {#text} at (373,0) size 747x99 - text run at (373,0) width 374: "This paragraph should start on the right side of a yellow" - text run at (373,20) width 374: "box which contains the previous paragraph. Since the text" - text run at (0,40) width 747: "of this element is much longer than the text in the previous element, the text will wrap around the yellow box. There is" - text run at (0,60) width 747: "no padding, border or margins on this and the previous element, so the text of the two elements should be very close to" - text run at (0,80) width 69: "each other." - LayoutBlockFlow (anonymous) at (4,104) size 747x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (anonymous) at (4,142) size 747x100 - LayoutBlockFlow (floating) {P} at (0,0) size 747x80 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 747x79 - text run at (0,0) width 747: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" - text run at (0,20) width 747: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides" - text run at (0,40) width 747: "and a orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added" - text run at (0,60) width 259: "to this paragraph for diagnostic purposes." - LayoutImage {IMG} at (0,80) size 15x15 - LayoutText {#text} at (15,80) size 4x19 - text run at (15,80) width 4: " " - LayoutBR {BR} at (19,95) size 0x0 - LayoutBlockFlow (anonymous) at (4,260) size 747x120 - LayoutBlockFlow (floating) {P} at (0,0) size 373.50x120 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 373x119 - text run at (0,0) width 373: "This paragraph is floated to the left and the orange square" - text run at (0,20) width 373: "image should appear to the right of the paragraph. This" - text run at (0,40) width 373: "paragraph has a yellow background and no padding," - text run at (0,60) width 373: "margin or border. The right edge of this yellow box should" - text run at (0,80) width 373: "be horizontally aligned with the left edge of the yellow box" - text run at (0,100) width 79: "undernearth." - LayoutImage {IMG} at (373.50,0) size 15x15 - LayoutText {#text} at (388,0) size 5x19 - text run at (388,0) width 5: " " - LayoutBR {BR} at (392,15) size 1x0 - LayoutBlockFlow (anonymous) at (4,398) size 747x120 - LayoutBlockFlow (floating) {P} at (373.50,0) size 373.50x120 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 373x119 - text run at (0,0) width 373: "This paragraph is floated to the right (using a STYLE" - text run at (0,20) width 373: "attribute) and the orange square image should appear to the" - text run at (0,40) width 373: "left of the paragraph. This paragraph has a yellow" - text run at (0,60) width 373: "background and no padding, margin or border. The left" - text run at (0,80) width 373: "edge of this yellow box should be horizonally aligned with" - text run at (0,100) width 247: "the right edge of the yellow box above." - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 4x19 - text run at (15,0) width 4: " " - LayoutBR {BR} at (19,15) size 0x0 - LayoutBlockFlow {P} at (4,536) size 747x60 - LayoutBlockFlow (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 21x36 - text run at (0,0) width 21: "T" - LayoutText {#text} at (48,0) size 747x59 - text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as" - text run at (48,20) width 513: "well as bold, with a content width of 1.5em and a background-color of silver. " - text run at (560,20) width 187: "The top of the big letter \"T\"" - text run at (0,40) width 721: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." - LayoutBlockFlow (anonymous) at (4,596) size 747x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {P} at (405,644) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - LayoutText {#text} at (8,8) size 320x199 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort" - text run at (8,28) width 320: "of like a 'sidebar' in a magazine article. Its width is" - text run at (8,48) width 320: "20em so the box should not be reformatted when" - text run at (8,68) width 320: "the size of the viewport is changed (e.g. when the" - text run at (8,88) width 320: "window is resized). The background color of the" - text run at (8,108) width 320: "element is yellow, and there should be a 3px solid" - text run at (8,128) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,148) width 320: "element has a 10px wide margin around it where" - text run at (8,168) width 320: "the blue background of the paragraph in the" - text run at (8,188) width 217: "normal flow should shine through." - LayoutBlockFlow {P} at (4,634) size 747x240 [bgcolor=#66CCFF] - LayoutText {#text} at (0,0) size 391x239 - text run at (0,0) width 391: "This paragraph is not floating. If there is enough room, the" - text run at (0,20) width 391: "textual content of the paragraph should appear on the left side" - text run at (0,40) width 260: "of the yellow \"sidebar\" on the right. " - text run at (260,40) width 131: "The content of this" - text run at (0,60) width 328: "element should flow around the floated element. " - text run at (328,60) width 63: "However," - text run at (0,80) width 391: "the floated element may or may not be obscured by the blue" - text run at (0,100) width 391: "background of this element, as the specification does not say" - text run at (0,120) width 185: "which is drawn \"on top.\" " - text run at (185,120) width 206: "Even if the floated element is" - text run at (0,140) width 391: "obscured, it still forces the content of this element to flow" - text run at (0,160) width 65: "around it. " - text run at (65,160) width 326: "If the floated element is not obscured, then the blue" - text run at (0,180) width 391: "rectangle of this paragraph should extend 10px above and to" - text run at (0,200) width 391: "the right of the sidebar's red border, due to the margin styles" - text run at (0,220) width 166: "set for the floated element." - LayoutBlockFlow (anonymous) at (4,874) size 747x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow {DIV} at (4,912) size 747x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - LayoutBlockFlow (floating) {DIV} at (403,14) size 330x250 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (5,5) size 320x240 - LayoutText {#text} at (0,0) size 320x239 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element" - text run at (0,20) width 320: "which is floated to the right. The width of the DIV" - text run at (0,40) width 320: "element is 20em. The background is yellow and" - text run at (0,60) width 320: "there is a 5px padding, a 10px margin and no" - text run at (0,80) width 320: "border. Since it is floated, the yellow box should" - text run at (0,100) width 320: "be rendered on top of the background and borders" - text run at (0,120) width 320: "of adjacent non-floated elements. To the left of this" - text run at (0,140) width 320: "yellow box there should be a short paragraph with" - text run at (0,160) width 320: "a blue background and a red border. The yellow" - text run at (0,180) width 320: "box should be rendered on top of the bottom red" - text run at (0,200) width 320: "border. I.e., the bottom red border will appear" - text run at (0,220) width 318: "broken where it's overlaid by the yellow rectangle." - LayoutBlockFlow {P} at (4,4) size 739x20 - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "See description in the box on the right side" - LayoutBlockFlow (anonymous) at (4,940) size 747x246 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {DIV} at (4,1204) size 186.75x80 [bgcolor=#66CCFF] - LayoutBlockFlow {P} at (0,0) size 186.75x80 - LayoutText {#text} at (0,0) size 186x79 - text run at (0,0) width 186: "This paragraph is inside a" - text run at (0,20) width 186: "DIV which is floated left. Its" - text run at (0,40) width 186: "background is blue and the" - text run at (0,60) width 87: "width is 25%." - LayoutBlockFlow (floating) {DIV} at (564.25,1204) size 186.75x80 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 186.75x80 - LayoutText {#text} at (0,0) size 186x79 - text run at (0,0) width 186: "This paragraph is inside a" - text run at (0,20) width 186: "DIV which is floated right." - text run at (0,40) width 20: "Its " - text run at (20,40) width 166: "background is yellow and" - text run at (0,60) width 110: "the width is 25%." - LayoutBlockFlow {P} at (4,1204) size 747x40 - LayoutText {#text} at (186,0) size 374x39 - text run at (186,0) width 374: "This paragraph should appear between a blue box (on the" - text run at (186,20) width 30: "left) " - text run at (215,20) width 200: "and a yellow box (on the right)." - LayoutBlockFlow (anonymous) at (4,1244) size 747x40 - LayoutBR {BR} at (186,0) size 1x19 - LayoutBlockFlow (anonymous) at (4,1302) size 747x140 - LayoutBlockFlow (floating) {DIV} at (0,0) size 560.25x140 [bgcolor=#66CCFF] - LayoutBlockFlow (floating) {DIV} at (410.19,0) size 140.06x40 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 140.06x40 - LayoutText {#text} at (0,0) size 140x39 - text run at (0,0) width 140: "See description in the" - text run at (0,20) width 124: "box on the left side." - LayoutBlockFlow {P} at (0,0) size 560.25x140 - LayoutText {#text} at (0,0) size 560x139 - text run at (0,0) width 410: "This paragraph is inside a DIV which is floated left. The" - text run at (0,20) width 410: "background of the DIV element is blue and its width is 75%." - text run at (0,40) width 32: "This " - text run at (32,40) width 368: "text should all be inside the blue rectangle. The blue DIV " - text run at (400,40) width 160: "element has another DIV" - text run at (0,60) width 217: "element as a child. It has a yellow " - text run at (217,60) width 343: "background color and is floated to the right. Since it is" - text run at (0,80) width 11: "a " - text run at (11,80) width 408: "child of the blue DIV, the yellow DIV should appear inside the " - text run at (418,80) width 142: "blue rectangle. Due to" - text run at (0,100) width 252: "it being floated to the right and having " - text run at (252,100) width 308: "a 10px right margin, the yellow rectange should" - text run at (0,120) width 112: "have a 10px blue " - text run at (112,120) width 138: "stripe on its right side." - LayoutBR {BR} at (560,0) size 1x19 -layer at (8,136) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,128) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,254) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,246) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,392) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,384) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,530) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,522) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,628) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,620) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,886) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,878) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1178) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1170) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1276) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1268) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1434) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1426) size 769x2 [border: (1px inset #EEEEEE)] -layer at (25,1605) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,132) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1723) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,250) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1861) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,388) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1999) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,526) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2097) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,624) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2375) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,902) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2667) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1194) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2765) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1292) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2923) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1450) size 747x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/height-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/height-expected.png deleted file mode 100644 index 5e1929e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/height-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/height-expected.txt deleted file mode 100644 index 6f7f6591..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/height-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 997 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x997 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x997 - LayoutBlockFlow {BODY} at (8,8) size 769x981 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x48 - LayoutText {#text} at (0,0) size 168x48 - text run at (0,0) width 160: ".one {height: 50px;}" - text run at (160,0) width 0: " " - text run at (0,16) width 168: ".two {height: 100px;}" - text run at (168,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow (anonymous) at (0,107) size 769x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,173) size 769x20 - LayoutText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "The square above should be fifty pixels tall." - LayoutBlockFlow (anonymous) at (0,209) size 769x100 - LayoutImage {IMG} at (0,0) size 100x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,325) size 769x20 - LayoutText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "The square above should be 100 pixels tall and wide." - LayoutBlockFlow (anonymous) at (0,361) size 769x100 - LayoutImage {IMG} at (0,0) size 30x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,477) size 769x40 - LayoutText {#text} at (0,0) size 750x39 - text run at (0,0) width 750: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has" - text run at (0,20) width 150: "been doubled using the " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (150,23) size 48x16 - text run at (150,23) width 48: "height" - LayoutText {#text} at (198,20) size 66x19 - text run at (198,20) width 66: " property)." - LayoutTable {TABLE} at (0,533) size 769x448 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x446 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x418 - LayoutTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (4,4) size 747x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,70) size 747x20 - LayoutText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "The square above should be fifty pixels tall." - LayoutBlockFlow (anonymous) at (4,106) size 747x100 - LayoutImage {IMG} at (0,0) size 100x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,222) size 747x20 - LayoutText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "The square above should be 100 pixels tall and wide." - LayoutBlockFlow (anonymous) at (4,258) size 747x100 - LayoutImage {IMG} at (0,0) size 30x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,374) size 747x40 - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size" - text run at (0,20) width 175: "has been doubled using the " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (175,23) size 48x16 - text run at (175,23) width 48: "height" - LayoutText {#text} at (223,20) size 66x19 - text run at (223,20) width 66: " property)." -layer at (8,105) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin-expected.png deleted file mode 100644 index cd498f5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin-expected.txt deleted file mode 100644 index f2cf746..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin-expected.txt +++ /dev/null
@@ -1,165 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 802 scrollHeight 2710 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x2710 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x2710 - LayoutBlockFlow {BODY} at (8,8) size 784x2694 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x112 - LayoutText {#text} at (0,0) size 360x112 - text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" - text run at (352,0) width 0: " " - text run at (0,16) width 360: ".one {margin: 0.5in; background-color: aqua;}" - text run at (360,16) width 0: " " - text run at (0,32) width 352: ".two {margin: 25px; background-color: aqua;}" - text run at (352,32) width 0: " " - text run at (0,48) width 360: ".three {margin: 5em; background-color: aqua;}" - text run at (360,48) width 0: " " - text run at (0,64) width 352: ".four {margin: 25%; background-color: aqua;}" - text run at (352,64) width 0: " " - text run at (0,80) width 168: ".five {margin: 25px;}" - text run at (168,80) width 0: " " - text run at (0,96) width 360: ".six {margin: -10px; background-color: aqua;}" - text run at (360,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 784x40 - LayoutText {#text} at (0,0) size 738x39 - text run at (0,0) width 738: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" - text run at (0,20) width 248: "section 4.1.1 of the CSS1 specification." - LayoutBlockFlow {P} at (0,235) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (48,303) size 688x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 658x19 - text run at (0,0) width 658: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,371) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (25,416) size 734x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 641x19 - text run at (0,0) width 641: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,461) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (80,561) size 624x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 615x19 - text run at (0,0) width 615: "This sentence should have an overall margin of 5 em, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,661) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (196,877) size 392x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 391x59 - text run at (0,0) width 391: "This sentence should have an overall margin of 25%, which is" - text run at (0,20) width 362: "calculated with respect to the width of the parent element." - text run at (0,40) width 264: "This will require extra text in order to test." - LayoutBlockFlow {P} at (0,1133) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {UL} at (25,1178) size 734x130 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 694x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 375x19 - text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 694x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (65,65) size 644x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 543x19 - text run at (0,0) width 543: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,110) size 694x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 294x19 - text run at (0,0) width 294: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,1333) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (-10,1343) size 804x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 775x59 - text run at (0,0) width 758: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,20) width 369: "subsequent text up toward it, and a light blue background. " - text run at (369,20) width 386: "In all other respects, however, the element should be normal. " - text run at (754,20) width 21: "No" - text run at (0,40) width 527: "styles have been applied to it besides the negative margin and the background color." - LayoutBlockFlow {P} at (0,1393) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutTable {TABLE} at (0,1413) size 784x1281 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x1279 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x1251 - LayoutTableCell {TD} at (0,639) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x1251 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 - LayoutText {#text} at (0,0) size 738x39 - text run at (0,0) width 738: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" - text run at (0,20) width 248: "section 4.1.1 of the CSS1 specification." - LayoutBlockFlow {P} at (4,60) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (52,128) size 666x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 658x19 - text run at (0,0) width 658: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." - LayoutBlockFlow {P} at (4,196) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (29,241) size 712x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 641x19 - text run at (0,0) width 641: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - LayoutBlockFlow {P} at (4,286) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (84,386) size 602x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 586x39 - text run at (0,0) width 586: "This sentence should have an overall margin of 5 em, which will require extra text in order to" - text run at (0,20) width 25: "test." - LayoutBlockFlow {P} at (4,506) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (194.50,716.50) size 381x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 377x59 - text run at (0,0) width 377: "This sentence should have an overall margin of 25%, which" - text run at (0,20) width 376: "is calculated with respect to the width of the parent element." - text run at (0,40) width 264: "This will require extra text in order to test." - LayoutBlockFlow {P} at (4,967) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {UL} at (29,1012) size 712x130 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 672x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 375x19 - text run at (0,0) width 375: "This list has a margin of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 672x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (65,65) size 622x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 543x19 - text run at (0,0) width 543: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,110) size 672x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 294x19 - text run at (0,0) width 294: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,1167) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (-6,1177) size 782x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 775x59 - text run at (0,0) width 758: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,20) width 369: "subsequent text up toward it, and a light blue background. " - text run at (369,20) width 386: "In all other respects, however, the element should be normal. " - text run at (754,20) width 21: "No" - text run at (0,40) width 527: "styles have been applied to it besides the negative margin and the background color." - LayoutBlockFlow {P} at (4,1227) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." -layer at (8,169) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png deleted file mode 100644 index 143704ee..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt deleted file mode 100644 index 4ad886b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt +++ /dev/null
@@ -1,151 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1822 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1822 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1822.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1806.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 416x144 - text run at (0,0) width 408: ".zero {background-color: silver; margin-bottom: 0;}" - text run at (408,0) width 0: " " - text run at (0,16) width 416: ".one {margin-bottom: 0.5in; background-color: aqua;}" - text run at (416,16) width 0: " " - text run at (0,32) width 408: ".two {margin-bottom: 25px; background-color: aqua;}" - text run at (408,32) width 0: " " - text run at (0,48) width 416: ".three {margin-bottom: 5em; background-color: aqua;}" - text run at (416,48) width 0: " " - text run at (0,64) width 408: ".four {margin-bottom: 25%; background-color: aqua;}" - text run at (408,64) width 0: " " - text run at (0,80) width 224: ".five {margin-bottom: 25px;}" - text run at (224,80) width 0: " " - text run at (0,96) width 416: ".six {margin-bottom: -10px; background-color: aqua;}" - text run at (416,96) width 0: " " - text run at (0,112) width 176: "P, UL {margin-top: 0;}" - text run at (176,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow {P} at (0,203) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,223) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 740x39 - text run at (0,0) width 740: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,20) width 203: "margin isn't applied to each line." - LayoutBlockFlow {P} at (0,311) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 723x39 - text run at (0,0) width 723: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" - text run at (0,20) width 203: "margin isn't applied to each line." - LayoutBlockFlow {P} at (0,376) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin" - text run at (0,20) width 155: "isn't applied to each line." - LayoutBlockFlow {P} at (0,496) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 767x39 - text run at (0,0) width 767: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 126: "applied to each line." - LayoutBlockFlow {P} at (0,728.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,748.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 232x19 - text run at (0,0) width 232: "This element also has a class of zero." - LayoutBlockFlow {UL} at (0,768.25) size 769x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 424x19 - text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 294x19 - text run at (0,0) width 294: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,898.25) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 759x59 - text run at (0,0) width 748: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page," - text run at (0,20) width 123: "and no top margin. " - text run at (122,20) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (609,20) width 150: "In all other respects, the" - text run at (0,40) width 166: "element should be normal." - LayoutBlockFlow {P} at (0,948.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,968.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 232x19 - text run at (0,0) width 232: "This element also has a class of zero." - LayoutTable {TABLE} at (0,988.25) size 769x818 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x816 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x788 - LayoutTableCell {TD} at (0,408) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x787.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,24) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 740x39 - text run at (0,0) width 740: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,20) width 203: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,112) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 723x39 - text run at (0,0) width 723: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" - text run at (0,20) width 203: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,177) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin" - text run at (0,20) width 155: "isn't applied to each line." - LayoutBlockFlow {P} at (4,297) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 738x39 - text run at (0,0) width 738: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin" - text run at (0,20) width 155: "isn't applied to each line." - LayoutBlockFlow {P} at (4,523.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,543.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 232x19 - text run at (0,0) width 232: "This element also has a class of zero." - LayoutBlockFlow {UL} at (4,563.75) size 747x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 424x19 - text run at (0,0) width 424: "This list has a margin-bottom of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,40) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 294x19 - text run at (0,0) width 294: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,693.75) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 716x59 - text run at (0,0) width 710: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the" - text run at (0,20) width 161: "page, and no top margin. " - text run at (160,20) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (647,20) width 69: "In all other" - text run at (0,40) width 247: "respects, the element should be normal." - LayoutBlockFlow {P} at (4,743.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,763.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 232x19 - text run at (0,0) width 232: "This element also has a class of zero." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png deleted file mode 100644 index 9442667..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt deleted file mode 100644 index 7399d38f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt +++ /dev/null
@@ -1,96 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 416x32 - text run at (0,0) width 408: ".one {margin-bottom: 25px; background-color: aqua;}" - text run at (408,0) width 0: " " - text run at (0,16) width 416: ".two {margin-bottom: -10px; background-color: aqua;}" - text run at (416,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] - LayoutText {#text} at (479,0) size 144x19 - text run at (479,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (622,3) size 25x16 - text run at (622,3) width 25: "one" - LayoutText {#text} at (646,0) size 760x39 - text run at (646,0) width 114: ", giving it an aqua" - text run at (0,20) width 245: "background and a 25px bottom margin" - LayoutText {#text} at (244,20) size 784x39 - text run at (244,20) width 9: ". " - text run at (252,20) width 532: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 263: "element should have the same line-height." - LayoutBlockFlow {P} at (0,175) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] - LayoutText {#text} at (479,0) size 144x19 - text run at (479,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (622,3) size 25x16 - text run at (622,3) width 25: "two" - LayoutText {#text} at (646,0) size 760x39 - text run at (646,0) width 114: ", giving it an aqua" - text run at (0,20) width 250: "background and a -10px bottom margin" - LayoutText {#text} at (249,20) size 763x39 - text run at (249,20) width 9: ". " - text run at (257,20) width 506: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,40) width 289: "this element should have the same line-height." - LayoutTable {TABLE} at (0,251) size 784x174 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x172 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x144 - LayoutTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] - LayoutText {#text} at (479,0) size 144x19 - text run at (479,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (622,3) size 25x16 - text run at (622,3) width 25: "one" - LayoutText {#text} at (646,0) size 760x39 - text run at (646,0) width 114: ", giving it an aqua" - text run at (0,20) width 245: "background and a 25px bottom margin" - LayoutText {#text} at (244,20) size 758x39 - text run at (244,20) width 9: ". " - text run at (252,20) width 506: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,40) width 289: "this element should have the same line-height." - LayoutBlockFlow {P} at (4,80) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 760x39 [bgcolor=#00FFFF] - LayoutText {#text} at (479,0) size 144x19 - text run at (479,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (622,3) size 25x16 - text run at (622,3) width 25: "two" - LayoutText {#text} at (646,0) size 760x39 - text run at (646,0) width 114: ", giving it an aqua" - text run at (0,20) width 250: "background and a -10px bottom margin" - LayoutText {#text} at (249,20) size 747x39 - text run at (249,20) width 9: ". " - text run at (257,20) width 490: "Margins on inline elements does not affect line-height calculations, so all lines" - text run at (0,40) width 305: "in this element should have the same line-height." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png deleted file mode 100644 index 8859390..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt deleted file mode 100644 index 29f7c7d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt +++ /dev/null
@@ -1,125 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 749 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x749 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x749 - LayoutBlockFlow {BODY} at (8,8) size 784x733 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 360x48 - text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" - text run at (352,0) width 0: " " - text run at (0,16) width 352: ".one {margin: 25px; background-color: aqua;}" - text run at (352,16) width 0: " " - text run at (0,32) width 360: ".two {margin: -10px; background-color: aqua;}" - text run at (360,32) width 0: " " - LayoutBlockFlow {P} at (0,107) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,143) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 751x39 [bgcolor=#00FFFF] - LayoutText {#text} at (504,0) size 144x19 - text run at (504,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (647,3) size 25x16 - text run at (647,3) width 25: "one" - LayoutText {#text} at (671,0) size 751x39 - text run at (671,0) width 80: ", giving it an" - text run at (0,20) width 231: "aqua background and a 25px margin" - LayoutText {#text} at (255,20) size 769x59 - text run at (255,20) width 9: ". " - text run at (263,20) width 506: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,40) width 293: "this element should have the same line-height. " - text run at (293,40) width 473: "However, there should be a 25px margin to the left side of the inline box in" - text run at (0,60) width 727: "the first line it appears, and a 25px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (0,239) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,275) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 750x39 [bgcolor=#00FFFF] - LayoutText {#text} at (469,0) size 144x19 - text run at (469,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (612,3) size 25x16 - text run at (612,3) width 25: "two" - LayoutText {#text} at (636,0) size 750x39 - text run at (636,0) width 114: ", giving it an aqua" - text run at (0,20) width 202: "background and a -10px margin" - LayoutText {#text} at (191,20) size 784x59 - text run at (191,20) width 9: ". " - text run at (199,20) width 585: "Margins on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 214: "should have the same line-height. " - text run at (214,40) width 568: "However, there should be a -10px margin to the left side of the inline box in the first line it" - text run at (0,60) width 642: "appears, and a -10px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (0,371) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutTable {TABLE} at (0,391) size 784x342 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x340 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x312 - LayoutTableCell {TD} at (0,170) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x312 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 762x100 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 751x39 [bgcolor=#00FFFF] - LayoutText {#text} at (504,0) size 144x19 - text run at (504,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (647,3) size 25x16 - text run at (647,3) width 25: "one" - LayoutText {#text} at (671,0) size 751x39 - text run at (671,0) width 80: ", giving it an" - text run at (0,20) width 231: "aqua background and a 25px margin" - LayoutText {#text} at (255,20) size 753x79 - text run at (255,20) width 9: ". " - text run at (263,20) width 490: "Margins on inline elements does not affect line-height calculations, so all lines" - text run at (0,40) width 309: "in this element should have the same line-height. " - text run at (309,40) width 429: "However, there should be a 25px margin to the left side of the inline" - text run at (0,60) width 715: "box in the first line it appears, and a 25px margin to the right side of the inline element box in the last line where it" - text run at (0,80) width 52: "appears." - LayoutBlockFlow {P} at (4,156) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,192) size 762x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 480x19 - text run at (0,0) width 392: "This element is unstyled save for a background color of gray.. " - text run at (391,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 750x39 [bgcolor=#00FFFF] - LayoutText {#text} at (469,0) size 144x19 - text run at (469,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (612,3) size 25x16 - text run at (612,3) width 25: "two" - LayoutText {#text} at (636,0) size 750x39 - text run at (636,0) width 114: ", giving it an aqua" - text run at (0,20) width 202: "background and a -10px margin" - LayoutText {#text} at (191,20) size 745x59 - text run at (191,20) width 9: ". " - text run at (199,20) width 532: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 267: "element should have the same line-height. " - text run at (267,40) width 478: "However, there should be a -10px margin to the left side of the inline box in" - text run at (0,60) width 732: "the first line it appears, and a -10px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (4,288) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left-expected.png deleted file mode 100644 index a154bf04..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt deleted file mode 100644 index 287e2e8..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt +++ /dev/null
@@ -1,121 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1077 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1077 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1077 - LayoutBlockFlow {BODY} at (8,8) size 769x1061 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 408x96 - text run at (0,0) width 392: ".zero {background-color: silver; margin-left: 0;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".one {margin-left: 0.5in; background-color: aqua;}" - text run at (400,16) width 0: " " - text run at (0,32) width 392: ".two {margin-left: 25px; background-color: aqua;}" - text run at (392,32) width 0: " " - text run at (0,48) width 400: ".three {margin-left: 5em; background-color: aqua;}" - text run at (400,48) width 0: " " - text run at (0,64) width 392: ".four {margin-left: 25%; background-color: aqua;}" - text run at (392,64) width 0: " " - text run at (0,80) width 408: ".five {margin-left: -10px; background-color: aqua;}" - text run at (408,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (48,199) size 721x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 348x19 - text run at (0,0) width 348: "This sentence should have a left margin of half an inch." - LayoutBlockFlow {P} at (25,235) size 744x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 331x19 - text run at (0,0) width 331: "This sentence should have a left margin of 25 pixels." - LayoutBlockFlow {P} at (80,271) size 689x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 305x19 - text run at (0,0) width 305: "This sentence should have a left margin of 5 em." - LayoutBlockFlow {P} at (192.25,307) size 576.75x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 546x39 - text run at (0,0) width 546: "This sentence should have a left margin of 25%, which is calculated with respect to the" - text run at (0,20) width 176: "width of the parent element." - LayoutBlockFlow {UL} at (25,363) size 744x100 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 704x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 685x19 - text run at (0,0) width 685: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." - LayoutListItem {LI} at (65,20) size 679x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 668x59 - text run at (0,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,20) width 60: "checked. " - text run at (60,20) width 608: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin" - text run at (0,40) width 479: "to make 50 pixels of margin, and its background color has been set to white." - LayoutListItem {LI} at (40,80) size 704x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This is an unclassed list item" - LayoutBlockFlow {P} at (0,479) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (-10,515) size 779x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 778x59 - text run at (0,0) width 758: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" - text run at (0,20) width 114: "blue background. " - text run at (114,20) width 386: "In all other respects, however, the element should be normal. " - text run at (499,20) width 279: "No styles have been applied to it besides the" - text run at (0,40) width 293: "negative left margin and the background color." - LayoutTable {TABLE} at (0,591) size 769x470 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x468 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x440 - LayoutTableCell {TD} at (0,234) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x440 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (52,40) size 699x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 348x19 - text run at (0,0) width 348: "This sentence should have a left margin of half an inch." - LayoutBlockFlow {P} at (29,76) size 722x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 331x19 - text run at (0,0) width 331: "This sentence should have a left margin of 25 pixels." - LayoutBlockFlow {P} at (84,112) size 667x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 305x19 - text run at (0,0) width 305: "This sentence should have a left margin of 5 em." - LayoutBlockFlow {P} at (190.75,148) size 560.25x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 546x39 - text run at (0,0) width 546: "This sentence should have a left margin of 25%, which is calculated with respect to the" - text run at (0,20) width 176: "width of the parent element." - LayoutBlockFlow {UL} at (29,204) size 722x120 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 682x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 650x39 - text run at (0,0) width 650: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to" - text run at (0,20) width 31: "gray." - LayoutListItem {LI} at (65,40) size 657x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 656x59 - text run at (0,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,20) width 60: "checked. " - text run at (60,20) width 560: "This list item has its left margin also set to 25 pixels, which should combine with the list's" - text run at (0,40) width 527: "margin to make 50 pixels of margin, and its background color has been set to white." - LayoutListItem {LI} at (40,100) size 682x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This is an unclassed list item" - LayoutBlockFlow {P} at (4,340) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (-6,376) size 757x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 737x59 - text run at (0,0) width 726: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a" - text run at (0,20) width 146: "light blue background. " - text run at (146,20) width 386: "In all other respects, however, the element should be normal. " - text run at (531,20) width 206: "No styles have been applied to it" - text run at (0,40) width 366: "besides the negative left margin and the background color." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png deleted file mode 100644 index b075e90..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt deleted file mode 100644 index a9c479c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 400x32 - text run at (0,0) width 392: ".one {margin-left: 25px; background-color: aqua;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".two {margin-left: -10px; background-color: aqua;}" - text run at (400,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (566,0) size 144x19 - text run at (566,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (709,3) size 25x16 - text run at (709,3) width 25: "one" - LayoutText {#text} at (733,0) size 781x39 - text run at (733,0) width 48: ", which" - text run at (0,20) width 299: "should result in 25-pixel left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (298,20) size 28x19 - text run at (298,20) width 28: "first" - LayoutText {#text} at (325,20) size 233x19 - text run at (325,20) width 233: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,155) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (531,0) size 144x19 - text run at (531,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (674,3) size 25x16 - text run at (674,3) width 25: "two" - LayoutText {#text} at (698,0) size 746x39 - text run at (698,0) width 48: ", which" - text run at (0,20) width 284: "should result in -10px left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (283,20) size 28x19 - text run at (283,20) width 28: "first" - LayoutText {#text} at (310,20) size 233x19 - text run at (310,20) width 233: " line in which the inline box appears." - LayoutTable {TABLE} at (0,211) size 784x134 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x132 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x104 - LayoutTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (566,0) size 144x19 - text run at (566,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (709,3) size 25x16 - text run at (709,3) width 25: "one" - LayoutText {#text} at (733,0) size 738x39 - text run at (733,0) width 5: "," - text run at (0,20) width 342: "which should result in 25-pixel left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (341,20) size 28x19 - text run at (341,20) width 28: "first" - LayoutText {#text} at (368,20) size 233x19 - text run at (368,20) width 233: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,60) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (531,0) size 144x19 - text run at (531,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (674,3) size 25x16 - text run at (674,3) width 25: "two" - LayoutText {#text} at (698,0) size 746x39 - text run at (698,0) width 48: ", which" - text run at (0,20) width 284: "should result in -10px left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (283,20) size 28x19 - text run at (283,20) width 28: "first" - LayoutText {#text} at (310,20) size 233x19 - text run at (310,20) width 233: " line in which the inline box appears." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right-expected.png deleted file mode 100644 index 8d65f88..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt deleted file mode 100644 index fcacfb5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt +++ /dev/null
@@ -1,121 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 802 scrollHeight 1077 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1077 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1077 - LayoutBlockFlow {BODY} at (8,8) size 784x1061 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x96 - LayoutText {#text} at (0,0) size 560x96 - text run at (0,0) width 552: ".zero {background-color: silver; margin-right: 0; text-align: right;}" - text run at (552,0) width 0: " " - text run at (0,16) width 560: ".one {margin-right: 0.5in; text-align: right; background-color: aqua;}" - text run at (560,16) width 0: " " - text run at (0,32) width 552: ".two {margin-right: 25px; text-align: right; background-color: aqua;}" - text run at (552,32) width 0: " " - text run at (0,48) width 560: ".three {margin-right: 5em; text-align: right; background-color: aqua;}" - text run at (560,48) width 0: " " - text run at (0,64) width 552: ".four {margin-right: 25%; text-align: right; background-color: aqua;}" - text run at (552,64) width 0: " " - text run at (0,80) width 416: ".five {margin-right: -10px; background-color: aqua;}" - text run at (416,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (581,0) size 203x19 - text run at (581,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 736x20 [bgcolor=#00FFFF] - LayoutText {#text} at (379,0) size 357x19 - text run at (379,0) width 357: "This sentence should have a right margin of half an inch." - LayoutBlockFlow {P} at (0,235) size 759x20 [bgcolor=#00FFFF] - LayoutText {#text} at (419,0) size 340x19 - text run at (419,0) width 340: "This sentence should have a right margin of 25 pixels." - LayoutBlockFlow {P} at (0,271) size 704x20 [bgcolor=#00FFFF] - LayoutText {#text} at (390,0) size 314x19 - text run at (390,0) width 314: "This sentence should have a right margin of 5 em." - LayoutBlockFlow {P} at (0,307) size 588x40 [bgcolor=#00FFFF] - LayoutText {#text} at (33,0) size 555x39 - text run at (33,0) width 555: "This sentence should have a right margin of 25%, which is calculated with respect to the" - text run at (412,20) width 176: "width of the parent element." - LayoutBlockFlow {UL} at (0,363) size 759x100 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 719x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (20,0) size 699x19 - text run at (20,0) width 699: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." - LayoutListItem {LI} at (40,20) size 694x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (38,0) size 693x59 - text run at (38,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (1,20) width 61: "checked. " - text run at (61,20) width 633: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin to" - text run at (230,40) width 464: "make 50 pixels of margin, and its background-color has been set to white." - LayoutListItem {LI} at (40,80) size 719x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (540,0) size 179x19 - text run at (540,0) width 179: "This is an unclassed list item" - LayoutBlockFlow {P} at (0,479) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (581,0) size 203x19 - text run at (581,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,515) size 794x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 778x59 - text run at (0,0) width 767: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" - text run at (0,20) width 114: "blue background. " - text run at (114,20) width 386: "In all other respects, however, the element should be normal. " - text run at (499,20) width 279: "No styles have been applied to it besides the" - text run at (0,40) width 302: "negative right margin and the background color." - LayoutTable {TABLE} at (0,591) size 784x470 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x468 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x440 - LayoutTableCell {TD} at (0,234) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x440 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (559,0) size 203x19 - text run at (559,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 714x20 [bgcolor=#00FFFF] - LayoutText {#text} at (357,0) size 357x19 - text run at (357,0) width 357: "This sentence should have a right margin of half an inch." - LayoutBlockFlow {P} at (4,76) size 737x20 [bgcolor=#00FFFF] - LayoutText {#text} at (397,0) size 340x19 - text run at (397,0) width 340: "This sentence should have a right margin of 25 pixels." - LayoutBlockFlow {P} at (4,112) size 682x20 [bgcolor=#00FFFF] - LayoutText {#text} at (368,0) size 314x19 - text run at (368,0) width 314: "This sentence should have a right margin of 5 em." - LayoutBlockFlow {P} at (4,148) size 571.50x40 [bgcolor=#00FFFF] - LayoutText {#text} at (16,0) size 556x39 - text run at (16,0) width 556: "This sentence should have a right margin of 25%, which is calculated with respect to the" - text run at (395,20) width 177: "width of the parent element." - LayoutBlockFlow {UL} at (4,204) size 737x120 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 697x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (33,0) size 664x39 - text run at (33,0) width 664: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to" - text run at (666,20) width 31: "gray." - LayoutListItem {LI} at (40,40) size 672x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (16,0) size 656x59 - text run at (16,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (43,20) width 61: "checked. " - text run at (103,20) width 569: "This list item has its right margin also set to 25 pixels, which should combine with the list's" - text run at (144,40) width 528: "margin to make 50 pixels of margin, and its background-color has been set to white." - LayoutListItem {LI} at (40,100) size 697x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (518,0) size 179x19 - text run at (518,0) width 179: "This is an unclassed list item" - LayoutBlockFlow {P} at (4,340) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (559,0) size 203x19 - text run at (559,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,376) size 772x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 767x59 - text run at (0,0) width 767: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" - text run at (0,20) width 114: "blue background. " - text run at (114,20) width 386: "In all other respects, however, the element should be normal. " - text run at (499,20) width 256: "No styles have been applied to it besides" - text run at (0,40) width 325: "the negative right margin and the background color." -layer at (8,153) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png deleted file mode 100644 index df781c4c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt deleted file mode 100644 index 389f43a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 552x32 - text run at (0,0) width 552: ".one {margin-right: 25px; text-align: right; background-color: aqua;}" - text run at (552,0) width 0: " " - text run at (0,16) width 408: ".two {margin-right: -10px; background-color: aqua;}" - text run at (408,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "one" - LayoutText {#text} at (733,0) size 781x39 - text run at (733,0) width 48: ", which" - text run at (0,20) width 308: "should result in 25-pixel right margin only in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (307,20) size 24x19 - text run at (307,20) width 24: "last" - LayoutText {#text} at (330,20) size 233x19 - text run at (330,20) width 233: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,155) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "two" - LayoutText {#text} at (698,0) size 746x39 - text run at (698,0) width 48: ", which" - text run at (0,20) width 293: "should result in -10px right margin only in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (292,20) size 24x19 - text run at (292,20) width 24: "last" - LayoutText {#text} at (315,20) size 233x19 - text run at (315,20) width 233: " line in which the inline box appears." - LayoutTable {TABLE} at (0,211) size 784x134 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x132 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x104 - LayoutTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "one" - LayoutText {#text} at (733,0) size 738x39 - text run at (733,0) width 5: "," - text run at (0,20) width 351: "which should result in 25-pixel right margin only in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (350,20) size 24x19 - text run at (350,20) width 24: "last" - LayoutText {#text} at (373,20) size 233x19 - text run at (373,20) width 233: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,60) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "two" - LayoutText {#text} at (698,0) size 746x39 - text run at (698,0) width 48: ", which" - text run at (0,20) width 293: "should result in -10px right margin only in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (292,20) size 24x19 - text run at (292,20) width 24: "last" - LayoutText {#text} at (315,20) size 233x19 - text run at (315,20) width 233: " line in which the inline box appears." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top-expected.png deleted file mode 100644 index 9025be9..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt deleted file mode 100644 index cceec31b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt +++ /dev/null
@@ -1,138 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1723 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1723 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1723.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1707.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,33) size 769x128 - LayoutText {#text} at (0,0) size 392x128 - text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" - text run at (384,0) width 0: " " - text run at (0,16) width 392: ".one {margin-top: 0.5in; background-color: aqua;}" - text run at (392,16) width 0: " " - text run at (0,32) width 384: ".two {margin-top: 25px; background-color: aqua;}" - text run at (384,32) width 0: " " - text run at (0,48) width 392: ".three {margin-top: 5em; background-color: aqua;}" - text run at (392,48) width 0: " " - text run at (0,64) width 384: ".four {margin-top: 25%; background-color: aqua;}" - text run at (384,64) width 0: " " - text run at (0,80) width 200: ".five {margin-top: 25px;}" - text run at (200,80) width 0: " " - text run at (0,96) width 392: ".six {margin-top: -10px; background-color: aqua;}" - text run at (392,96) width 0: " " - text run at (0,112) width 200: "P, UL {margin-bottom: 0;}" - text run at (200,112) width 0: " " - LayoutBlockFlow {P} at (0,184) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,204) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 232x19 - text run at (0,0) width 232: "This element also has a class of zero." - LayoutBlockFlow {P} at (0,272) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 759x39 - text run at (0,0) width 759: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the margin" - text run at (0,20) width 155: "isn't applied to each line." - LayoutBlockFlow {P} at (0,337) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 742x39 - text run at (0,0) width 742: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin" - text run at (0,20) width 155: "isn't applied to each line." - LayoutBlockFlow {P} at (0,457) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 126: "applied to each line." - LayoutBlockFlow {P} at (0,689.25) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 753x39 - text run at (0,0) width 725: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " - text run at (724,0) width 29: "This" - text run at (0,20) width 232: "will require extra text in order to test." - LayoutBlockFlow {UL} at (0,754.25) size 769x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 400x19 - text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,65) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 567x19 - text run at (0,0) width 567: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 294x19 - text run at (0,0) width 294: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,859.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,869.25) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 766x59 - text run at (0,0) width 766: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom margin." - text run at (0,20) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (487,20) width 268: "In all other respects, the element should be" - text run at (0,40) width 48: "normal." - LayoutTable {TABLE} at (0,929.25) size 769x778 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x776 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x748 - LayoutTableCell {TD} at (0,388) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x747.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,24) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 232x19 - text run at (0,0) width 232: "This element also has a class of zero." - LayoutBlockFlow {P} at (4,92) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 711x39 - text run at (0,0) width 711: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,20) width 203: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,157) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 742x39 - text run at (0,0) width 742: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin" - text run at (0,20) width 155: "isn't applied to each line." - LayoutBlockFlow {P} at (4,277) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 126: "applied to each line." - LayoutBlockFlow {P} at (4,503.75) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 721x39 - text run at (0,0) width 721: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element." - text run at (0,20) width 264: "This will require extra text in order to test." - LayoutBlockFlow {UL} at (4,568.75) size 747x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 400x19 - text run at (0,0) width 400: "This list has a margin-top of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,65) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 567x19 - text run at (0,0) width 567: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 294x19 - text run at (0,0) width 294: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,673.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,683.75) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 741x59 - text run at (0,0) width 714: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom" - text run at (0,20) width 52: "margin. " - text run at (51,20) width 488: "No other styles have been applied to it besides a light blue background color. " - text run at (538,20) width 203: "In all other respects, the element" - text run at (0,40) width 113: "should be normal." -layer at (8,182) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,174) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png deleted file mode 100644 index 20c60324..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt deleted file mode 100644 index 5a863e0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt +++ /dev/null
@@ -1,99 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 392x64 - text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" - text run at (384,0) width 0: " " - text run at (0,16) width 384: ".one {margin-top: 25px; background-color: aqua;}" - text run at (384,16) width 0: " " - text run at (0,32) width 392: ".two {margin-top: -10px; background-color: aqua;}" - text run at (392,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "one" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 221: "background and a 25px top margin" - LayoutText {#text} at (220,20) size 747x39 - text run at (220,20) width 9: ". " - text run at (228,20) width 519: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,40) width 263: "element should have the same line-height." - LayoutBlockFlow {P} at (0,207) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 753x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 753x39 - text run at (642,0) width 111: ", giving the inline" - text run at (0,20) width 332: "element an aqua background and a -10px top margin" - LayoutText {#text} at (331,20) size 783x39 - text run at (331,20) width 9: ". " - text run at (339,20) width 444: "Margins on inline elements do not affect line-height calculations, so all" - text run at (0,40) width 338: "lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,283) size 784x174 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x172 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x144 - LayoutTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "one" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 221: "background and a 25px top margin" - LayoutText {#text} at (220,20) size 747x39 - text run at (220,20) width 9: ". " - text run at (228,20) width 519: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,40) width 263: "element should have the same line-height." - LayoutBlockFlow {P} at (4,80) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 753x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 753x39 - text run at (642,0) width 111: ", giving the inline" - text run at (0,20) width 332: "element an aqua background and a -10px top margin" - LayoutText {#text} at (331,20) size 746x39 - text run at (331,20) width 9: ". " - text run at (339,20) width 407: "Margins on inline elements do not affect line-height calculations," - text run at (0,40) width 375: "so all lines in this element should have the same line-height." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding-expected.png deleted file mode 100644 index 503ad58..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding-expected.txt deleted file mode 100644 index f7a70c2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding-expected.txt +++ /dev/null
@@ -1,94 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2284 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2284 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2283.50 - LayoutBlockFlow {BODY} at (8,8) size 769x2267.50 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 376x96 - text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" - text run at (360,0) width 0: " " - text run at (0,16) width 368: ".one {padding: 0.5in; background-color: aqua;}" - text run at (368,16) width 0: " " - text run at (0,32) width 360: ".two {padding: 25px; background-color: aqua;}" - text run at (360,32) width 0: " " - text run at (0,48) width 368: ".three {padding: 5em; background-color: aqua;}" - text run at (368,48) width 0: " " - text run at (0,64) width 360: ".four {padding: 25%; background-color: aqua;}" - text run at (360,64) width 0: " " - text run at (0,80) width 376: ".five {padding: -20px; background-color: aqua;}" - text run at (376,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x136 [bgcolor=#00FFFF] - LayoutText {#text} at (48,48) size 660x39 - text run at (48,48) width 660: "This element should have an overall padding of half an inch, which will require extra text in order to test." - text run at (48,68) width 464: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,351) size 769x90 [bgcolor=#00FFFF] - LayoutText {#text} at (25,25) size 701x39 - text run at (25,25) width 647: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (672,25) width 54: "Both the" - text run at (25,45) width 406: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,457) size 769x200 [bgcolor=#00FFFF] - LayoutText {#text} at (80,80) size 588x39 - text run at (80,80) width 588: "This element should have an overall padding of 5 em, which will require extra text in order to" - text run at (80,100) width 29: "test. " - text run at (109,100) width 464: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,673) size 769x464.50 [bgcolor=#00FFFF] - LayoutText {#text} at (192,192) size 380x80 - text run at (192,192) width 380: "This element should have an overall padding of 25%, which" - text run at (192,212) width 377: "is calculated with respect to the width of the parent element." - text run at (192,232) width 354: "Both the content background and the padding should be" - text run at (192,252) width 108: "aqua (light blue)." - LayoutBlockFlow {P} at (0,1153.50) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 751x39 - text run at (0,0) width 541: "This element should have no padding, since negative padding values are not allowed. " - text run at (541,0) width 210: "Both the content background and" - text run at (0,20) width 298: "the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,1209.50) size 769x1058 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1056 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1028 - LayoutTableCell {TD} at (0,528) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1027.50 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x136 [bgcolor=#00FFFF] - LayoutText {#text} at (48,48) size 631x39 - text run at (48,48) width 631: "This element should have an overall padding of half an inch, which will require extra text in order to" - text run at (48,68) width 29: "test. " - text run at (77,68) width 464: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,192) size 747x90 [bgcolor=#00FFFF] - LayoutText {#text} at (25,25) size 678x39 - text run at (25,25) width 647: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (672,25) width 31: "Both" - text run at (25,45) width 429: "the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,298) size 747x200 [bgcolor=#00FFFF] - LayoutText {#text} at (80,80) size 572x39 - text run at (80,80) width 572: "This element should have an overall padding of 5 em, which will require extra text in order" - text run at (80,100) width 45: "to test. " - text run at (125,100) width 464: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,514) size 747x453.50 [bgcolor=#00FFFF] - LayoutText {#text} at (186,186) size 363x80 - text run at (186,186) width 337: "This element should have an overall padding of 25%," - text run at (186,206) width 363: "which is calculated with respect to the width of the parent" - text run at (186,226) width 58: "element. " - text run at (243,226) width 289: "Both the content background and the padding" - text run at (186,246) width 173: "should be aqua (light blue)." - LayoutBlockFlow {P} at (4,983.50) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 724x39 - text run at (0,0) width 541: "This element should have no padding, since negative padding values are not allowed. " - text run at (541,0) width 183: "Both the content background" - text run at (0,20) width 325: "and the normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png deleted file mode 100644 index f31c5e3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt deleted file mode 100644 index c2d5034..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1610 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1610 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1610.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1594.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 432x96 - text run at (0,0) width 416: ".zero {background-color: silver; padding-bottom: 0;}" - text run at (416,0) width 0: " " - text run at (0,16) width 424: ".one {padding-bottom: 0.5in; background-color: aqua;}" - text run at (424,16) width 0: " " - text run at (0,32) width 416: ".two {padding-bottom: 25px; background-color: aqua;}" - text run at (416,32) width 0: " " - text run at (0,48) width 424: ".three {padding-bottom: 5em; background-color: aqua;}" - text run at (424,48) width 0: " " - text run at (0,64) width 416: ".four {padding-bottom: 25%; background-color: aqua;}" - text run at (416,64) width 0: " " - text run at (0,80) width 432: ".five {padding-bottom: -20px; background-color: aqua;}" - text run at (432,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 761x39 - text run at (0,0) width 657: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (657,0) width 104: "Both the content" - text run at (0,20) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,303) size 769x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 744x39 - text run at (0,0) width 640: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (640,0) width 104: "Both the content" - text run at (0,20) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,384) size 769x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 614: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (614,0) width 104: "Both the content" - text run at (0,20) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,520) size 769x232.25 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 752: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element." - text run at (0,20) width 268: "This will require extra text in order to test. " - text run at (268,20) width 464: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,768.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,804.25) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 693x39 - text run at (0,0) width 589: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (589,0) width 104: "Both the content" - text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,860.25) size 769x734 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x732 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x704 - LayoutTableCell {TD} at (0,366) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x703.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 711x39 - text run at (0,0) width 657: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (657,0) width 54: "Both the" - text run at (0,20) width 406: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,144) size 747x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 744x39 - text run at (0,0) width 640: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (640,0) width 104: "Both the content" - text run at (0,20) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,225) size 747x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 614: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (614,0) width 104: "Both the content" - text run at (0,20) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,361) size 747x246.75 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 712x59 - text run at (0,0) width 695: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent" - text run at (0,20) width 57: "element. " - text run at (57,20) width 268: "This will require extra text in order to test. " - text run at (325,20) width 387: "Both the content background and the padding should be aqua" - text run at (0,40) width 73: "(light blue)." - LayoutBlockFlow {P} at (4,623.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,659.75) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 693x39 - text run at (0,0) width 589: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (589,0) width 104: "Both the content" - text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png deleted file mode 100644 index 01823bf..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt deleted file mode 100644 index 165bd15..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 424x48 - text run at (0,0) width 416: ".one {padding-bottom: 25px; background-color: aqua;}" - text run at (416,0) width 0: " " - text run at (0,16) width 424: ".two {padding-bottom: -10px; background-color: aqua;}" - text run at (424,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "one" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 252: "background and a 25px bottom padding" - LayoutText {#text} at (252,20) size 781x59 - text run at (252,20) width 8: ". " - text run at (260,20) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in" - text run at (0,40) width 293: "this element should have the same line-height. " - text run at (293,40) width 488: "There may be implementation-specific limits on how much of the padding the" - text run at (0,60) width 176: "user agent is able to display." - LayoutBlockFlow {P} at (0,211) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 522: "background and no bottom padding, since negative padding values are not allowed" - LayoutText {#text} at (522,20) size 757x39 - text run at (522,20) width 8: ". " - text run at (530,20) width 227: "Padding on inline elements does not" - text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,287) size 784x194 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x192 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x164 - LayoutTableCell {TD} at (0,96) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "one" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 252: "background and a 25px bottom padding" - LayoutText {#text} at (252,20) size 749x59 - text run at (252,20) width 8: ". " - text run at (260,20) width 489: "Padding on inline elements does not affect line-height calculations, so all lines" - text run at (0,40) width 309: "in this element should have the same line-height. " - text run at (309,40) width 410: "There may be implementation-specific limits on how much of the" - text run at (0,60) width 254: "padding the user agent is able to display." - LayoutBlockFlow {P} at (4,100) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 522: "background and no bottom padding, since negative padding values are not allowed" - LayoutText {#text} at (522,20) size 757x39 - text run at (522,20) width 8: ". " - text run at (530,20) width 227: "Padding on inline elements does not" - text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png deleted file mode 100644 index 1901a6c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt deleted file mode 100644 index de24b3d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt +++ /dev/null
@@ -1,127 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 809 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x809 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x809 - LayoutBlockFlow {BODY} at (8,8) size 769x793 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 368x64 - text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" - text run at (360,0) width 0: " " - text run at (0,16) width 360: ".one {padding: 25px; background-color: aqua;}" - text run at (360,16) width 0: " " - text run at (0,32) width 368: ".two {padding: -10px; background-color: aqua;}" - text run at (368,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,167) size 769x120 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 747x89 [bgcolor=#00FFFF] - LayoutText {#text} at (500,0) size 144x19 - text run at (500,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (643,3) size 25x16 - text run at (643,3) width 25: "one" - LayoutText {#text} at (667,0) size 747x39 - text run at (667,0) width 80: ", giving it an" - text run at (0,20) width 238: "aqua background and a 25px padding" - LayoutText {#text} at (263,20) size 765x99 - text run at (263,20) width 8: ". " - text run at (271,20) width 489: "Padding on inline elements does not affect line-height calculations, so all lines" - text run at (0,40) width 309: "in this element should have the same line-height. " - text run at (309,40) width 410: "There may be implementation-specific limits on how much of the" - text run at (0,60) width 431: "padding the user agent is able to display above and below each line. " - text run at (431,60) width 334: "However, there should be at least 25px of padding to" - text run at (0,80) width 753: "the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline element box in" - text run at (0,100) width 182: "the last line where it appears." - LayoutBlockFlow {P} at (0,303) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,339) size 769x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 474: "background and no padding, since negative padding values are not allowed" - LayoutText {#text} at (474,20) size 748x39 - text run at (474,20) width 8: ". " - text run at (482,20) width 266: "Padding on inline elements does not affect" - text run at (0,40) width 528: "line-height calculations, so all lines in this element should have the same line-height." - LayoutBlockFlow {P} at (0,415) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutTable {TABLE} at (0,451) size 769x342 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x340 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x312 - LayoutTableCell {TD} at (0,170) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x312 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x120 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 747x89 [bgcolor=#00FFFF] - LayoutText {#text} at (500,0) size 144x19 - text run at (500,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (643,3) size 25x16 - text run at (643,3) width 25: "one" - LayoutText {#text} at (667,0) size 747x39 - text run at (667,0) width 80: ", giving it an" - text run at (0,20) width 238: "aqua background and a 25px padding" - LayoutText {#text} at (263,20) size 729x99 - text run at (263,20) width 8: ". " - text run at (271,20) width 456: "Padding on inline elements does not affect line-height calculations, so all" - text run at (0,40) width 342: "lines in this element should have the same line-height. " - text run at (342,40) width 387: "There may be implementation-specific limits on how much of" - text run at (0,60) width 454: "the padding the user agent is able to display above and below each line. " - text run at (454,60) width 263: "However, there should be at least 25px of" - text run at (0,80) width 727: "padding to the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline" - text run at (0,100) width 279: "element box in the last line where it appears." - LayoutBlockFlow {P} at (4,176) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,212) size 747x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 722x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 722x39 - text run at (642,0) width 80: ", giving it an" - text run at (0,20) width 508: "aqua background and no padding, since negative padding values are not allowed" - LayoutText {#text} at (508,20) size 743x39 - text run at (508,20) width 8: ". " - text run at (516,20) width 227: "Padding on inline elements does not" - text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." - LayoutBlockFlow {P} at (4,288) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left-expected.png deleted file mode 100644 index d913fcf..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt deleted file mode 100644 index 6fea302..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt +++ /dev/null
@@ -1,117 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1065 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1065 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1065 - LayoutBlockFlow {BODY} at (8,8) size 769x1049 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 416x96 - text run at (0,0) width 400: ".zero {background-color: silver; padding-left: 0;}" - text run at (400,0) width 0: " " - text run at (0,16) width 408: ".one {padding-left: 0.5in; background-color: aqua;}" - text run at (408,16) width 0: " " - text run at (0,32) width 400: ".two {padding-left: 25px; background-color: aqua;}" - text run at (400,32) width 0: " " - text run at (0,48) width 408: ".three {padding-left: 5em; background-color: aqua;}" - text run at (408,48) width 0: " " - text run at (0,64) width 400: ".four {padding-left: 25%; background-color: aqua;}" - text run at (400,64) width 0: " " - text run at (0,80) width 416: ".five {padding-left: -20px; background-color: aqua;}" - text run at (416,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 687x39 - text run at (48,0) width 633: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (681,0) width 54: "Both the" - text run at (48,20) width 406: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,255) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 720x39 - text run at (25,0) width 616: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (641,0) width 104: "Both the content" - text run at (25,20) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,311) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (80,0) size 640x39 - text run at (80,0) width 586: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (666,0) width 54: "Both the" - text run at (80,20) width 406: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,367) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (192,0) size 568x59 - text run at (192,0) width 549: "This element should have a left padding of 25%, which is calculated with respect to the" - text run at (192,20) width 181: "width of the parent element. " - text run at (372,20) width 388: "Both the content background and the padding should be aqua" - text run at (192,40) width 74: "(light blue)." - LayoutBlockFlow {UL} at (0,443) size 769x80 [bgcolor=#808080] - LayoutListItem {LI} at (25,0) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 715x19 - text run at (0,0) width 715: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." - LayoutListItem {LI} at (25,20) size 744x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (25,0) size 712x59 - text run at (25,0) width 712: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked." - text run at (25,20) width 696: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50" - text run at (25,40) width 106: "pixels of margin." - LayoutBlockFlow {P} at (0,539) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 748x39 - text run at (0,0) width 565: "This element should have no left padding, since negative padding values are not allowed. " - text run at (565,0) width 183: "Both the content background" - text run at (0,20) width 325: "and the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,595) size 769x454 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x452 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x424 - LayoutTableCell {TD} at (0,226) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x424 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 687x39 - text run at (48,0) width 633: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (681,0) width 54: "Both the" - text run at (48,20) width 406: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,96) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 720x39 - text run at (25,0) width 616: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (641,0) width 104: "Both the content" - text run at (25,20) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,152) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (80,0) size 640x39 - text run at (80,0) width 586: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (666,0) width 54: "Both the" - text run at (80,20) width 406: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,208) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (186,0) size 549x59 - text run at (186,0) width 549: "This element should have a left padding of 25%, which is calculated with respect to the" - text run at (186,20) width 181: "width of the parent element. " - text run at (366,20) width 354: "Both the content background and the padding should be" - text run at (186,40) width 108: "aqua (light blue)." - LayoutBlockFlow {UL} at (4,284) size 747x80 [bgcolor=#808080] - LayoutListItem {LI} at (25,0) size 722x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 715x19 - text run at (0,0) width 715: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." - LayoutListItem {LI} at (25,20) size 722x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (25,0) size 682x59 - text run at (25,0) width 656: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (25,20) width 60: "checked. " - text run at (85,20) width 622: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding" - text run at (25,40) width 180: "to make 50 pixels of margin." - LayoutBlockFlow {P} at (4,380) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 669x39 - text run at (0,0) width 565: "This element should have no left padding, since negative padding values are not allowed. " - text run at (565,0) width 104: "Both the content" - text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png deleted file mode 100644 index e30e4e8..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt deleted file mode 100644 index 25146a6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt +++ /dev/null
@@ -1,103 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 408x48 - text run at (0,0) width 400: ".one {padding-left: 25px; background-color: aqua;}" - text run at (400,0) width 0: " " - text run at (0,16) width 408: ".two {padding-left: -10px; background-color: aqua;}" - text run at (408,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 193x19 [bgcolor=#00FFFF] - LayoutText {#text} at (566,0) size 144x19 - text run at (566,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (709,3) size 25x16 - text run at (709,3) width 25: "one" - LayoutText {#text} at (733,0) size 777x39 - text run at (733,0) width 44: " which" - text run at (0,20) width 527: "should result in 25-pixel left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (527,20) size 27x19 - text run at (527,20) width 27: "first" - LayoutText {#text} at (554,20) size 730x39 - text run at (554,20) width 176: " line in which the inline box" - text run at (0,40) width 52: "appears." - LayoutBlockFlow {P} at (0,191) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "two" - LayoutText {#text} at (708,0) size 752x39 - text run at (708,0) width 44: " which" - text run at (0,20) width 512: "should result in -10px left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (512,20) size 27x19 - text run at (512,20) width 27: "first" - LayoutText {#text} at (539,20) size 232x19 - text run at (539,20) width 232: " line in which the inline box appears." - LayoutTable {TABLE} at (0,247) size 784x174 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x172 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x144 - LayoutTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 193x19 [bgcolor=#00FFFF] - LayoutText {#text} at (566,0) size 144x19 - text run at (566,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (709,3) size 25x16 - text run at (709,3) width 25: "one" - LayoutText {#text} at (0,20) size 570x19 - text run at (0,20) width 570: "which should result in 25-pixel left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (570,20) size 27x19 - text run at (570,20) width 27: "first" - LayoutText {#text} at (597,20) size 745x39 - text run at (597,20) width 148: " line in which the inline" - text run at (0,40) width 80: "box appears." - LayoutBlockFlow {P} at (4,80) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "two" - LayoutText {#text} at (708,0) size 752x39 - text run at (708,0) width 44: " which" - text run at (0,20) width 512: "should result in -10px left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (512,20) size 27x19 - text run at (512,20) width 27: "first" - LayoutText {#text} at (539,20) size 715x39 - text run at (539,20) width 176: " line in which the inline box" - text run at (0,40) width 52: "appears." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right-expected.png deleted file mode 100644 index 9772efb3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt deleted file mode 100644 index d318d8e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt +++ /dev/null
@@ -1,135 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1245 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1245 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1245 - LayoutBlockFlow {BODY} at (8,8) size 769x1229 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 576x96 - text run at (0,0) width 408: ".zero {background-color: silver; padding-right: 0;}" - text run at (408,0) width 0: " " - text run at (0,16) width 568: ".one {padding-right: 0.5in; text-align: right; background-color: aqua;}" - text run at (568,16) width 0: " " - text run at (0,32) width 560: ".two {padding-right: 25px; text-align: right; background-color: aqua;}" - text run at (560,32) width 0: " " - text run at (0,48) width 568: ".three {padding-right: 5em; text-align: right; background-color: aqua;}" - text run at (568,48) width 0: " " - text run at (0,64) width 560: ".four {padding-right: 25%; text-align: right; background-color: aqua;}" - text run at (560,64) width 0: " " - text run at (0,80) width 576: ".five {padding-right: -20px; text-align: right; background-color: aqua;}" - text run at (576,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 712x59 - text run at (25,0) width 642: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (667,0) width 54: "Both the" - text run at (9,20) width 410: "content background and the padding should be aqua (light blue). " - text run at (419,20) width 302: "The text has been right-aligned in order to make" - text run at (530,40) width 191: "the right padding easier to see." - LayoutBlockFlow {P} at (0,275) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (15,0) size 729x59 - text run at (15,0) width 625: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (640,0) width 104: "Both the content" - text run at (26,20) width 360: "background and the padding should be aqua (light blue). " - text run at (386,20) width 358: "The text has been right-aligned in order to make the right" - text run at (609,40) width 135: "padding easier to see." - LayoutBlockFlow {P} at (0,351) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (36,0) size 674x59 - text run at (36,0) width 599: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (635,0) width 54: "Both the" - text run at (15,20) width 410: "content background and the padding should be aqua (light blue). " - text run at (425,20) width 264: "The text has been right-aligned in order to" - text run at (460,40) width 229: "make the right padding easier to see." - LayoutBlockFlow {P} at (0,427) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (19,0) size 575x59 - text run at (19,0) width 558: "This element should have a right padding of 25%, which is calculated with respect to the" - text run at (9,20) width 181: "width of the parent element. " - text run at (189,20) width 388: "Both the content background and the padding should be aqua" - text run at (2,40) width 78: "(light blue). " - text run at (79,40) width 498: "The text has been right-aligned in order to make the right padding easier to see." - LayoutBlockFlow {UL} at (0,503) size 769x80 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 704x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (7,0) size 697x39 - text run at (7,0) width 697: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to" - text run at (679,20) width 25: "test." - LayoutListItem {LI} at (40,40) size 704x40 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (19,0) size 660x39 - text run at (19,0) width 660: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL" - text run at (626,20) width 53: "element." - LayoutBlockFlow {P} at (0,599) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (12,0) size 757x59 - text run at (12,0) width 574: "This element should have no right padding, since negative padding values are not allowed. " - text run at (586,0) width 183: "Both the content background" - text run at (35,20) width 329: "and the normal padding should be aqua (light blue). " - text run at (364,20) width 405: "The text has been right-aligned in order to make the lack of right" - text run at (634,40) width 135: "padding easier to see." - LayoutTable {TABLE} at (0,675) size 769x554 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x552 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x524 - LayoutTableCell {TD} at (0,276) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x524 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (3,0) size 696x59 - text run at (3,0) width 642: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (645,0) width 54: "Both the" - text run at (25,20) width 410: "content background and the padding should be aqua (light blue). " - text run at (435,20) width 264: "The text has been right-aligned in order to" - text run at (470,40) width 229: "make the right padding easier to see." - LayoutBlockFlow {P} at (4,116) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (43,0) size 712x59 - text run at (43,0) width 625: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (668,0) width 54: "Both the" - text run at (10,20) width 410: "content background and the padding should be aqua (light blue). " - text run at (420,20) width 302: "The text has been right-aligned in order to make" - text run at (531,40) width 191: "the right padding easier to see." - LayoutBlockFlow {P} at (4,192) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (14,0) size 658x59 - text run at (14,0) width 599: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (613,0) width 54: "Both the" - text run at (9,20) width 410: "content background and the padding should be aqua (light blue). " - text run at (419,20) width 248: "The text has been right-aligned in order" - text run at (422,40) width 245: "to make the right padding easier to see." - LayoutBlockFlow {P} at (4,268) size 747x80 [bgcolor=#00FFFF] - LayoutText {#text} at (3,0) size 558x79 - text run at (3,0) width 558: "This element should have a right padding of 25%, which is calculated with respect to the" - text run at (27,20) width 181: "width of the parent element. " - text run at (207,20) width 354: "Both the content background and the padding should be" - text run at (36,40) width 112: "aqua (light blue). " - text run at (147,40) width 414: "The text has been right-aligned in order to make the right padding" - text run at (480,60) width 81: "easier to see." - LayoutBlockFlow {UL} at (4,364) size 747x80 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 682x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (1,0) size 681x39 - text run at (1,0) width 681: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order" - text run at (641,20) width 41: "to test." - LayoutListItem {LI} at (40,40) size 682x40 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (23,0) size 634x39 - text run at (23,0) width 634: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the" - text run at (578,20) width 79: "UL element." - LayoutBlockFlow {P} at (4,460) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (69,0) size 733x59 - text run at (69,0) width 574: "This element should have no right padding, since negative padding values are not allowed. " - text run at (643,0) width 104: "Both the content" - text run at (14,20) width 408: "background and the normal padding should be aqua (light blue). " - text run at (422,20) width 325: "The text has been right-aligned in order to make the" - text run at (532,40) width 215: "lack of right padding easier to see." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png deleted file mode 100644 index 687ebfc..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt deleted file mode 100644 index 4ed3e6b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt +++ /dev/null
@@ -1,104 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 568x48 - text run at (0,0) width 560: ".one {padding-right: 25px; text-align: right; background-color: aqua;}" - text run at (560,0) width 0: " " - text run at (0,16) width 568: ".two {padding-right: -10px; text-align: right; background-color: aqua;}" - text run at (568,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 193x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "one" - LayoutText {#text} at (733,0) size 781x39 - text run at (733,0) width 48: ", which" - text run at (0,20) width 525: "should result in 25-pixel right padding (which should also be light blue) only in the " - LayoutInline {STRONG} at (0,0) size 23x19 - LayoutText {#text} at (525,20) size 23x19 - text run at (525,20) width 23: "last" - LayoutText {#text} at (548,20) size 232x19 - text run at (548,20) width 232: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,171) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "two" - LayoutText {#text} at (708,0) size 756x39 - text run at (708,0) width 48: ", which" - text run at (0,20) width 548: "should result in no right padding, since negative padding values are not allowed, in the " - LayoutInline {STRONG} at (0,0) size 23x19 - LayoutText {#text} at (548,20) size 23x19 - text run at (548,20) width 23: "last" - LayoutText {#text} at (571,20) size 747x39 - text run at (571,20) width 176: " line in which the inline box" - text run at (0,40) width 52: "appears." - LayoutTable {TABLE} at (0,247) size 784x174 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x172 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x144 - LayoutTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 193x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "one" - LayoutText {#text} at (733,0) size 738x39 - text run at (733,0) width 5: "," - text run at (0,20) width 568: "which should result in 25-pixel right padding (which should also be light blue) only in the " - LayoutInline {STRONG} at (0,0) size 23x19 - LayoutText {#text} at (568,20) size 23x19 - text run at (568,20) width 23: "last" - LayoutText {#text} at (591,20) size 739x39 - text run at (591,20) width 148: " line in which the inline" - text run at (0,40) width 80: "box appears." - LayoutBlockFlow {P} at (4,80) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 542x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 155: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 168x19 [bgcolor=#00FFFF] - LayoutText {#text} at (541,0) size 144x19 - text run at (541,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (684,3) size 25x16 - text run at (684,3) width 25: "two" - LayoutText {#text} at (708,0) size 756x39 - text run at (708,0) width 48: ", which" - text run at (0,20) width 548: "should result in no right padding, since negative padding values are not allowed, in the " - LayoutInline {STRONG} at (0,0) size 23x19 - LayoutText {#text} at (548,20) size 23x19 - text run at (548,20) width 23: "last" - LayoutText {#text} at (571,20) size 747x39 - text run at (571,20) width 176: " line in which the inline box" - text run at (0,40) width 52: "appears." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top-expected.png deleted file mode 100644 index 8a16987..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt deleted file mode 100644 index 174b7f4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt +++ /dev/null
@@ -1,93 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1518 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1518 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1518.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1502.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 408x96 - text run at (0,0) width 392: ".zero {background-color: silver; padding-top: 0;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".one {padding-top: 0.5in; background-color: aqua;}" - text run at (400,16) width 0: " " - text run at (0,32) width 392: ".two {padding-top: 25px; background-color: aqua;}" - text run at (392,32) width 0: " " - text run at (0,48) width 400: ".three {padding-top: 5em; background-color: aqua;}" - text run at (400,48) width 0: " " - text run at (0,64) width 392: ".four {padding-top: 25%; background-color: aqua;}" - text run at (392,64) width 0: " " - text run at (0,80) width 408: ".five {padding-top: -20px; background-color: aqua;}" - text run at (408,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,48) size 737x39 - text run at (0,48) width 633: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (633,48) width 104: "Both the content" - text run at (0,68) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,303) size 769x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,25) size 720x39 - text run at (0,25) width 616: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (616,25) width 104: "Both the content" - text run at (0,45) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,384) size 769x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,80) size 694x39 - text run at (0,80) width 590: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (590,80) width 104: "Both the content" - text run at (0,100) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,520) size 769x232.25 [bgcolor=#00FFFF] - LayoutText {#text} at (0,192) size 763x40 - text run at (0,192) width 732: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (732,192) width 31: "Both" - text run at (0,212) width 433: "the content background and the padding should be aqua (light blue). " - text run at (433,212) width 264: "This will require extra text in order to test." - LayoutBlockFlow {P} at (0,768.25) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 748x39 - text run at (0,0) width 565: "This element should have no top padding, since negative padding values are not allowed. " - text run at (565,0) width 183: "Both the content background" - text run at (0,20) width 325: "and the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,824.25) size 769x678 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x676 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x648 - LayoutTableCell {TD} at (0,338) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x647.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,48) size 737x39 - text run at (0,48) width 633: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (633,48) width 104: "Both the content" - text run at (0,68) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,144) size 747x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,25) size 720x39 - text run at (0,25) width 616: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (616,25) width 104: "Both the content" - text run at (0,45) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,225) size 747x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,80) size 694x39 - text run at (0,80) width 590: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (590,80) width 104: "Both the content" - text run at (0,100) width 356: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,361) size 747x226.75 [bgcolor=#00FFFF] - LayoutText {#text} at (0,186) size 732x40 - text run at (0,186) width 728: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element." - text run at (0,206) width 468: "Both the content background and the padding should be aqua (light blue). " - text run at (468,206) width 264: "This will require extra text in order to test." - LayoutBlockFlow {P} at (4,603.75) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 669x39 - text run at (0,0) width 565: "This element should have no top padding, since negative padding values are not allowed. " - text run at (565,0) width 104: "Both the content" - text run at (0,20) width 404: "background and the normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png deleted file mode 100644 index 7eaa7c7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt deleted file mode 100644 index 643a2d8f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 400x48 - text run at (0,0) width 392: ".one {padding-top: 25px; background-color: aqua;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".two {padding-top: -10px; background-color: aqua;}" - text run at (400,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "one" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 228: "background and a 25px top padding" - LayoutText {#text} at (228,20) size 767x59 - text run at (228,20) width 8: ". " - text run at (236,20) width 531: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 267: "element should have the same line-height. " - text run at (267,40) width 488: "There may be implementation-specific limits on how much of the padding the" - text run at (0,60) width 176: "user agent is able to display." - LayoutBlockFlow {P} at (0,211) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 498: "background and no top padding, since negative padding values are not allowed" - LayoutText {#text} at (498,20) size 772x39 - text run at (498,20) width 8: ". " - text run at (506,20) width 266: "Padding on inline elements does not affect" - text run at (0,40) width 528: "line-height calculations, so all lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,287) size 784x194 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x192 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x164 - LayoutTableCell {TD} at (0,96) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x64 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "one" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 228: "background and a 25px top padding" - LayoutText {#text} at (228,20) size 758x59 - text run at (228,20) width 8: ". " - text run at (236,20) width 505: "Padding on inline elements does not affect line-height calculations, so all lines in" - text run at (0,40) width 293: "this element should have the same line-height. " - text run at (293,40) width 465: "There may be implementation-specific limits on how much of the padding" - text run at (0,60) width 199: "the user agent is able to display." - LayoutBlockFlow {P} at (4,100) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 388: "This element is unstyled save for a background color of gray. " - text run at (387,0) width 89: "It contains an " - LayoutInline {SPAN} at (0,0) size 756x39 [bgcolor=#00FFFF] - LayoutText {#text} at (475,0) size 144x19 - text run at (475,0) width 144: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (618,3) size 25x16 - text run at (618,3) width 25: "two" - LayoutText {#text} at (642,0) size 756x39 - text run at (642,0) width 114: ", giving it an aqua" - text run at (0,20) width 498: "background and no top padding, since negative padding values are not allowed" - LayoutText {#text} at (498,20) size 733x39 - text run at (498,20) width 8: ". " - text run at (506,20) width 227: "Padding on inline elements does not" - text run at (0,40) width 567: "affect line-height calculations, so all lines in this element should have the same line-height." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/width-expected.png deleted file mode 100644 index 0cf4ab3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/width-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/width-expected.txt deleted file mode 100644 index a2825eb..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/box_properties/width-expected.txt +++ /dev/null
@@ -1,87 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1391 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1391 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1390.50 - LayoutBlockFlow {BODY} at (8,8) size 769x1374.50 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x48 - LayoutText {#text} at (0,0) size 152x48 - text run at (0,0) width 152: ".one {width: 50px;}" - text run at (152,0) width 0: " " - text run at (0,16) width 144: ".two {width: 50%;}" - text run at (144,16) width 0: " " - text run at (0,32) width 152: "TABLE {width: 50%;}" - text run at (152,32) width 0: " " - LayoutBlockFlow (anonymous) at (0,107) size 769x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,173) size 769x20 - LayoutText {#text} at (0,0) size 287x19 - text run at (0,0) width 287: "The square above should be fifty pixels wide." - LayoutBlockFlow (anonymous) at (0,209) size 769x384.50 - LayoutImage {IMG} at (0,0) size 384.50x384.50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,609.50) size 769x20 - LayoutText {#text} at (0,0) size 671x19 - text run at (0,0) width 671: "The square above should be half as wide as the image's parent element (either the BODY or the table cell)." - LayoutBlockFlow {P} at (0,645.50) size 384.50x100 - LayoutText {#text} at (0,0) size 382x79 - text run at (0,0) width 382: "This paragraph should be half the width of its parent element" - text run at (0,20) width 379: "(either the BODY or the table, which should itself be half as" - text run at (0,40) width 188: "wide as the BODY element). " - text run at (188,40) width 178: "This is extra text included to" - text run at (0,60) width 246: "ensure that this will be a fair test of the " - LayoutInline {CODE} at (0,0) size 40x16 - LayoutText {#text} at (246,63) size 40x16 - text run at (246,63) width 40: "width" - LayoutText {#text} at (286,60) size 373x39 - text run at (286,60) width 57: " property" - text run at (0,80) width 373: "without the need for the user to resize the viewing window." - LayoutTable {TABLE} at (0,761.50) size 384x613 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 382x611 - LayoutTableRow {TR} at (0,0) size 382x28 - LayoutTableCell {TD} at (0,0) size 382x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 382x583 - LayoutTableCell {TD} at (0,305) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 370x583 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (4,4) size 362x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,70) size 362x20 - LayoutText {#text} at (0,0) size 287x19 - text run at (0,0) width 287: "The square above should be fifty pixels wide." - LayoutBlockFlow (anonymous) at (4,106) size 362x181 - LayoutImage {IMG} at (0,0) size 181x181 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,303) size 362x40 - LayoutText {#text} at (0,0) size 348x39 - text run at (0,0) width 348: "The square above should be half as wide as the image's" - text run at (0,20) width 319: "parent element (either the BODY or the table cell)." - LayoutBlockFlow {P} at (4,359) size 181x220 - LayoutText {#text} at (0,0) size 177x179 - text run at (0,0) width 160: "This paragraph should be" - text run at (0,20) width 165: "half the width of its parent" - text run at (0,40) width 167: "element (either the BODY" - text run at (0,60) width 163: "or the table, which should" - text run at (0,80) width 169: "itself be half as wide as the" - text run at (0,100) width 113: "BODY element). " - text run at (113,100) width 42: "This is" - text run at (0,120) width 177: "extra text included to ensure" - text run at (0,140) width 174: "that this will be a fair test of" - text run at (0,160) width 23: "the " - LayoutInline {CODE} at (0,0) size 40x16 - LayoutText {#text} at (23,163) size 40x16 - text run at (23,163) width 40: "width" - LayoutText {#text} at (63,160) size 173x59 - text run at (63,160) width 109: " property without" - text run at (0,180) width 144: "the need for the user to" - text run at (0,200) width 173: "resize the viewing window." -layer at (8,105) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/cascade_order-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/cascade_order-expected.png deleted file mode 100644 index 37baba9d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/cascade_order-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt deleted file mode 100644 index c6fb7ba60..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt +++ /dev/null
@@ -1,143 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 849 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x849 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x849 - LayoutBlockFlow {BODY} at (8,8) size 769x833 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 576x176 - text run at (0,0) width 576: "<LINK rel=\"stylesheet\" type=\"text/css\" HREF=\"../resources/linktest.css\">" - text run at (576,0) width 0: " " - text run at (0,16) width 152: "LI {color: purple;}" - text run at (152,16) width 0: " " - text run at (0,32) width 160: "UL LI {color: blue;}" - text run at (160,32) width 0: " " - text run at (0,48) width 184: "UL LI LI {color: gray;}" - text run at (184,48) width 0: " " - text run at (0,64) width 176: "LI.red {color: green;}" - text run at (176,64) width 0: " " - text run at (0,80) width 216: "UL LI.mar {color: #660000;}" - text run at (216,80) width 0: " " - text run at (0,96) width 200: "UL LI#gre {color: green;}" - text run at (200,96) width 0: " " - text run at (0,112) width 160: ".test {color: blue;}" - text run at (160,112) width 0: " " - text run at (0,128) width 176: ".test {color: purple;}" - text run at (176,128) width 0: " " - text run at (0,144) width 296: ".one {text-decoration: line-through;}" - text run at (296,144) width 0: " " - text run at (0,160) width 0: " " - LayoutBlockFlow {UL} at (0,243) size 769x160 - LayoutListItem {LI} at (40,0) size 729x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 189x19 - text run at (0,0) width 189: "This list item should be blue..." - LayoutListItem {LI} at (40,20) size 729x80 [color=#0000FF] - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 289x19 - text run at (0,0) width 289: "...and so should this; neither should be purple." - LayoutBlockFlow {UL} at (0,20) size 729x60 - LayoutListItem {LI} at (40,0) size 689x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 189x19 - text run at (0,0) width 189: "This list item should be gray..." - LayoutListItem {LI} at (40,20) size 689x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...as should this...." - LayoutListItem {LI} at (40,40) size 689x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "...but this one should be green." - LayoutListItem {LI} at (40,100) size 729x20 [color=#660000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 171x19 - text run at (0,0) width 171: "This ought to be dark red..." - LayoutListItem {LI} at (40,120) size 729x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 85x19 - text run at (0,0) width 85: "...this green..." - LayoutListItem {LI} at (40,140) size 729x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 96x19 - text run at (0,0) width 96: "...and this blue." - LayoutBlockFlow {P} at (0,419) size 769x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "This sentence should be blue (STYLE attr.)." - LayoutBlockFlow {P} at (0,455) size 769x20 [color=#800080] - LayoutText {#text} at (0,0) size 204x19 - text run at (0,0) width 204: "This sentence should be purple [" - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (204,3) size 96x16 - text run at (204,3) width 96: "class=\"test\"" - LayoutText {#text} at (300,0) size 9x19 - text run at (300,0) width 9: "]." - LayoutBlockFlow {P} at (0,491) size 769x20 - LayoutText {#text} at (0,0) size 683x19 - text run at (0,0) width 683: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." - LayoutTable {TABLE} at (0,527) size 705x306 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 703x304 - LayoutTableRow {TR} at (0,0) size 703x28 - LayoutTableCell {TD} at (0,0) size 703x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 703x276 - LayoutTableCell {TD} at (0,152) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 691x276 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 683x160 - LayoutListItem {LI} at (40,0) size 643x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 189x19 - text run at (0,0) width 189: "This list item should be blue..." - LayoutListItem {LI} at (40,20) size 643x80 [color=#0000FF] - LayoutBlockFlow (anonymous) at (0,0) size 643x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 289x19 - text run at (0,0) width 289: "...and so should this; neither should be purple." - LayoutBlockFlow {UL} at (0,20) size 643x60 - LayoutListItem {LI} at (40,0) size 603x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 189x19 - text run at (0,0) width 189: "This list item should be gray..." - LayoutListItem {LI} at (40,20) size 603x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...as should this...." - LayoutListItem {LI} at (40,40) size 603x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "...but this one should be green." - LayoutListItem {LI} at (40,100) size 643x20 [color=#660000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 171x19 - text run at (0,0) width 171: "This ought to be dark red..." - LayoutListItem {LI} at (40,120) size 643x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 85x19 - text run at (0,0) width 85: "...this green..." - LayoutListItem {LI} at (40,140) size 643x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 96x19 - text run at (0,0) width 96: "...and this blue." - LayoutBlockFlow {P} at (4,180) size 683x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "This sentence should be blue (STYLE attr.)." - LayoutBlockFlow {P} at (4,216) size 683x20 [color=#800080] - LayoutText {#text} at (0,0) size 204x19 - text run at (0,0) width 204: "This sentence should be purple [" - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (204,3) size 96x16 - text run at (204,3) width 96: "class=\"test\"" - LayoutText {#text} at (300,0) size 9x19 - text run at (300,0) width 9: "]." - LayoutBlockFlow {P} at (4,252) size 683x20 - LayoutText {#text} at (0,0) size 683x19 - text run at (0,0) width 683: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/important-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/important-expected.png deleted file mode 100644 index ddbf65eb..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/important-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/important-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/important-expected.txt deleted file mode 100644 index 56bb801..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/cascade/important-expected.txt +++ /dev/null
@@ -1,69 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 232x64 - text run at (0,0) width 232: "P {color: green ! important;}" - text run at (232,0) width 0: " " - text run at (0,16) width 120: "P {color: red;}" - text run at (120,16) width 0: " " - text run at (0,32) width 176: "P#id1 {color: purple;}" - text run at (176,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x40 [color=#008000] - LayoutText {#text} at (0,0) size 767x39 - text run at (0,0) width 767: "This sentence should be green, because the declaration marked important should override any other normal declaration for" - text run at (0,20) width 355: "the same element, even if it occurs later in the stylesheet." - LayoutBlockFlow {P} at (0,187) size 784x40 [color=#008000] - LayoutText {#text} at (0,0) size 403x19 - text run at (0,0) width 403: "This sentence should also be green, even though it has an ID of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (403,3) size 24x16 - text run at (403,3) width 24: "id1" - LayoutText {#text} at (427,0) size 781x39 - text run at (427,0) width 258: ", which would ordinarily make it purple. " - text run at (685,0) width 96: "This is because" - text run at (0,20) width 645: "declarations marked important have more weight than normal declarations given in a STYLE attribute." - LayoutBlockFlow {P} at (0,243) size 784x40 [color=#008000] - LayoutText {#text} at (0,0) size 779x39 - text run at (0,0) width 604: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (604,0) width 175: "This is because declarations" - text run at (0,20) width 566: "marked important have more weight than normal declarations given in a STYLE attribute." - LayoutTable {TABLE} at (0,299) size 784x190 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x188 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x160 - LayoutTableCell {TD} at (0,94) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x160 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [color=#008000] - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "This sentence should be green, because the declaration marked important should override any other normal declaration" - text run at (0,20) width 377: "for the same element, even if it occurs later in the stylesheet." - LayoutBlockFlow {P} at (4,60) size 762x40 [color=#008000] - LayoutText {#text} at (0,0) size 403x19 - text run at (0,0) width 403: "This sentence should also be green, even though it has an ID of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (403,3) size 24x16 - text run at (403,3) width 24: "id1" - LayoutText {#text} at (427,0) size 727x39 - text run at (427,0) width 258: ", which would ordinarily make it purple. " - text run at (685,0) width 42: "This is" - text run at (0,20) width 699: "because declarations marked important have more weight than normal declarations given in a STYLE attribute." - LayoutBlockFlow {P} at (4,116) size 762x40 [color=#008000] - LayoutText {#text} at (0,0) size 700x39 - text run at (0,0) width 604: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (604,0) width 96: "This is because" - text run at (0,20) width 645: "declarations marked important have more weight than normal declarations given in a STYLE attribute." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/display-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/display-expected.png deleted file mode 100644 index 0735a99d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/display-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/display-expected.txt deleted file mode 100644 index 049d050d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/display-expected.txt +++ /dev/null
@@ -1,130 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 873 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x873 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x873 - LayoutBlockFlow {BODY} at (8,8) size 769x857 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x80 - LayoutText {#text} at (0,0) size 568x80 - text run at (0,0) width 176: ".one {display: block;}" - text run at (176,0) width 0: " " - text run at (0,16) width 184: ".two {display: inline;}" - text run at (184,16) width 0: " " - text run at (0,32) width 568: ".three {display: list-item; list-style-type: square; margin-left: 3em;}" - text run at (568,32) width 0: " " - text run at (0,48) width 272: ".four {display: none; color: red;}" - text run at (272,48) width 0: " " - text run at (0,64) width 152: "I {display: block;}" - text run at (152,64) width 0: " " - LayoutBlockFlow {P} at (0,147) size 769x20 - LayoutText {#text} at (0,0) size 293x19 - text run at (0,0) width 293: "This sentence should be a block-level element." - LayoutBlockFlow (anonymous) at (0,183) size 769x60 - LayoutInline {P} at (0,0) size 448x19 - LayoutText {#text} at (0,0) size 448x19 - text run at (0,0) width 448: "This sentence should be part of an inline element, as are the next three. " - LayoutInline {P} at (0,0) size 766x59 - LayoutText {#text} at (448,0) size 766x59 - text run at (448,0) width 274: "This sentence and the next two are part of a" - text run at (0,20) width 144: "second inline element. " - text run at (144,20) width 622: "They should therefore appear, along with the sentence above, to be all one paragraph which is four" - text run at (0,40) width 100: "sentences long. " - text run at (100,40) width 250: "If this is not the case, then the keyword " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (350,43) size 48x16 - text run at (350,43) width 48: "inline" - LayoutText {#text} at (398,40) size 109x19 - text run at (398,40) width 109: " is being ignored." - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {P} at (48,259) size 721x60 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 715x39 - text run at (0,0) width 715: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list items" - text run at (0,20) width 18: "(if " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (18,23) size 120x16 - text run at (18,23) width 120: "list-style-type" - LayoutText {#text} at (138,20) size 721x39 - text run at (138,20) width 359: " is supported, there will be a square for the item marker). " - text run at (497,20) width 224: "A 3em left margin has been applied" - text run at (0,40) width 376: "in order to ensure that there is space for the list-item marker." - LayoutBlockFlow {P} at (0,335) size 769x20 - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 456: "The next paragraph should be invisible (if it's visible, you'll see red text)." - LayoutBlockFlow {P} at (0,371) size 769x20 - LayoutText {#text} at (0,0) size 247x19 - text run at (0,0) width 247: "There should be no text after the colon:" - LayoutBlockFlow {P} at (0,407) size 769x60 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 112x19 - text run at (0,0) width 112: "The italicized text" - LayoutBlockFlow {I} at (0,20) size 769x20 - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "in this paragraph" - LayoutBlockFlow (anonymous) at (0,40) size 769x20 - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "should be a block-level element." - LayoutTable {TABLE} at (0,483) size 769x374 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x372 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x344 - LayoutTableCell {TD} at (0,186) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x344 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 293x19 - text run at (0,0) width 293: "This sentence should be a block-level element." - LayoutBlockFlow (anonymous) at (4,40) size 747x60 - LayoutInline {P} at (0,0) size 448x19 - LayoutText {#text} at (0,0) size 448x19 - text run at (0,0) width 448: "This sentence should be part of an inline element, as are the next three. " - LayoutInline {P} at (0,0) size 736x59 - LayoutText {#text} at (448,0) size 736x59 - text run at (448,0) width 274: "This sentence and the next two are part of a" - text run at (0,20) width 144: "second inline element. " - text run at (144,20) width 592: "They should therefore appear, along with the sentence above, to be all one paragraph which is" - text run at (0,40) width 130: "four sentences long. " - text run at (130,40) width 250: "If this is not the case, then the keyword " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (380,43) size 48x16 - text run at (380,43) width 48: "inline" - LayoutText {#text} at (428,40) size 109x19 - text run at (428,40) width 109: " is being ignored." - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {P} at (52,116) size 699x60 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 678x39 - text run at (0,0) width 678: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list" - text run at (0,20) width 55: "items (if " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (55,23) size 120x16 - text run at (55,23) width 120: "list-style-type" - LayoutText {#text} at (175,20) size 674x39 - text run at (175,20) width 359: " is supported, there will be a square for the item marker). " - text run at (534,20) width 140: "A 3em left margin has" - text run at (0,40) width 460: "been applied in order to ensure that there is space for the list-item marker." - LayoutBlockFlow {P} at (4,192) size 747x20 - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 456: "The next paragraph should be invisible (if it's visible, you'll see red text)." - LayoutBlockFlow {P} at (4,228) size 747x20 - LayoutText {#text} at (0,0) size 247x19 - text run at (0,0) width 247: "There should be no text after the colon:" - LayoutBlockFlow {P} at (4,264) size 747x60 - LayoutBlockFlow (anonymous) at (0,0) size 747x20 - LayoutText {#text} at (0,0) size 112x19 - text run at (0,0) width 112: "The italicized text" - LayoutBlockFlow {I} at (0,20) size 747x20 - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "in this paragraph" - LayoutBlockFlow (anonymous) at (0,40) size 747x20 - LayoutText {#text} at (0,0) size 203x19 - text run at (0,0) width 203: "should be a block-level element." -layer at (8,137) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style-expected.png deleted file mode 100644 index 50397b4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style-expected.txt deleted file mode 100644 index 4c4676f5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style-expected.txt +++ /dev/null
@@ -1,54 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 496x32 - text run at (0,0) width 304: ".one {list-style: upper-alpha inside;}" - text run at (304,0) width 0: " " - text run at (0,16) width 496: ".two {list-style: url(../resources/oransqr.gif) disc outside;}" - text run at (496,16) width 0: " " - LayoutBlockFlow {UL} at (0,99) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (0,0) size 20x19: "A" - LayoutText {#text} at (20,0) size 731x39 - text run at (20,0) width 711: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left margin," - text run at (0,20) width 286: "leaving no blank space beneath the capital-A." - LayoutBlockFlow {UL} at (0,155) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 736x39 - text run at (0,0) width 476: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (476,0) width 260: "Also, the bullet should be outside the text" - text run at (0,20) width 256: "block, as the list has been set to 'outside'." - LayoutTable {TABLE} at (0,211) size 784x150 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x148 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x120 - LayoutTableCell {TD} at (0,74) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x120 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (0,0) size 20x19: "A" - LayoutText {#text} at (20,0) size 679x39 - text run at (20,0) width 659: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left" - text run at (0,20) width 338: "margin, leaving no blank space beneath the capital-A." - LayoutBlockFlow {UL} at (4,60) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 709x39 - text run at (0,0) width 476: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (476,0) width 233: "Also, the bullet should be outside the" - text run at (0,20) width 283: "text block, as the list has been set to 'outside'." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_image-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_image-expected.png deleted file mode 100644 index fe5d4fd..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_image-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_image-expected.txt deleted file mode 100644 index b2b4173..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_image-expected.txt +++ /dev/null
@@ -1,81 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 440x48 - text run at (0,0) width 440: ".one {list-style-image: url(../resources/oransqr.gif);}" - text run at (440,0) width 0: " " - text run at (0,16) width 240: ".two {list-style-image: none;}" - text run at (240,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {UL} at (0,115) size 784x60 - LayoutListItem {LI} at (40,0) size 744x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 744x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 744x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 146x19 - text run at (0,0) width 146: "...images for each item." - LayoutBlockFlow {UL} at (0,191) size 784x60 - LayoutListItem {LI} at (40,0) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 231x19 - text run at (0,0) width 231: "...standard list markers for each item." - LayoutTable {TABLE} at (0,267) size 293x190 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 291x188 - LayoutTableRow {TR} at (0,0) size 291x28 - LayoutTableCell {TD} at (0,0) size 291x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 291x160 - LayoutTableCell {TD} at (0,94) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 279x160 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 271x60 - LayoutListItem {LI} at (40,0) size 231x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 231x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 231x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 146x19 - text run at (0,0) width 146: "...images for each item." - LayoutBlockFlow {UL} at (4,80) size 271x60 - LayoutListItem {LI} at (40,0) size 231x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 231x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 231x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 231x19 - text run at (0,0) width 231: "...standard list markers for each item." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_position-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_position-expected.png deleted file mode 100644 index 44839a39..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_position-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_position-expected.txt deleted file mode 100644 index 98bde63..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_position-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 288x48 - text run at (0,0) width 288: ".one {list-style-position: outside;}" - text run at (288,0) width 0: " " - text run at (0,16) width 280: ".two {list-style-position: inside;}" - text run at (280,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {UL} at (0,115) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank" - text run at (0,20) width 154: "space beneath the bullet." - LayoutBlockFlow {UL} at (0,171) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (-1,0) size 7x19: bullet - LayoutText {#text} at (22,0) size 710x39 - text run at (22,0) width 688: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin," - text run at (0,20) width 263: "leaving no blank space beneath the bullet." - LayoutTable {TABLE} at (0,227) size 784x150 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x148 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x120 - LayoutTableCell {TD} at (0,74) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x120 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 686x39 - text run at (0,0) width 686: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving" - text run at (0,20) width 193: "blank space beneath the bullet." - LayoutBlockFlow {UL} at (4,60) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (-1,0) size 7x19: bullet - LayoutText {#text} at (22,0) size 710x39 - text run at (22,0) width 688: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin," - text run at (0,20) width 263: "leaving no blank space beneath the bullet." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_type-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_type-expected.png deleted file mode 100644 index 2443af0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_type-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_type-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_type-expected.txt deleted file mode 100644 index 387eec5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/list_style_type-expected.txt +++ /dev/null
@@ -1,271 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1649 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1649 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1649 - LayoutBlockFlow {BODY} at (8,8) size 769x1633 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x160 - LayoutText {#text} at (0,0) size 304x160 - text run at (0,0) width 232: ".one {list-style-type: disc;}" - text run at (232,0) width 0: " " - text run at (0,16) width 248: ".two {list-style-type: circle;}" - text run at (248,16) width 0: " " - text run at (0,32) width 264: ".three {list-style-type: square;}" - text run at (264,32) width 0: " " - text run at (0,48) width 296: ".four {list-style-type: lower-roman;}" - text run at (296,48) width 0: " " - text run at (0,64) width 296: ".five {list-style-type: upper-roman;}" - text run at (296,64) width 0: " " - text run at (0,80) width 288: ".six {list-style-type: lower-alpha;}" - text run at (288,80) width 0: " " - text run at (0,96) width 304: ".seven {list-style-type: upper-alpha;}" - text run at (304,96) width 0: " " - text run at (0,112) width 272: ".eight {list-style-type: decimal;}" - text run at (272,112) width 0: " " - text run at (0,128) width 240: ".nine {list-style-type: none;}" - text run at (240,128) width 0: " " - text run at (0,144) width 0: " " - LayoutBlockFlow {UL} at (0,227) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 133x19 - text run at (0,0) width 133: "...discs for each item." - LayoutBlockFlow {UL} at (0,303) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 142x19 - text run at (0,0) width 142: "...circles for each item." - LayoutBlockFlow {UL} at (0,379) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "...squares for each item." - LayoutBlockFlow {OL} at (0,455) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-12,0) size 12x19: "i" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "ii" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-20,0) size 20x19: "iii" - LayoutText {#text} at (0,0) size 276x19 - text run at (0,0) width 276: "...lowercase Roman numerals for each item." - LayoutBlockFlow {OL} at (0,531) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-13,0) size 13x19: "I" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "II" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-23,0) size 23x19: "III" - LayoutText {#text} at (0,0) size 276x19 - text run at (0,0) width 276: "...uppercase Roman numerals for each item." - LayoutBlockFlow {OL} at (0,607) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "a" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "b" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "c" - LayoutText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "...lowercase letters for each item." - LayoutBlockFlow {OL} at (0,683) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-20,0) size 20x19: "A" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "B" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "C" - LayoutText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "...uppercase letters for each item." - LayoutBlockFlow {OL} at (0,759) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-20,0) size 20x19: "A" - LayoutText {#text} at (0,0) size 155x19 - text run at (0,0) width 155: "This list should feature..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "B" - LayoutText {#text} at (0,0) size 147x19 - text run at (0,0) width 147: "...letters for each item..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "...except this one." - LayoutBlockFlow {UL} at (0,835) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "...nothing for each item." - LayoutTable {TABLE} at (0,911) size 338x722 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 336x720 - LayoutTableRow {TR} at (0,0) size 336x28 - LayoutTableCell {TD} at (0,0) size 336x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 336x692 - LayoutTableCell {TD} at (0,360) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 324x692 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 133x19 - text run at (0,0) width 133: "...discs for each item." - LayoutBlockFlow {UL} at (4,80) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 142x19 - text run at (0,0) width 142: "...circles for each item." - LayoutBlockFlow {UL} at (4,156) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "...squares for each item." - LayoutBlockFlow {OL} at (4,232) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-12,0) size 12x19: "i" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "ii" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-20,0) size 20x19: "iii" - LayoutText {#text} at (0,0) size 276x19 - text run at (0,0) width 276: "...lowercase Roman numerals for each item." - LayoutBlockFlow {OL} at (4,308) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-13,0) size 13x19: "I" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "II" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-23,0) size 23x19: "III" - LayoutText {#text} at (0,0) size 276x19 - text run at (0,0) width 276: "...uppercase Roman numerals for each item." - LayoutBlockFlow {OL} at (4,384) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "a" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "b" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "c" - LayoutText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "...lowercase letters for each item." - LayoutBlockFlow {OL} at (4,460) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-20,0) size 20x19: "A" - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "B" - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "C" - LayoutText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "...uppercase letters for each item." - LayoutBlockFlow {OL} at (4,536) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutListMarker (anonymous) at (-20,0) size 20x19: "A" - LayoutText {#text} at (0,0) size 155x19 - text run at (0,0) width 155: "This list should feature..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "B" - LayoutText {#text} at (0,0) size 147x19 - text run at (0,0) width 147: "...letters for each item..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "...except this one." - LayoutBlockFlow {UL} at (4,612) size 316x60 - LayoutListItem {LI} at (40,0) size 276x20 - LayoutText {#text} at (0,0) size 62x19 - text run at (0,0) width 62: "This list..." - LayoutListItem {LI} at (40,20) size 276x20 - LayoutText {#text} at (0,0) size 113x19 - text run at (0,0) width 113: "...should feature..." - LayoutListItem {LI} at (40,40) size 276x20 - LayoutText {#text} at (0,0) size 150x19 - text run at (0,0) width 150: "...nothing for each item." -layer at (8,217) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,209) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/white_space-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/white_space-expected.png deleted file mode 100644 index b365602..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/white_space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/white_space-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/white_space-expected.txt deleted file mode 100644 index 242c504..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/classification/white_space-expected.txt +++ /dev/null
@@ -1,81 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 921 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 232x64 - text run at (0,0) width 192: ".one {white-space: pre;}" - text run at (192,0) width 0: " " - text run at (0,16) width 216: ".two {white-space: nowrap;}" - text run at (216,16) width 0: " " - text run at (0,32) width 232: ".three {white-space: normal;}" - text run at (232,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x100 - LayoutText {#text} at (0,0) size 568x99 - text run at (0,0) width 0: " " - text run at (0,20) width 568: "This sentence should show extra space where there would ordinarily not be any." - text run at (567,20) width 1: " " - text run at (0,40) width 296: " There should also be preservation of returns" - text run at (296,40) width 0: " " - text run at (0,60) width 97: "as this sentence" - text run at (97,60) width 0: " " - text run at (0,80) width 184: " very clearly demonstrates." - text run at (184,80) width 0: " " - LayoutBlockFlow {P} at (0,247) size 784x20 - LayoutText {#text} at (0,0) size 891x19 - text run at (0,0) width 891: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - LayoutBlockFlow {P} at (0,283) size 784x40 - LayoutText {#text} at (0,0) size 296x39 - text run at (0,0) width 0: " " - text run at (0,20) width 296: "This sentence should show extra space, " - LayoutInline {SPAN} at (0,0) size 156x19 - LayoutText {#text} at (296,20) size 156x19 - text run at (296,20) width 84: "except in the " - text run at (380,20) width 72: "second half" - LayoutText {#text} at (452,20) size 4x19 - text run at (452,20) width 4: "." - text run at (456,20) width 0: " " - LayoutTable {TABLE} at (0,339) size 913x230 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 911x228 - LayoutTableRow {TR} at (0,0) size 911x28 - LayoutTableCell {TD} at (0,0) size 911x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 911x200 - LayoutTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 899x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 891x100 - LayoutText {#text} at (0,0) size 568x99 - text run at (0,0) width 0: " " - text run at (0,20) width 568: "This sentence should show extra space where there would ordinarily not be any." - text run at (567,20) width 1: " " - text run at (0,40) width 296: " There should also be preservation of returns" - text run at (296,40) width 0: " " - text run at (0,60) width 97: "as this sentence" - text run at (97,60) width 0: " " - text run at (0,80) width 184: " very clearly demonstrates." - text run at (184,80) width 0: " " - LayoutBlockFlow {P} at (4,120) size 891x20 - LayoutText {#text} at (0,0) size 891x19 - text run at (0,0) width 891: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - LayoutBlockFlow {P} at (4,156) size 891x40 - LayoutText {#text} at (0,0) size 296x39 - text run at (0,0) width 0: " " - text run at (0,20) width 296: "This sentence should show extra space, " - LayoutInline {SPAN} at (0,0) size 156x19 - LayoutText {#text} at (296,20) size 156x19 - text run at (296,20) width 84: "except in the " - text run at (380,20) width 72: "second half" - LayoutText {#text} at (452,20) size 4x19 - text run at (452,20) width 4: "." - text run at (456,20) width 0: " " -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background-expected.png deleted file mode 100644 index 089897e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background-expected.txt deleted file mode 100644 index 6b255d11..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background-expected.txt +++ /dev/null
@@ -1,91 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 777 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x777 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x777 - LayoutBlockFlow {BODY} at (8,8) size 769x761 [bgcolor=#008000] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 648x64 - text run at (0,0) width 648: "BODY {background: green url(../resources/oransqr.gif) repeat-x center top fixed;}" - text run at (648,0) width 0: " " - text run at (0,16) width 568: ".one {background: lime url(../resources/oransqr.gif) repeat-y 100% 0%;}" - text run at (568,16) width 0: " " - text run at (0,32) width 592: ".two {background: lime url(../resources/oransqr.gif) repeat-y center top;}" - text run at (592,32) width 0: " " - text run at (0,48) width 592: ".three {background: lime url(../resources/oransqr.gif) repeat-x left top;}" - text run at (592,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x60 - LayoutText {#text} at (0,0) size 728x19 - text run at (0,0) width 728: "This document should have a green background with an orange strip running across the entire top of the page, since" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "repeat-x" - LayoutText {#text} at (64,20) size 753x39 - text run at (64,20) width 298: " indicates tiling in both directions of the x-axis. " - text run at (362,20) width 298: "Furthermore, the strip should be fixed in place. " - text run at (660,20) width 93: "I'll have to add" - text run at (0,40) width 491: "extra text at the end of this page to make it long enough to scroll conveniently." - LayoutBlockFlow {P} at (0,207) size 769x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 762x59 - text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,20) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 119: "these declarations. " - text run at (119,40) width 306: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (0,283) size 769x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 762x59 - text run at (0,0) width 752: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." - text run at (0,20) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 119: "these declarations. " - text run at (119,40) width 306: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (0,359) size 769x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 762x59 - text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,20) width 762: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 119: "these declarations. " - text run at (119,40) width 306: "Hey, I didn't say the page would be pretty, did I?" - LayoutTable {TABLE} at (0,435) size 769x326 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x324 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x296 - LayoutTableCell {TD} at (0,162) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x296 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutText {#text} at (0,0) size 728x19 - text run at (0,0) width 728: "This document should have a green background with an orange strip running across the entire top of the page, since" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "repeat-x" - LayoutText {#text} at (64,20) size 726x39 - text run at (64,20) width 298: " indicates tiling in both directions of the x-axis. " - text run at (362,20) width 298: "Furthermore, the strip should be fixed in place. " - text run at (660,20) width 66: "I'll have to" - text run at (0,40) width 518: "add extra text at the end of this page to make it long enough to scroll conveniently." - LayoutBlockFlow {P} at (4,80) size 747x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 743x59 - text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,20) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" - text run at (0,40) width 178: "handling these declarations. " - text run at (178,40) width 306: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (4,156) size 747x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 739x59 - text run at (0,0) width 700: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the" - text run at (0,20) width 52: "bottom. " - text run at (52,20) width 687: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser" - text run at (0,40) width 194: "in handling these declarations. " - text run at (194,40) width 306: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (4,232) size 747x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 743x59 - text run at (0,0) width 743: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,20) width 703: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" - text run at (0,40) width 178: "handling these declarations. " - text run at (178,40) width 306: "Hey, I didn't say the page would be pretty, did I?" -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.png deleted file mode 100644 index b660bb6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt deleted file mode 100644 index b1aaa57..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt +++ /dev/null
@@ -1,184 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 880 scrollHeight 1279 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1279 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1278.53 - LayoutBlockFlow {BODY} at (8,8) size 784x1262.53 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 872x32 - text run at (0,0) width 872: "BODY {background-image: url(../resources/bg.gif); background-repeat: repeat-x; background-attachment: fixed;}" - text run at (872,0) width 0: " " - text run at (0,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x100 - LayoutText {#text} at (0,0) size 780x99 - text run at (0,0) width 763: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does" - text run at (0,20) width 201: "NOT scroll with the document. " - text run at (201,20) width 575: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when the" - text run at (0,40) width 172: "end of the page is reached. " - text run at (172,40) width 608: "In addition, the default Test Suite background should NOT appear, as it's been overridden by the" - text run at (0,60) width 131: "styles shown above. " - text run at (131,60) width 644: "I'll have to add a lot of extra text to the page in order to make all this something we can actually check." - text run at (0,80) width 226: "Don't worry, I'll think of something." - LayoutBlockFlow {P} at (0,215) size 784x20 - LayoutText {#text} at (0,0) size 508x19 - text run at (0,0) width 417: "In fact, why not the relevant section from the CSS1 specification? " - text run at (417,0) width 91: "A capital idea." - LayoutBlockFlow {H4} at (0,284.27) size 784x20 - LayoutInline {A} at (0,0) size 220x19 - LayoutText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "5.3.5 'background-attachment'" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,325.53) size 784x100 - LayoutInline {EM} at (0,0) size 41x19 - LayoutText {#text} at (0,0) size 41x19 - text run at (0,0) width 41: "Value:" - LayoutText {#text} at (40,0) size 82x19 - text run at (40,0) width 82: " scroll | fixed" - LayoutBR {BR} at (121,15) size 1x0 - LayoutInline {EM} at (0,0) size 42x19 - LayoutText {#text} at (0,20) size 42x19 - text run at (0,20) width 42: "Initial:" - LayoutText {#text} at (42,20) size 38x19 - text run at (42,20) width 38: " scroll" - LayoutBR {BR} at (80,35) size 0x0 - LayoutInline {EM} at (0,0) size 68x19 - LayoutText {#text} at (0,40) size 68x19 - text run at (0,40) width 68: "Applies to:" - LayoutText {#text} at (68,40) size 78x19 - text run at (68,40) width 78: " all elements" - LayoutBR {BR} at (146,55) size 0x0 - LayoutInline {EM} at (0,0) size 62x19 - LayoutText {#text} at (0,60) size 62x19 - text run at (0,60) width 62: "Inherited:" - LayoutText {#text} at (62,60) size 20x19 - text run at (62,60) width 20: " no" - LayoutBR {BR} at (82,75) size 0x0 - LayoutInline {EM} at (0,0) size 121x19 - LayoutText {#text} at (0,80) size 121x19 - text run at (0,80) width 121: "Percentage values:" - LayoutText {#text} at (120,80) size 33x19 - text run at (120,80) width 33: " N/A" - LayoutBR {BR} at (152,95) size 1x0 - LayoutBlockFlow {P} at (0,441.53) size 784x40 - LayoutText {#text} at (0,0) size 782x39 - text run at (0,0) width 782: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas or" - text run at (0,20) width 213: "if it scrolls along with the content." - LayoutBlockFlow {PRE} at (0,497.53) size 784x80 - LayoutText {#text} at (0,0) size 296x80 - text run at (0,0) width 72: " BODY { " - text run at (72,0) width 0: " " - text run at (0,16) width 296: " background: red url(pendant.gif);" - text run at (296,16) width 0: " " - text run at (0,32) width 256: " background-repeat: repeat-y;" - text run at (256,32) width 0: " " - text run at (0,48) width 264: " background-attachment: fixed;" - text run at (264,48) width 0: " " - text run at (0,64) width 24: " }" - text run at (24,64) width 0: " " - LayoutBlockFlow {P} at (0,593.53) size 784x60 - LayoutInline {EM} at (0,0) size 72x19 - LayoutText {#text} at (0,0) size 72x19 - text run at (0,0) width 72: "CSS1 core:" - LayoutText {#text} at (71,0) size 767x59 - text run at (71,0) width 670: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" - text run at (0,20) width 767: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that support" - text run at (0,40) width 42: "'fixed'." - LayoutTable {TABLE} at (0,669.53) size 784x593 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x591 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x563 - LayoutTableCell {TD} at (0,295) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x562.53 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x100 - LayoutText {#text} at (0,0) size 747x99 - text run at (0,0) width 730: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which" - text run at (0,20) width 234: "does NOT scroll with the document. " - text run at (234,20) width 513: "It should, instead, appear to be a fixed pattern past which the content scrolls, even" - text run at (0,40) width 234: "when the end of the page is reached. " - text run at (234,40) width 493: "In addition, the default Test Suite background should NOT appear, as it's been" - text run at (0,60) width 246: "overridden by the styles shown above. " - text run at (246,60) width 497: "I'll have to add a lot of extra text to the page in order to make all this something" - text run at (0,80) width 147: "we can actually check. " - text run at (147,80) width 226: "Don't worry, I'll think of something." - LayoutBlockFlow {P} at (4,120) size 762x20 - LayoutText {#text} at (0,0) size 508x19 - text run at (0,0) width 417: "In fact, why not the relevant section from the CSS1 specification? " - text run at (417,0) width 91: "A capital idea." - LayoutBlockFlow {H4} at (4,189.27) size 762x20 - LayoutInline {A} at (0,0) size 220x19 - LayoutText {#text} at (0,0) size 220x19 - text run at (0,0) width 220: "5.3.5 'background-attachment'" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,230.53) size 762x100 - LayoutInline {EM} at (0,0) size 41x19 - LayoutText {#text} at (0,0) size 41x19 - text run at (0,0) width 41: "Value:" - LayoutText {#text} at (40,0) size 82x19 - text run at (40,0) width 82: " scroll | fixed" - LayoutBR {BR} at (121,15) size 1x0 - LayoutInline {EM} at (0,0) size 42x19 - LayoutText {#text} at (0,20) size 42x19 - text run at (0,20) width 42: "Initial:" - LayoutText {#text} at (42,20) size 38x19 - text run at (42,20) width 38: " scroll" - LayoutBR {BR} at (80,35) size 0x0 - LayoutInline {EM} at (0,0) size 68x19 - LayoutText {#text} at (0,40) size 68x19 - text run at (0,40) width 68: "Applies to:" - LayoutText {#text} at (68,40) size 78x19 - text run at (68,40) width 78: " all elements" - LayoutBR {BR} at (146,55) size 0x0 - LayoutInline {EM} at (0,0) size 62x19 - LayoutText {#text} at (0,60) size 62x19 - text run at (0,60) width 62: "Inherited:" - LayoutText {#text} at (62,60) size 20x19 - text run at (62,60) width 20: " no" - LayoutBR {BR} at (82,75) size 0x0 - LayoutInline {EM} at (0,0) size 121x19 - LayoutText {#text} at (0,80) size 121x19 - text run at (0,80) width 121: "Percentage values:" - LayoutText {#text} at (120,80) size 33x19 - text run at (120,80) width 33: " N/A" - LayoutBR {BR} at (152,95) size 1x0 - LayoutBlockFlow {P} at (4,346.53) size 762x40 - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the" - text run at (0,20) width 277: "canvas or if it scrolls along with the content." - LayoutBlockFlow {PRE} at (4,402.53) size 762x80 - LayoutText {#text} at (0,0) size 296x80 - text run at (0,0) width 72: " BODY { " - text run at (72,0) width 0: " " - text run at (0,16) width 296: " background: red url(pendant.gif);" - text run at (296,16) width 0: " " - text run at (0,32) width 256: " background-repeat: repeat-y;" - text run at (256,32) width 0: " " - text run at (0,48) width 264: " background-attachment: fixed;" - text run at (264,48) width 0: " " - text run at (0,64) width 24: " }" - text run at (24,64) width 0: " " - LayoutBlockFlow {P} at (4,498.53) size 762x60 - LayoutInline {EM} at (0,0) size 72x19 - LayoutText {#text} at (0,0) size 72x19 - text run at (0,0) width 72: "CSS1 core:" - LayoutText {#text} at (71,0) size 741x59 - text run at (71,0) width 670: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" - text run at (0,20) width 716: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that" - text run at (0,40) width 93: "support 'fixed'." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,259) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,251) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,269) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,261) size 784x2 [border: (1px inset #EEEEEE)] -layer at (25,863) size 762x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,156) size 762x2 [border: (1px inset #EEEEEE)] -layer at (25,873) size 762x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,166) size 762x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_color-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_color-expected.png deleted file mode 100644 index 9637cf72..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt deleted file mode 100644 index 8a60759..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt +++ /dev/null
@@ -1,84 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 296x64 - text run at (0,0) width 224: "P {background-color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 240: ".one {background-color: lime;}" - text run at (240,16) width 0: " " - text run at (0,32) width 296: ".two {background-color: transparent;}" - text run at (296,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 277x19 - text run at (0,0) width 277: "This element's background should be green." - LayoutBlockFlow {P} at (0,167) size 784x20 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 350x19 - text run at (0,0) width 350: "This element's background should be lime (light green)." - LayoutBlockFlow {P} at (0,203) size 784x60 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 652x19 - text run at (0,0) width 652: "This element's background should be green, and the last word in this sentence should also have a green " - LayoutInline {SPAN} at (0,0) size 75x19 - LayoutText {#text} at (652,0) size 75x19 - text run at (652,0) width 75: "background" - LayoutText {#text} at (727,0) size 778x59 - text run at (727,0) width 8: ". " - text run at (735,0) width 42: "This is" - text run at (0,20) width 778: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\"" - text run at (0,40) width 109: "which was set to " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (109,43) size 88x16 - text run at (109,43) width 88: "transparent" - LayoutText {#text} at (197,40) size 395x19 - text run at (197,40) width 8: ". " - text run at (205,40) width 387: "If the document background is visible, the browser is in error." - LayoutBlockFlow {P} at (0,279) size 784x20 - LayoutText {#text} at (0,0) size 744x19 - text run at (0,0) width 462: "This element should allow the document background to \"shine through.\" " - text run at (462,0) width 282: "There should be no green backgrounds here!" - LayoutTable {TABLE} at (0,315) size 784x206 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x204 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x176 - LayoutTableCell {TD} at (0,102) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x176 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 277x19 - text run at (0,0) width 277: "This element's background should be green." - LayoutBlockFlow {P} at (4,40) size 762x20 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 350x19 - text run at (0,0) width 350: "This element's background should be lime (light green)." - LayoutBlockFlow {P} at (4,76) size 762x60 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 652x19 - text run at (0,0) width 652: "This element's background should be green, and the last word in this sentence should also have a green " - LayoutInline {SPAN} at (0,0) size 75x19 - LayoutText {#text} at (652,0) size 75x19 - text run at (652,0) width 75: "background" - LayoutText {#text} at (727,0) size 748x59 - text run at (727,0) width 4: "." - text run at (0,20) width 748: "This is because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word" - text run at (0,40) width 185: "\"sentence,\" which was set to " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (185,43) size 88x16 - text run at (185,43) width 88: "transparent" - LayoutText {#text} at (273,40) size 395x19 - text run at (273,40) width 8: ". " - text run at (281,40) width 387: "If the document background is visible, the browser is in error." - LayoutBlockFlow {P} at (4,152) size 762x20 - LayoutText {#text} at (0,0) size 744x19 - text run at (0,0) width 462: "This element should allow the document background to \"shine through.\" " - text run at (462,0) width 282: "There should be no green backgrounds here!" -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_image-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_image-expected.png deleted file mode 100644 index 2f8cdc8..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt deleted file mode 100644 index 543ce73..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt +++ /dev/null
@@ -1,95 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 376x48 - text run at (0,0) width 376: "P {background-image: url(../resources/bg.gif);}" - text run at (376,0) width 0: " " - text run at (0,16) width 240: ".one {background-image: none;}" - text run at (240,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x40 - LayoutText {#text} at (0,0) size 746x39 - text run at (0,0) width 502: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (502,0) width 244: "The background image should also tile" - text run at (0,20) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - LayoutBlockFlow {P} at (0,171) size 784x80 - LayoutText {#text} at (0,0) size 596x19 - text run at (0,0) width 596: "This sentence should be backed by a repeated green-grid image, as should the last three words " - LayoutInline {STRONG} at (0,0) size 102x19 - LayoutInline {SPAN} at (0,0) size 102x19 - LayoutText {#text} at (596,0) size 102x19 - text run at (596,0) width 102: "in this sentence" - LayoutText {#text} at (698,0) size 770x39 - text run at (698,0) width 8: ". " - text run at (706,0) width 64: "If it is not," - text run at (0,20) width 31: "then " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (31,23) size 32x16 - text run at (31,23) width 32: "none" - LayoutText {#text} at (63,20) size 168x19 - text run at (63,20) width 163: " is interpreted incorrectly. " - text run at (225,20) width 6: "(" - LayoutInline {CODE} at (0,0) size 33x16 - LayoutText {#text} at (230,23) size 33x16 - text run at (230,23) width 33: "none" - LayoutText {#text} at (262,20) size 771x59 - text run at (262,20) width 503: " means that the element has no background image, allowing the parent to \"shine" - text run at (0,40) width 771: "through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be" - text run at (0,60) width 50: "visible.)" - LayoutBlockFlow {P} at (0,267) size 784x40 - LayoutText {#text} at (0,0) size 765x39 - text run at (0,0) width 765: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\"" - text run at (0,20) width 48: "instead." - LayoutTable {TABLE} at (0,323) size 784x230 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x228 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x200 - LayoutTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 - LayoutText {#text} at (0,0) size 746x39 - text run at (0,0) width 502: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (502,0) width 244: "The background image should also tile" - text run at (0,20) width 664: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - LayoutBlockFlow {P} at (4,60) size 762x80 - LayoutText {#text} at (0,0) size 596x19 - text run at (0,0) width 596: "This sentence should be backed by a repeated green-grid image, as should the last three words " - LayoutInline {STRONG} at (0,0) size 102x19 - LayoutInline {SPAN} at (0,0) size 102x19 - LayoutText {#text} at (596,0) size 102x19 - text run at (596,0) width 102: "in this sentence" - LayoutText {#text} at (698,0) size 742x39 - text run at (698,0) width 8: ". " - text run at (706,0) width 36: "If it is" - text run at (0,20) width 59: "not, then " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (59,23) size 32x16 - text run at (59,23) width 32: "none" - LayoutText {#text} at (91,20) size 168x19 - text run at (91,20) width 163: " is interpreted incorrectly. " - text run at (253,20) width 6: "(" - LayoutInline {CODE} at (0,0) size 33x16 - LayoutText {#text} at (258,23) size 33x16 - text run at (258,23) width 33: "none" - LayoutText {#text} at (290,20) size 750x59 - text run at (290,20) width 459: " means that the element has no background image, allowing the parent to" - text run at (0,40) width 750: "\"shine through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image" - text run at (0,60) width 115: "should be visible.)" - LayoutBlockFlow {P} at (4,156) size 762x40 - LayoutText {#text} at (0,0) size 705x39 - text run at (0,0) width 705: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine" - text run at (0,20) width 108: "through\" instead." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_position-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_position-expected.png deleted file mode 100644 index df4cca7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt deleted file mode 100644 index 6350d97..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt +++ /dev/null
@@ -1,149 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1573 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1573 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1573 - LayoutBlockFlow {BODY} at (8,8) size 769x1557 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x272 - LayoutText {#text} at (0,0) size 688x272 - text run at (0,0) width 648: "BODY {background-image: url(../resources/bg.gif); background-position: right top;" - text run at (648,0) width 0: " " - text run at (0,16) width 288: " background-repeat: no-repeat;}" - text run at (288,16) width 0: " " - text run at (0,32) width 624: ".one {background-image: url(../resources/bg.gif); background-position: center;" - text run at (624,32) width 0: " " - text run at (0,48) width 480: " background-repeat: no-repeat; background-color: aqua;}" - text run at (480,48) width 0: " " - text run at (0,64) width 632: ".two {background-image: url(../resources/bg.gif); background-position: 50% 50%;" - text run at (632,64) width 0: " " - text run at (0,80) width 480: " background-repeat: no-repeat; background-color: aqua;}" - text run at (480,80) width 0: " " - text run at (0,96) width 688: ".three {background-image: url(../resources/bg.gif); background-position: bottom right;" - text run at (688,96) width 0: " " - text run at (0,112) width 496: " background-repeat: no-repeat; background-color: aqua;}" - text run at (496,112) width 0: " " - text run at (0,128) width 656: ".four {background-image: url(../resources/bg.gif); background-position: 100% 100%;" - text run at (656,128) width 0: " " - text run at (0,144) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,144) width 0: " " - text run at (0,160) width 632: ".five {background-image: url(../resources/bg.gif); background-position: 0% 50%;" - text run at (632,160) width 0: " " - text run at (0,176) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,176) width 0: " " - text run at (0,192) width 632: ".six {background-image: url(../resources/bg.gif); background-position: 75% 25%;" - text run at (632,192) width 0: " " - text run at (0,208) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,208) width 0: " " - text run at (0,224) width 664: ".seven {background-image: url(../resources/bg.gif); background-position: 20px 20px;" - text run at (664,224) width 0: " " - text run at (0,240) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,240) width 0: " " - text run at (0,256) width 0: " " - LayoutBlockFlow {P} at (0,339) size 769x20 - LayoutText {#text} at (0,0) size 503x19 - text run at (0,0) width 503: "This document should have a single, small green image in its upper right corner." - LayoutBlockFlow {P} at (0,375) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 768x59 - text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,20) width 227: "fixed at the center of the paragraph. " - text run at (227,20) width 541: "The background color will make it easier to determine the edges of the paragraph, and" - text run at (0,40) width 262: "therefore allow you to calculate its center." - LayoutBlockFlow {P} at (0,451) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 768x59 - text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,20) width 227: "fixed at the center of the paragraph. " - text run at (227,20) width 541: "The background color will make it easier to determine the edges of the paragraph, and" - text run at (0,40) width 262: "therefore allow you to calculate its center." - LayoutBlockFlow {P} at (0,527) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 749x59 - text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,20) width 340: "The background color will make it easier to determine" - text run at (0,40) width 436: "the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (0,603) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 749x59 - text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,20) width 340: "The background color will make it easier to determine" - text run at (0,40) width 436: "the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (0,679) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 768x59 - text run at (0,0) width 768: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image should" - text run at (0,20) width 270: "be fixed at the left center of the paragraph. " - text run at (270,20) width 443: "The background color will make it easier to determine the edges of the" - text run at (0,40) width 360: "paragraph, and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (0,755) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 761x59 - text run at (0,0) width 749: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down." - text run at (0,20) width 761: "The background color will make it easier to determine the edges of the paragraph, which should help in determining if all" - text run at (0,40) width 647: "this is so, and the extra text should make the element long enough for this test to be simpler to evaluate." - LayoutBlockFlow {P} at (0,831) size 769x80 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 760x79 - text run at (0,0) width 749: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand" - text run at (0,20) width 760: "corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of" - text run at (0,40) width 80: "the element. " - text run at (80,40) width 656: "The background color will make it easier to determine the edges of the paragraph, which should assist in" - text run at (0,60) width 120: "evaluating this test." - LayoutTable {TABLE} at (0,927) size 769x630 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x628 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x600 - LayoutTableCell {TD} at (0,314) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x600 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 503x19 - text run at (0,0) width 503: "This document should have a single, small green image in its upper right corner." - LayoutBlockFlow {P} at (4,40) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 741x59 - text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,20) width 227: "fixed at the center of the paragraph. " - text run at (227,20) width 514: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,40) width 289: "and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (4,116) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 741x59 - text run at (0,0) width 735: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,20) width 227: "fixed at the center of the paragraph. " - text run at (227,20) width 514: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,40) width 289: "and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (4,192) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 730x59 - text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,20) width 274: "The background color will make it easier to" - text run at (0,40) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (4,268) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 730x59 - text run at (0,0) width 730: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,20) width 409: "image should be fixed at the lower right corner of the paragraph. " - text run at (409,20) width 274: "The background color will make it easier to" - text run at (0,40) width 502: "determine the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (4,344) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 736x59 - text run at (0,0) width 722: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image" - text run at (0,20) width 316: "should be fixed at the left center of the paragraph. " - text run at (316,20) width 420: "The background color will make it easier to determine the edges of" - text run at (0,40) width 383: "the paragraph, and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (4,420) size 747x80 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 705x79 - text run at (0,0) width 705: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25%" - text run at (0,20) width 44: "down. " - text run at (44,20) width 650: "The background color will make it easier to determine the edges of the paragraph, which should help in" - text run at (0,40) width 698: "determining if all this is so, and the extra text should make the element long enough for this test to be simpler to" - text run at (0,60) width 56: "evaluate." - LayoutBlockFlow {P} at (4,516) size 747x80 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 744x79 - text run at (0,0) width 718: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-" - text run at (0,20) width 734: "hand corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left" - text run at (0,40) width 141: "corner of the element. " - text run at (141,40) width 603: "The background color will make it easier to determine the edges of the paragraph, which should" - text run at (0,60) width 173: "assist in evaluating this test." -layer at (8,329) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,321) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png deleted file mode 100644 index 6925281..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt deleted file mode 100644 index 624f90b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt +++ /dev/null
@@ -1,308 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 888 scrollHeight 1993 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1993 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1993 - LayoutBlockFlow {BODY} at (8,8) size 784x1977 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x240 - LayoutText {#text} at (0,0) size 880x240 - text run at (0,0) width 672: ".one {background-image: url(../resources/oransqr.gif); background-repeat: repeat-y;}" - text run at (672,0) width 0: " " - text run at (0,16) width 672: ".two {background-image: url(../resources/oransqr.gif); background-repeat: repeat-x;}" - text run at (672,16) width 0: " " - text run at (0,32) width 696: ".three {background-image: url(../resources/oransqr.gif); background-repeat: no-repeat;}" - text run at (696,32) width 0: " " - text run at (0,48) width 880: ".four {background-image: url(../resources/bg.gif); background-position: 50% 50%; background-repeat: repeat-y;}" - text run at (880,48) width 0: " " - text run at (0,64) width 704: ".five {background-image: url(../resources/crosshair2.gif); background-position: 50% 50%;" - text run at (704,64) width 0: " " - text run at (0,80) width 240: " background-color: red;}" - text run at (240,80) width 0: " " - text run at (0,96) width 720: ".six {background-image: url(../resources/crosshair2.gif); background-position: center top;" - text run at (720,96) width 0: " " - text run at (0,112) width 232: " background-color: red;}" - text run at (232,112) width 0: " " - text run at (0,128) width 720: ".seven {background-image: url(../resources/crosshair2.gif); background-position: top left;" - text run at (720,128) width 0: " " - text run at (0,144) width 248: " background-color: red;}" - text run at (248,144) width 0: " " - text run at (0,160) width 752: ".eight {background-image: url(../resources/crosshair2.gif); background-position: bottom right;" - text run at (752,160) width 0: " " - text run at (0,176) width 248: " background-color: red;}" - text run at (248,176) width 0: " " - text run at (0,192) width 704: ".nine {background-image: url(../resources/crosshair2.gif); background-position: 50% 50%;" - text run at (704,192) width 0: " " - text run at (0,208) width 240: " background-color: red;}" - text run at (240,208) width 0: " " - text run at (0,224) width 0: " " - LayoutBlockFlow {P} at (0,307) size 784x60 - LayoutText {#text} at (0,0) size 784x19 - text run at (0,0) width 784: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 779x39 - text run at (152,20) width 320: " is '0% 0%' and that property is not declared here). " - text run at (472,20) width 307: "This is extra text included for the sole purpose of" - text run at (0,40) width 189: "making the paragraph longer. " - text run at (188,40) width 222: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,383) size 784x60 - LayoutText {#text} at (0,0) size 784x19 - text run at (0,0) width 784: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 779x39 - text run at (152,20) width 320: " is '0% 0%' and that property is not declared here). " - text run at (472,20) width 307: "This is extra text included for the sole purpose of" - text run at (0,40) width 189: "making the paragraph longer. " - text run at (188,40) width 222: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,459) size 784x60 - LayoutText {#text} at (0,0) size 697x19 - text run at (0,0) width 697: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 779x39 - text run at (152,20) width 320: " is '0% 0%' and that property is not declared here). " - text run at (472,20) width 307: "This is extra text included for the sole purpose of" - text run at (0,40) width 189: "making the paragraph longer. " - text run at (188,40) width 222: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,535) size 784x80 - LayoutText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image" - text run at (0,20) width 216: "exactly centered in the paragraph. " - text run at (216,20) width 100: "This is because " - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (316,23) size 64x16 - text run at (316,23) width 64: "repeat-y" - LayoutText {#text} at (380,20) size 114x19 - text run at (380,20) width 114: " specifies tiling in " - LayoutInline {EM} at (0,0) size 28x19 - LayoutText {#text} at (494,20) size 28x19 - text run at (494,20) width 28: "both" - LayoutText {#text} at (522,20) size 764x39 - text run at (522,20) width 158: " directions on the y-axis. " - text run at (680,20) width 84: "Note that this" - text run at (0,40) width 267: "test is only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (267,43) size 152x16 - text run at (267,43) width 152: "background-position" - LayoutText {#text} at (419,40) size 33x19 - text run at (419,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (452,40) size 57x19 - text run at (452,40) width 57: "test 5.3.6" - LayoutText {#text} at (509,40) size 759x39 - text run at (509,40) width 13: "). " - text run at (522,40) width 237: "I'll fill the paragraph with extra text to" - text run at (0,60) width 342: "make the conformance (or lack thereof) more obvious." - LayoutBlockFlow {P} at (0,631) size 784x100 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 754x19 - text run at (0,0) width 658: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (658,0) width 96: "This is because" - LayoutInline {CODE} at (0,0) size 136x16 - LayoutText {#text} at (0,23) size 136x16 - text run at (0,23) width 136: "background-repeat" - LayoutText {#text} at (136,20) size 114x19 - text run at (136,20) width 114: " specifies tiling in " - LayoutInline {EM} at (0,0) size 16x19 - LayoutText {#text} at (250,20) size 16x19 - text run at (250,20) width 16: "all" - LayoutText {#text} at (266,20) size 782x39 - text run at (266,20) width 361: " directions, regardless of the position of the origin image. " - text run at (627,20) width 155: "Note that this test is only" - text run at (0,40) width 196: "valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (196,43) size 152x16 - text run at (196,43) width 152: "background-position" - LayoutText {#text} at (348,40) size 33x19 - text run at (348,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (381,40) size 57x19 - text run at (381,40) width 57: "test 5.3.6" - LayoutText {#text} at (438,40) size 767x59 - text run at (438,40) width 13: "). " - text run at (451,40) width 298: "I'll fill the paragraph with extra text to make the" - text run at (0,60) width 285: "conformance (or lack thereof) more obvious. " - text run at (285,60) width 482: "A background color is present, although if it is visible then the image has not" - text run at (0,80) width 116: "bee correctly tiled." - LayoutBlockFlow {P} at (0,747) size 784x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 782x59 - text run at (0,0) width 764: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be" - text run at (0,20) width 277: "the exact center of the top of the paragraph. " - text run at (277,20) width 505: "I'll fill it with extra text to make the conformance (or lack thereof) more obvious." - text run at (0,40) width 653: "A background color is present, although if it is visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (0,823) size 784x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 777x59 - text run at (0,0) width 488: "This sentence should have a fully tiled background which starts at its top left. " - text run at (488,0) width 220: "I'll fill it with extra text to make the" - text run at (0,20) width 285: "conformance (or lack thereof) more obvious. " - text run at (285,20) width 492: "A background color is present, although if it is visible, then the image may not" - text run at (0,40) width 157: "have been tiled correctly." - LayoutBlockFlow {P} at (0,899) size 784x80 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 784x79 - text run at (0,0) width 783: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of the" - text run at (0,20) width 665: "image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (664,20) width 117: "I'll fill it with extra" - text run at (0,40) width 389: "text to make the conformance (or lack thereof) more obvious. " - text run at (389,40) width 395: "A background color is present, although if it is visible, then the" - text run at (0,60) width 254: "image may not have been tiled correctly." - LayoutBlockFlow {P} at (0,995) size 784x120 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 769x119 - text run at (0,0) width 718: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,20) width 407: "background's origin should be the exact center of the paragraph. " - text run at (407,20) width 358: "I'll fill it with extra text to make the conformance (or lack" - text run at (0,40) width 147: "thereof) more obvious. " - text run at (147,40) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (589,40) width 180: "This is true because I am not" - text run at (0,60) width 765: "able to increase the text size without resorting to either headings or other CSS properties, neither of which I want to use in" - text run at (0,80) width 116: "this circumstance. " - text run at (116,80) width 241: "This ought to be enough text, though. " - text run at (357,80) width 395: "A background color is present, although if it is visible, then the" - text run at (0,100) width 254: "image may not have been tiled correctly." - LayoutTable {TABLE} at (0,1131) size 784x846 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x844 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x816 - LayoutTableCell {TD} at (0,422) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x816 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 - LayoutText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default" - text run at (0,20) width 22: "for " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (22,23) size 152x16 - text run at (22,23) width 152: "background-position" - LayoutText {#text} at (174,20) size 730x39 - text run at (174,20) width 320: " is '0% 0%' and that property is not declared here). " - text run at (494,20) width 236: "This is extra text included for the sole" - text run at (0,40) width 260: "purpose of making the paragraph longer. " - text run at (259,40) width 222: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,80) size 762x60 - LayoutText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default" - text run at (0,20) width 22: "for " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (22,23) size 152x16 - text run at (22,23) width 152: "background-position" - LayoutText {#text} at (174,20) size 730x39 - text run at (174,20) width 320: " is '0% 0%' and that property is not declared here). " - text run at (494,20) width 236: "This is extra text included for the sole" - text run at (0,40) width 260: "purpose of making the paragraph longer. " - text run at (259,40) width 222: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,156) size 762x60 - LayoutText {#text} at (0,0) size 697x19 - text run at (0,0) width 697: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 762x39 - text run at (152,20) width 320: " is '0% 0%' and that property is not declared here). " - text run at (472,20) width 290: "This is extra text included for the sole purpose" - text run at (0,40) width 206: "of making the paragraph longer. " - text run at (205,40) width 222: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,232) size 762x80 - LayoutText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image" - text run at (0,20) width 216: "exactly centered in the paragraph. " - text run at (216,20) width 100: "This is because " - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (316,23) size 64x16 - text run at (316,23) width 64: "repeat-y" - LayoutText {#text} at (380,20) size 114x19 - text run at (380,20) width 114: " specifies tiling in " - LayoutInline {EM} at (0,0) size 28x19 - LayoutText {#text} at (494,20) size 28x19 - text run at (494,20) width 28: "both" - LayoutText {#text} at (522,20) size 738x39 - text run at (522,20) width 158: " directions on the y-axis. " - text run at (680,20) width 58: "Note that" - text run at (0,40) width 293: "this test is only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (293,43) size 152x16 - text run at (293,43) width 152: "background-position" - LayoutText {#text} at (445,40) size 33x19 - text run at (445,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (478,40) size 57x19 - text run at (478,40) width 57: "test 5.3.6" - LayoutText {#text} at (535,40) size 742x39 - text run at (535,40) width 13: "). " - text run at (548,40) width 194: "I'll fill the paragraph with extra" - text run at (0,60) width 385: "text to make the conformance (or lack thereof) more obvious." - LayoutBlockFlow {P} at (4,328) size 762x100 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 754x19 - text run at (0,0) width 658: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (658,0) width 96: "This is because" - LayoutInline {CODE} at (0,0) size 136x16 - LayoutText {#text} at (0,23) size 136x16 - text run at (0,23) width 136: "background-repeat" - LayoutText {#text} at (136,20) size 114x19 - text run at (136,20) width 114: " specifies tiling in " - LayoutInline {EM} at (0,0) size 16x19 - LayoutText {#text} at (250,20) size 16x19 - text run at (250,20) width 16: "all" - LayoutText {#text} at (266,20) size 750x39 - text run at (266,20) width 361: " directions, regardless of the position of the origin image. " - text run at (627,20) width 123: "Note that this test is" - text run at (0,40) width 228: "only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (228,43) size 152x16 - text run at (228,43) width 152: "background-position" - LayoutText {#text} at (380,40) size 33x19 - text run at (380,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (413,40) size 57x19 - text run at (413,40) width 57: "test 5.3.6" - LayoutText {#text} at (470,40) size 758x59 - text run at (470,40) width 13: "). " - text run at (483,40) width 275: "I'll fill the paragraph with extra text to make" - text run at (0,60) width 308: "the conformance (or lack thereof) more obvious. " - text run at (308,60) width 433: "A background color is present, although if it is visible then the image" - text run at (0,80) width 165: "has not bee correctly tiled." - LayoutBlockFlow {P} at (4,444) size 762x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 745x59 - text run at (0,0) width 745: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should" - text run at (0,20) width 296: "be the exact center of the top of the paragraph. " - text run at (296,20) width 447: "I'll fill it with extra text to make the conformance (or lack thereof) more" - text run at (0,40) width 58: "obvious. " - text run at (58,40) width 653: "A background color is present, although if it is visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (4,520) size 762x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 753x59 - text run at (0,0) width 488: "This sentence should have a fully tiled background which starts at its top left. " - text run at (488,0) width 220: "I'll fill it with extra text to make the" - text run at (0,20) width 285: "conformance (or lack thereof) more obvious. " - text run at (285,20) width 468: "A background color is present, although if it is visible, then the image may" - text run at (0,40) width 181: "not have been tiled correctly." - LayoutBlockFlow {P} at (4,596) size 762x80 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 760x79 - text run at (0,0) width 760: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of" - text run at (0,20) width 688: "the image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (687,20) width 50: "I'll fill it" - text run at (0,40) width 456: "with extra text to make the conformance (or lack thereof) more obvious. " - text run at (456,40) width 292: "A background color is present, although if it is" - text run at (0,60) width 357: "visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (4,692) size 762x120 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 755x119 - text run at (0,0) width 718: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,20) width 407: "background's origin should be the exact center of the paragraph. " - text run at (407,20) width 328: "I'll fill it with extra text to make the conformance (or" - text run at (0,40) width 177: "lack thereof) more obvious. " - text run at (177,40) width 442: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (619,40) width 133: "This is true because I" - text run at (0,60) width 755: "am not able to increase the text size without resorting to either headings or other CSS properties, neither of which I want" - text run at (0,80) width 173: "to use in this circumstance. " - text run at (173,80) width 241: "This ought to be enough text, though. " - text run at (414,80) width 341: "A background color is present, although if it is visible," - text run at (0,100) width 308: "then the image may not have been tiled correctly." -layer at (8,297) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,289) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/color-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/color-expected.png deleted file mode 100644 index 5dbe7d03..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/color-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/color-expected.txt deleted file mode 100644 index c3b1fc7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/color_and_background/color-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 160x32 - text run at (0,0) width 160: ".one {color: green;}" - text run at (160,0) width 0: " " - text run at (0,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,135) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutTable {TABLE} at (0,171) size 216x94 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 214x92 - LayoutTableRow {TR} at (0,0) size 214x28 - LayoutTableCell {TD} at (0,0) size 214x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 214x64 - LayoutTableCell {TD} at (0,46) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 202x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 194x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png deleted file mode 100644 index 5eebe27..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt deleted file mode 100644 index 4972027..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt +++ /dev/null
@@ -1,546 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4321 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4321 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4321 - LayoutBlockFlow {BODY} at (8,8) size 769x4305 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x864 - LayoutText {#text} at (0,0) size 568x864 - text run at (0,0) width 304: "P.one {color: green; rotation: 70deg;}" - text run at (304,0) width 0: " " - text run at (0,16) width 176: "P.oneb {color: green;}" - text run at (176,16) width 0: " " - text run at (0,32) width 232: "P.oneb {color: invalidValue;}" - text run at (232,32) width 0: " " - text run at (0,48) width 272: "P.two {background-color: inherit;}" - text run at (272,48) width 0: " " - text run at (0,64) width 216: "H1 + P.three {color: blue;}" - text run at (216,64) width 0: " " - text run at (0,80) width 200: "P.four + H1 {color: red;}" - text run at (200,80) width 0: " " - text run at (0,96) width 264: "P.five {background-color: \"red\";}" - text run at (264,96) width 0: " " - text run at (0,112) width 408: "P.sixa {border-width: medium; border-style: solid;}" - text run at (408,112) width 0: " " - text run at (0,128) width 400: "P.sixb {border-width: funny; border-style: solid;}" - text run at (400,128) width 0: " " - text run at (0,144) width 392: "P.sixc {border-width: 50zu; border-style: solid;}" - text run at (392,144) width 0: " " - text run at (0,160) width 376: "P.sixd {border-width: px; border-style: solid;}" - text run at (376,160) width 0: " " - text run at (0,176) width 96: "@three-dee {" - text run at (96,176) width 0: " " - text run at (0,192) width 184: " @background-lighting {" - text run at (184,192) width 0: " " - text run at (0,208) width 136: " azimuth: 30deg;" - text run at (136,208) width 0: " " - text run at (0,224) width 160: " elevation: 190deg;" - text run at (160,224) width 0: " " - text run at (0,240) width 24: " }" - text run at (24,240) width 0: " " - text run at (0,256) width 184: " P.seven { color: red }" - text run at (184,256) width 0: " " - text run at (0,272) width 16: " }" - text run at (16,272) width 0: " " - text run at (0,288) width 184: "P.eight {COLOR: GREEN;}" - text run at (184,288) width 0: " " - text run at (0,304) width 192: "OL:wait {color: maroon;}" - text run at (192,304) width 0: " " - text run at (0,320) width 272: "P.ten:first-child {color: maroon;}" - text run at (272,320) width 0: " " - text run at (0,336) width 208: "UL:lang(fr) {color: gray;}" - text run at (208,336) width 0: " " - text run at (0,352) width 248: "BLOCKQUOTE[href] {color: navy;}" - text run at (248,352) width 0: " " - text run at (0,368) width 288: "ACRONYM[href=\"foo\"] {color: purple;}" - text run at (288,368) width 0: " " - text run at (0,384) width 296: "ADDRESS[href~=\"foo\"] {color: purple;}" - text run at (296,384) width 0: " " - text run at (0,400) width 248: "SPAN[lang|=\"fr\"] {color: #c37;}" - text run at (248,400) width 0: " " - text run at (0,416) width 96: "@media tty {" - text run at (96,416) width 0: " " - text run at (0,432) width 136: " H1 {color: red;}" - text run at (136,432) width 0: " " - text run at (0,448) width 192: " P.sixteen {color: red;}" - text run at (192,448) width 0: " " - text run at (0,464) width 16: " }" - text run at (16,464) width 0: " " - text run at (0,480) width 96: "@three-dee {" - text run at (96,480) width 0: " " - text run at (0,496) width 208: " P.seventeen {color: red }" - text run at (208,496) width 0: " " - text run at (0,512) width 16: " }" - text run at (16,512) width 0: " " - text run at (0,528) width 568: "P.eighteena {text-decoration: underline overline line-through diagonal;" - text run at (568,528) width 0: " " - text run at (0,544) width 416: " font: bold highlighted 100% sans-serif;}" - text run at (416,544) width 0: " " - text run at (0,560) width 568: "P.eighteenb {text-decoration: underline overline line-through diagonal;" - text run at (568,560) width 0: " " - text run at (0,576) width 376: " font: bold highlighted 100% serif;}" - text run at (376,576) width 0: " " - text run at (0,592) width 384: "EM, P.nineteena ! EM, STRONG {font-size: 200%; }" - text run at (384,592) width 0: " " - text run at (0,608) width 0: " " - text run at (0,624) width 128: "// UL.nineteenb," - text run at (128,624) width 0: " " - text run at (0,640) width 200: "P.nineteenb {color: red;}" - text run at (200,640) width 0: " " - text run at (0,656) width 0: " " - text run at (0,672) width 360: "P.twentya {rotation-code: \"}\"; color: blue;} " - text run at (360,672) width 0: " " - text run at (0,688) width 392: "P.twentyb {rotation-code: \"\\\"}\\\"\"; color: green;}" - text run at (392,688) width 0: " " - text run at (0,704) width 400: "P.twentyonea {rotation-code: '}'; color: purple;} " - text run at (400,704) width 0: " " - text run at (0,720) width 416: "P.twentyoneb {rotation-code: '\\'}\\''; color: green;}" - text run at (416,720) width 0: " " - text run at (0,736) width 104: "P.twentytwo {" - text run at (104,736) width 0: " " - text run at (0,752) width 376: " type-display: @threedee {rotation-code: '}';};" - text run at (376,752) width 0: " " - text run at (0,768) width 112: " color: green;" - text run at (112,768) width 0: " " - text run at (0,784) width 16: " }" - text run at (16,784) width 0: " " - text run at (0,800) width 280: "P.twentythree {text-indent: 0.5in;}" - text run at (280,800) width 0: " " - text run at (0,816) width 112: " color: maroon" - text run at (112,816) width 0: " " - text run at (0,832) width 208: "P.twentyfour {color: red;}" - text run at (208,832) width 0: " " - text run at (0,848) width 0: " " - LayoutBlockFlow {P} at (0,931) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 485x19 - text run at (0,0) width 485: "This paragraph should be green, because only the rotation should be ignored." - LayoutBlockFlow {P} at (0,967) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 622x19 - text run at (0,0) width 622: "This paragraph should be green, since error-checking should be done before calculating specificity." - LayoutBlockFlow {P} at (0,1003) size 769x40 - LayoutText {#text} at (0,0) size 560x19 - text run at (0,0) width 560: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " - LayoutInline {CODE} at (0,0) size 56x16 - LayoutText {#text} at (560,3) size 56x16 - text run at (560,3) width 56: "inherit" - LayoutText {#text} at (616,0) size 760x39 - text run at (616,0) width 144: " is an invalid keyword," - text run at (0,20) width 520: "and in CSS2, it will cause the gray background (not the white grid) to be inherited." - LayoutBlockFlow {P} at (0,1059) size 769x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (0,1095) size 769x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (0,1131) size 769x20 - LayoutText {#text} at (0,0) size 526x19 - text run at (0,0) width 526: "This paragraph should have a white background, since keywords cannot be quoted." - LayoutBlockFlow {P} at (0,1167) size 769x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 756x39 - text run at (3,3) width 643: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (646,3) width 113: "This should cause" - text run at (3,23) width 318: "the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1229) size 769x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 740x39 - text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," - text run at (3,23) width 228: "because the border-width is invalid. " - text run at (230,23) width 436: "This should cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1291) size 769x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 754x59 - text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," - text run at (3,23) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (590,23) width 167: "This should cause the user" - text run at (3,43) width 265: "agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1373) size 769x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 751x59 - text run at (3,3) width 743: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" - text run at (3,23) width 547: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (549,23) width 205: "This should cause the user agent" - text run at (3,43) width 227: "to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1455) size 769x20 - LayoutText {#text} at (0,0) size 660x19 - text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (0,1491) size 769x40 [color=#008000] - LayoutText {#text} at (0,0) size 760x39 - text run at (0,0) width 207: "This paragraph should be green. " - text run at (207,0) width 553: "CSS is case-insensitive, unless required to be case sensitive due to interaction with other" - text run at (0,20) width 237: "standards (e.g., font names or URLs.)" - LayoutBlockFlow {OL} at (0,1547) size 769x20 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 621x19 - text run at (0,0) width 621: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - LayoutBlockFlow {P} at (0,1583) size 769x40 - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 752: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is" - text run at (0,20) width 110: "not the first child." - LayoutBlockFlow {UL} at (0,1639) size 769x40 - LayoutListItem {LI} at (40,0) size 729x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 690x39 - text run at (0,0) width 690: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,20) width 228: "CSS2, the selector should not apply." - LayoutBlockFlow {BLOCKQUOTE} at (40,1695) size 689x40 - LayoutText {#text} at (0,0) size 688x39 - text run at (0,0) width 688: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2," - text run at (0,20) width 183: "the selector should not apply." - LayoutBlockFlow {P} at (0,1751) size 769x40 - LayoutInline {ACRONYM} at (0,0) size 748x39 - LayoutText {#text} at (0,0) size 748x39 - text run at (0,0) width 748: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 108: "should not apply." - LayoutBlockFlow {ADDRESS} at (0,1807) size 769x40 - LayoutText {#text} at (0,0) size 744x39 - text run at (0,0) width 744: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 109: "should not apply." - LayoutBlockFlow {P} at (0,1863) size 769x40 - LayoutInline {SPAN} at (0,0) size 768x39 - LayoutText {#text} at (0,0) size 768x39 - text run at (0,0) width 768: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should" - text run at (0,20) width 62: "not apply." - LayoutBlockFlow {P} at (0,1919) size 769x40 - LayoutText {#text} at (0,0) size 753x39 - text run at (0,0) width 664: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (664,0) width 89: "However, it is" - text run at (0,20) width 592: "valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - LayoutBlockFlow {P} at (0,1975) size 769x20 - LayoutText {#text} at (0,0) size 660x19 - text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (0,2011) size 769x80 - LayoutText {#text} at (0,0) size 737x19 - text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 226x19 - text run at (64,20) width 226: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (290,23) size 120x16 - text run at (290,23) width 120: "text-decoration" - LayoutText {#text} at (410,20) size 131x19 - text run at (410,20) width 55: " invalid. " - text run at (465,20) width 76: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (541,23) size 88x16 - text run at (541,23) width 88: "highlighted" - LayoutText {#text} at (629,20) size 758x39 - text run at (629,20) width 129: " is not a valid part of" - text run at (0,40) width 23: "the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (23,43) size 32x16 - text run at (23,43) width 32: "font" - LayoutText {#text} at (55,40) size 720x39 - text run at (55,40) width 178: " property, making it invalid. " - text run at (232,40) width 488: "Therefore, this paragraph's font should be the UA default, and match the next" - text run at (0,60) width 71: "paragraph. " - text run at (71,60) width 190: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (261,63) size 32x16 - text run at (261,63) width 32: "font" - LayoutText {#text} at (293,60) size 248x19 - text run at (293,60) width 248: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (0,2107) size 769x80 - LayoutText {#text} at (0,0) size 737x19 - text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 226x19 - text run at (64,20) width 226: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (290,23) size 120x16 - text run at (290,23) width 120: "text-decoration" - LayoutText {#text} at (410,20) size 131x19 - text run at (410,20) width 55: " invalid. " - text run at (465,20) width 76: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (541,23) size 88x16 - text run at (541,23) width 88: "highlighted" - LayoutText {#text} at (629,20) size 758x39 - text run at (629,20) width 129: " is not a valid part of" - text run at (0,40) width 23: "the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (23,43) size 32x16 - text run at (23,43) width 32: "font" - LayoutText {#text} at (55,40) size 747x39 - text run at (55,40) width 178: " property, making it invalid. " - text run at (232,40) width 515: "Therefore, this paragraph's font should be the UA default, and match the previous" - text run at (0,60) width 71: "paragraph. " - text run at (71,60) width 190: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (261,63) size 32x16 - text run at (261,63) width 32: "font" - LayoutText {#text} at (293,60) size 248x19 - text run at (293,60) width 248: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (0,2203) size 769x60 - LayoutText {#text} at (0,0) size 530x19 - text run at (0,0) width 501: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (501,0) width 29: "The " - LayoutInline {EM} at (0,0) size 100x19 - LayoutText {#text} at (530,0) size 100x19 - text run at (530,0) width 100: "emphasized text" - LayoutText {#text} at (630,0) size 54x19 - text run at (630,0) width 54: " and the " - LayoutInline {STRONG} at (0,0) size 72x19 - LayoutText {#text} at (684,0) size 72x19 - text run at (684,0) width 72: "strong text" - LayoutText {#text} at (0,20) size 761x39 - text run at (0,20) width 761: "within it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there" - text run at (0,40) width 520: "could be an operator within the selector that has higher precedence than a comma)." - LayoutBlockFlow {P} at (0,2279) size 769x40 - LayoutText {#text} at (0,0) size 464x19 - text run at (0,0) width 464: "This paragraph should be black, because the line before the declaration is " - LayoutInline {STRONG} at (0,0) size 22x19 - LayoutText {#text} at (464,0) size 22x19 - text run at (464,0) width 22: "not" - LayoutText {#text} at (486,0) size 743x39 - text run at (486,0) width 257: " a comment and therefore the selector for" - text run at (0,20) width 138: "P.nineteenb is invalid." - LayoutBlockFlow {P} at (0,2335) size 769x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 470x19 - text run at (0,0) width 470: "This paragraph should be blue, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2371) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2407) size 769x20 [color=#800080] - LayoutText {#text} at (0,0) size 483x19 - text run at (0,0) width 483: "This paragraph should be purple, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2443) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2479) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2515) size 769x20 - LayoutText {#text} at (48,0) size 601x19 - text run at (48,0) width 485: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (533,0) width 116: "It should be black." - LayoutBlockFlow {P} at (0,2551) size 769x40 - LayoutText {#text} at (0,0) size 751x39 - text run at (0,0) width 751: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" - text run at (0,20) width 616: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." - LayoutTable {TABLE} at (0,2607) size 769x1698 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1696 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1668 - LayoutTableCell {TD} at (0,848) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1668 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 485x19 - text run at (0,0) width 485: "This paragraph should be green, because only the rotation should be ignored." - LayoutBlockFlow {P} at (4,40) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 622x19 - text run at (0,0) width 622: "This paragraph should be green, since error-checking should be done before calculating specificity." - LayoutBlockFlow {P} at (4,76) size 747x40 - LayoutText {#text} at (0,0) size 560x19 - text run at (0,0) width 560: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " - LayoutInline {CODE} at (0,0) size 56x16 - LayoutText {#text} at (560,3) size 56x16 - text run at (560,3) width 56: "inherit" - LayoutText {#text} at (616,0) size 696x39 - text run at (616,0) width 80: " is an invalid" - text run at (0,20) width 584: "keyword, and in CSS2, it will cause the gray background (not the white grid) to be inherited." - LayoutBlockFlow {P} at (4,132) size 747x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (4,168) size 747x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (4,204) size 747x20 - LayoutText {#text} at (0,0) size 526x19 - text run at (0,0) width 526: "This paragraph should have a white background, since keywords cannot be quoted." - LayoutBlockFlow {P} at (4,240) size 747x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 717x39 - text run at (3,3) width 643: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (646,3) width 74: "This should" - text run at (3,23) width 357: "cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,302) size 747x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 740x39 - text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," - text run at (3,23) width 228: "because the border-width is invalid. " - text run at (230,23) width 436: "This should cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,364) size 747x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 740x59 - text run at (3,3) width 740: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," - text run at (3,23) width 588: "because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (590,23) width 137: "This should cause the" - text run at (3,43) width 295: "user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,446) size 747x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 736x59 - text run at (3,3) width 720: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because" - text run at (3,23) width 570: "the border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (572,23) width 167: "This should cause the user" - text run at (3,43) width 265: "agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,528) size 747x20 - LayoutText {#text} at (0,0) size 660x19 - text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (4,564) size 747x40 [color=#008000] - LayoutText {#text} at (0,0) size 724x39 - text run at (0,0) width 207: "This paragraph should be green. " - text run at (207,0) width 517: "CSS is case-insensitive, unless required to be case sensitive due to interaction with" - text run at (0,20) width 273: "other standards (e.g., font names or URLs.)" - LayoutBlockFlow {OL} at (4,620) size 747x20 - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 621x19 - text run at (0,0) width 621: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - LayoutBlockFlow {P} at (4,656) size 747x40 - LayoutText {#text} at (0,0) size 738x39 - text run at (0,0) width 738: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph" - text run at (0,20) width 124: "is not the first child." - LayoutBlockFlow {UL} at (4,712) size 747x40 - LayoutListItem {LI} at (40,0) size 707x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 690x39 - text run at (0,0) width 690: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,20) width 228: "CSS2, the selector should not apply." - LayoutBlockFlow {BLOCKQUOTE} at (44,768) size 667x40 - LayoutText {#text} at (0,0) size 643x39 - text run at (0,0) width 643: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,20) width 228: "CSS2, the selector should not apply." - LayoutBlockFlow {P} at (4,824) size 747x40 - LayoutInline {ACRONYM} at (0,0) size 696x39 - LayoutText {#text} at (0,0) size 696x39 - text run at (0,0) width 696: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,20) width 160: "selector should not apply." - LayoutBlockFlow {ADDRESS} at (4,880) size 747x40 - LayoutText {#text} at (0,0) size 744x39 - text run at (0,0) width 744: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 109: "should not apply." - LayoutBlockFlow {P} at (4,936) size 747x40 - LayoutInline {SPAN} at (0,0) size 722x39 - LayoutText {#text} at (0,0) size 722x39 - text run at (0,0) width 722: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 108: "should not apply." - LayoutBlockFlow {P} at (4,992) size 747x40 - LayoutText {#text} at (0,0) size 739x39 - text run at (0,0) width 664: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (664,0) width 75: "However, it" - text run at (0,20) width 606: "is valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - LayoutBlockFlow {P} at (4,1048) size 747x20 - LayoutText {#text} at (0,0) size 660x19 - text run at (0,0) width 660: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (4,1084) size 747x80 - LayoutText {#text} at (0,0) size 737x19 - text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 226x19 - text run at (64,20) width 226: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (290,23) size 120x16 - text run at (290,23) width 120: "text-decoration" - LayoutText {#text} at (410,20) size 131x19 - text run at (410,20) width 55: " invalid. " - text run at (465,20) width 76: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (541,23) size 88x16 - text run at (541,23) width 88: "highlighted" - LayoutText {#text} at (629,20) size 741x39 - text run at (629,20) width 112: " is not a valid part" - text run at (0,40) width 40: "of the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (40,43) size 32x16 - text run at (40,43) width 32: "font" - LayoutText {#text} at (72,40) size 737x39 - text run at (72,40) width 178: " property, making it invalid. " - text run at (249,40) width 488: "Therefore, this paragraph's font should be the UA default, and match the next" - text run at (0,60) width 71: "paragraph. " - text run at (71,60) width 190: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (261,63) size 32x16 - text run at (261,63) width 32: "font" - LayoutText {#text} at (293,60) size 248x19 - text run at (293,60) width 248: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (4,1180) size 747x80 - LayoutText {#text} at (0,0) size 737x19 - text run at (0,0) width 737: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 226x19 - text run at (64,20) width 226: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (290,23) size 120x16 - text run at (290,23) width 120: "text-decoration" - LayoutText {#text} at (410,20) size 131x19 - text run at (410,20) width 55: " invalid. " - text run at (465,20) width 76: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (541,23) size 88x16 - text run at (541,23) width 88: "highlighted" - LayoutText {#text} at (629,20) size 741x39 - text run at (629,20) width 112: " is not a valid part" - text run at (0,40) width 40: "of the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (40,43) size 32x16 - text run at (40,43) width 32: "font" - LayoutText {#text} at (72,40) size 706x39 - text run at (72,40) width 178: " property, making it invalid. " - text run at (249,40) width 457: "Therefore, this paragraph's font should be the UA default, and match the" - text run at (0,60) width 129: "previous paragraph. " - text run at (129,60) width 190: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (319,63) size 32x16 - text run at (319,63) width 32: "font" - LayoutText {#text} at (351,60) size 248x19 - text run at (351,60) width 248: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (4,1276) size 747x60 - LayoutText {#text} at (0,0) size 530x19 - text run at (0,0) width 501: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (501,0) width 29: "The " - LayoutInline {EM} at (0,0) size 100x19 - LayoutText {#text} at (530,0) size 100x19 - text run at (530,0) width 100: "emphasized text" - LayoutText {#text} at (630,0) size 54x19 - text run at (630,0) width 54: " and the " - LayoutInline {STRONG} at (0,0) size 727x39 - LayoutText {#text} at (684,0) size 727x39 - text run at (684,0) width 43: "strong" - text run at (0,20) width 25: "text" - LayoutText {#text} at (25,20) size 718x39 - text run at (25,20) width 693: " within it should also be normal size, since the entire ruleset should be skipped (since in some future version of" - text run at (0,40) width 592: "CSS, there could be an operator within the selector that has higher precedence than a comma)." - LayoutBlockFlow {P} at (4,1352) size 747x40 - LayoutText {#text} at (0,0) size 464x19 - text run at (0,0) width 464: "This paragraph should be black, because the line before the declaration is " - LayoutInline {STRONG} at (0,0) size 22x19 - LayoutText {#text} at (464,0) size 22x19 - text run at (464,0) width 22: "not" - LayoutText {#text} at (486,0) size 743x39 - text run at (486,0) width 257: " a comment and therefore the selector for" - text run at (0,20) width 138: "P.nineteenb is invalid." - LayoutBlockFlow {P} at (4,1408) size 747x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 470x19 - text run at (0,0) width 470: "This paragraph should be blue, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1444) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1480) size 747x20 [color=#800080] - LayoutText {#text} at (0,0) size 483x19 - text run at (0,0) width 483: "This paragraph should be purple, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1516) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1552) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 478: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1588) size 747x20 - LayoutText {#text} at (48,0) size 601x19 - text run at (48,0) width 485: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (533,0) width 116: "It should be black." - LayoutBlockFlow {P} at (4,1624) size 747x40 - LayoutText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of" - text run at (0,20) width 639: "the selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." -layer at (8,921) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,913) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font-expected.png deleted file mode 100644 index 2fedb21..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font-expected.txt deleted file mode 100644 index b33bc94..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font-expected.txt +++ /dev/null
@@ -1,231 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4396 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4396.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4380.33 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x16 - LayoutText {#text} at (0,0) size 264x15 - text run at (0,0) width 264: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,28) size 769x180 - LayoutText {#text} at (0,0) size 399x180 - text run at (0,0) width 161: "BODY {font-size: 12px;}" - text run at (161,0) width 0: " " - text run at (0,15) width 322: ".one {font: italic small-caps 13pt Helvetica;}" - text run at (322,15) width 0: " " - text run at (0,30) width 203: ".two {font: 150%/150% serif;}" - text run at (203,30) width 0: " " - text run at (0,45) width 252: ".three {font: 150%/150% sans-serif;}" - text run at (252,45) width 0: " " - text run at (0,60) width 231: ".four {font: small/200% cursive;}" - text run at (231,60) width 0: " " - text run at (0,75) width 399: ".five {font: italic small-caps 900 150%/150% sans-serif;}" - text run at (399,75) width 0: " " - text run at (0,90) width 392: ".six {font: italic small-caps 100 150%/300% sans-serif;}" - text run at (392,90) width 0: " " - text run at (0,105) width 392: ".seven {font: italic small-caps 900 150%/2em monospace;}" - text run at (392,105) width 0: " " - text run at (0,120) width 399: ".eight {font: italic small-caps 500 150%/1in sans-serif;}" - text run at (399,120) width 0: " " - text run at (0,135) width 378: ".nine {font: oblique normal 700 18px/200% sans-serif;}" - text run at (378,135) width 0: " " - text run at (0,150) width 301: ".ten {font: normal 400 80%/2.5 sans-serif;}" - text run at (301,150) width 0: " " - text run at (0,165) width 266: "SPAN.color {background-color: silver;}" - text run at (266,165) width 0: " " - LayoutBlockFlow {P} at (0,234) size 769x16 - LayoutText {#text} at (0,0) size 706x15 - text run at (0,0) width 423: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (423,0) width 283: "This is the \"base font size\" referred to in the following tests." - LayoutBlockFlow {P} at (0,267.33) size 769x21 - LayoutText {#text} at (0,0) size 496x20 - text run at (0,0) width 496: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (0,306.33) size 769x81 - LayoutText {#text} at (0,3) size 762x74 - text run at (0,3) width 282: "This element should be in a serif font. " - text run at (282,3) width 480: "Its font-size should be 150% the base font size, and its line-height" - text run at (0,30) width 423: "should 150% of that value (18px and 27px, respectively). " - text run at (423,30) width 297: "Extra text is included for the purposes of" - text run at (0,57) width 207: "testing this more effectively." - LayoutBlockFlow {P} at (0,405.33) size 769x81 - LayoutText {#text} at (0,3) size 760x75 - text run at (0,3) width 348: "This element should be in a sans-serif font. " - text run at (348,3) width 412: "Its font-size should be 150% the base font size, and" - text run at (0,30) width 568: "its line-height should 150% of that value (18px and 27px, respectively). " - text run at (568,30) width 192: "Extra text is included for" - text run at (0,57) width 350: "the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,504.33) size 769x80 - LayoutText {#text} at (0,4) size 746x44 - text run at (0,4) width 725: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (725,4) width 21: "For" - text run at (0,30) width 193: "example, if the font-size value " - LayoutInline {CODE} at (0,0) size 30x12 - LayoutText {#text} at (193,35) size 30x12 - text run at (193,35) width 30: "small" - LayoutText {#text} at (223,30) size 736x46 - text run at (223,30) width 369: " is calculated at 10px, then the line-height should be 20px. " - text run at (592,30) width 144: "The actual value of the" - text run at (0,58) width 170: "font-size is UA-dependent. " - text run at (170,58) width 445: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,602.33) size 769x108 - LayoutText {#text} at (0,3) size 750x102 - text run at (0,3) width 728: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. " - text run at (727,3) width 23: "Its" - text run at (0,30) width 747: "font-size should be 150% the base font size, and its line-height should be 150% of that value" - text run at (0,57) width 246: "(18px and 27px, respectively). " - text run at (245,57) width 481: "Extra text is included for the purposes of testing this more" - text run at (0,84) width 95: "effectively." - LayoutBlockFlow {P} at (0,728.33) size 769x216 - LayoutText {#text} at (0,16) size 745x184 - text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " - text run at (722,16) width 23: "Its" - text run at (0,70) width 743: "font-size should be 150% the base font size, and its line-height should be 300% of that value" - text run at (0,124) width 244: "(18px and 54px, respectively). " - text run at (243,124) width 480: "Extra text is included for the purposes of testing this more" - text run at (0,178) width 93: "effectively." - LayoutBlockFlow {P} at (0,962.33) size 769x144 - LayoutText {#text} at (0,8) size 750x128 - text run at (0,8) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of" - text run at (0,44) width 55: "900. " - text run at (55,44) width 687: "Its font-size should be 150% the base font size, and its line-height should be" - text run at (0,80) width 618: "2em, or twice the element's font size (18px and 36px, respectively). " - text run at (618,80) width 113: "Extra text is" - text run at (0,116) width 499: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1124.33) size 769x288 - LayoutText {#text} at (0,37) size 745x214 - text run at (0,37) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. " - text run at (722,37) width 23: "Its" - text run at (0,133) width 693: "font-size should be 150% the base font size, or 18px, and its line-height should be 1in. " - text run at (693,133) width 47: "Extra" - text run at (0,229) width 525: "text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1430.33) size 769x144 - LayoutText {#text} at (0,7) size 752x129 - text run at (0,7) width 752: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of" - text run at (0,43) width 40: "700. " - text run at (40,43) width 665: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 176: "element's font size). " - text run at (176,79) width 500: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (0,1592.33) size 769x46 - LayoutText {#text} at (0,5) size 754x36 - text run at (0,5) width 301: "This element should be in a sans-serif font, with a weight of 400. " - text run at (301,5) width 453: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." - text run at (0,28) width 318: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1656.33) size 769x270 - LayoutInline {SPAN} at (0,0) size 759x238 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,16) size 759x238 - text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " - text run at (722,16) width 23: "Its" - text run at (0,70) width 743: "font-size should be 150% the base font size, and its line-height should be 300% of that value" - text run at (0,124) width 759: "(18px and 54px, respectively). The text should have a silver background. The background color" - text run at (0,178) width 736: "has been set on an inline element and should therefore only cover the text, not the interline" - text run at (0,232) width 64: "spacing." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1944.33) size 769x2436 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2434 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x2406 - LayoutTableCell {TD} at (0,1217) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x2406.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 732x39 - text run at (0,0) width 564: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (564,0) width 168: "This is the \"base font size\"" - text run at (0,20) width 204: "referred to in the following tests." - LayoutBlockFlow {P} at (4,61.33) size 747x21 - LayoutText {#text} at (0,0) size 496x20 - text run at (0,0) width 496: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (4,106.33) size 747x144 - LayoutText {#text} at (0,4) size 735x135 - text run at (0,4) width 374: "This element should be in a serif font. " - text run at (374,4) width 361: "Its font-size should be 150% the base" - text run at (0,40) width 694: "font size, and its line-height should 150% of that value (18px and 27px," - text run at (0,76) width 138: "respectively). " - text run at (138,76) width 563: "Extra text is included for the purposes of testing this more" - text run at (0,112) width 109: "effectively." - LayoutBlockFlow {P} at (4,274.33) size 747x144 - LayoutText {#text} at (0,4) size 733x135 - text run at (0,4) width 461: "This element should be in a sans-serif font. " - text run at (461,4) width 232: "Its font-size should be" - text run at (0,40) width 733: "150% the base font size, and its line-height should 150% of that value" - text run at (0,76) width 324: "(18px and 27px, respectively). " - text run at (324,76) width 399: "Extra text is included for the purposes" - text run at (0,112) width 320: "of testing this more effectively." - LayoutBlockFlow {P} at (4,442.33) size 747x80 - LayoutText {#text} at (0,4) size 746x44 - text run at (0,4) width 725: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (725,4) width 21: "For" - text run at (0,30) width 193: "example, if the font-size value " - LayoutInline {CODE} at (0,0) size 30x12 - LayoutText {#text} at (193,35) size 30x12 - text run at (193,35) width 30: "small" - LayoutText {#text} at (223,30) size 736x46 - text run at (223,30) width 369: " is calculated at 10px, then the line-height should be 20px. " - text run at (592,30) width 144: "The actual value of the" - text run at (0,58) width 170: "font-size is UA-dependent. " - text run at (170,58) width 445: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,546.33) size 747x180 - LayoutText {#text} at (0,4) size 721x172 - text run at (0,4) width 713: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,40) width 226: "with a weight of 900. " - text run at (226,40) width 495: "Its font-size should be 150% the base font size," - text run at (0,76) width 669: "and its line-height should be 150% of that value (18px and 27px," - text run at (0,112) width 147: "respectively). " - text run at (146,112) width 562: "Extra text is included for the purposes of testing this" - text run at (0,148) width 175: "more effectively." - LayoutBlockFlow {P} at (4,750.33) size 747x360 - LayoutText {#text} at (0,22) size 716x316 - text run at (0,22) width 701: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,94) width 225: "with a weight of 100. " - text run at (225,94) width 491: "Its font-size should be 150% the base font size," - text run at (0,166) width 661: "and its line-height should be 300% of that value (18px and 54px," - text run at (0,238) width 146: "respectively). " - text run at (145,238) width 560: "Extra text is included for the purposes of testing this" - text run at (0,310) width 174: "more effectively." - LayoutBlockFlow {P} at (4,1134.33) size 747x156 - LayoutText {#text} at (0,8) size 740x140 - text run at (0,8) width 740: "This element should be in a monospace font, italicized and small caps, with a weight" - text run at (0,47) width 88: "of 900. " - text run at (88,47) width 620: "Its font-size should be 150% the base font size, and its line-height" - text run at (0,86) width 716: "should be 2em, or twice the element's font size (18px and 36px, respectively)." - text run at (0,125) width 636: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1314.33) size 747x384 - LayoutText {#text} at (0,34) size 739x316 - text run at (0,34) width 701: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,130) width 225: "with a weight of 500. " - text run at (225,130) width 491: "Its font-size should be 150% the base font size," - text run at (0,226) width 433: "or 18px, and its line-height should be 1in. " - text run at (433,226) width 306: "Extra text is included for the" - text run at (0,322) width 427: "purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1722.33) size 747x144 - LayoutText {#text} at (0,7) size 730x129 - text run at (0,7) width 730: "This element should be in a sans-serif font, oblique and not small-caps, with a weight" - text run at (0,43) width 62: "of 700. " - text run at (62,43) width 665: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 176: "element's font size). " - text run at (176,79) width 500: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (4,1884.33) size 747x62 - LayoutText {#text} at (0,7) size 714x47 - text run at (0,7) width 378: "This element should be in a sans-serif font, with a weight of 400. " - text run at (378,7) width 336: "Its font-size should be 80% of 12px, or 9.6px, and its line-" - text run at (0,38) width 235: "height shoud be 2.5 times that, or 24px. " - text run at (235,38) width 404: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1970.33) size 747x432 - LayoutInline {SPAN} at (0,0) size 747x388 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,22) size 747x388 - text run at (0,22) width 701: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,94) width 225: "with a weight of 100. " - text run at (225,94) width 491: "Its font-size should be 150% the base font size," - text run at (0,166) width 661: "and its line-height should be 300% of that value (18px and 54px," - text run at (0,238) width 747: "respectively). The text should have a silver background. The background" - text run at (0,310) width 743: "color has been set on an inline element and should therefore only cover" - text run at (0,382) width 353: "the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,228) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,220) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_family-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_family-expected.png deleted file mode 100644 index 9c2375bd..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_family-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_family-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_family-expected.txt deleted file mode 100644 index 1dc1fa4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_family-expected.txt +++ /dev/null
@@ -1,140 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1324 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1324 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1324 - LayoutBlockFlow {BODY} at (8,8) size 769x1308 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 312x144 - text run at (0,0) width 216: "DIV.a {font-family: serif;}" - text run at (216,0) width 0: " " - text run at (0,16) width 248: "DIV.b {font-family: monospace;}" - text run at (248,16) width 0: " " - text run at (0,32) width 208: ".one {font-family: serif;}" - text run at (208,32) width 0: " " - text run at (0,48) width 248: ".two {font-family: sans-serif;}" - text run at (248,48) width 0: " " - text run at (0,64) width 240: ".three {font-family: cursive;}" - text run at (240,64) width 0: " " - text run at (0,80) width 232: ".four {font-family: fantasy;}" - text run at (232,80) width 0: " " - text run at (0,96) width 248: ".five {font-family: monospace;}" - text run at (248,96) width 0: " " - text run at (0,112) width 312: ".six {font-family: sans-serif,cursive;}" - text run at (312,112) width 0: " " - text run at (0,128) width 304: ".seven {font-family: monospace,serif;}" - text run at (304,128) width 0: " " - LayoutBlockFlow {DIV} at (0,211) size 769x198 - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,36) size 769x20 - LayoutText {#text} at (0,0) size 242x19 - text run at (0,0) width 242: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,72) size 769x19 - LayoutText {#text} at (0,0) size 311x18 - text run at (0,0) width 311: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,107) size 769x23 - LayoutText {#text} at (0,0) size 308x23 - text run at (0,0) width 308: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,146) size 769x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,182) size 769x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (0,440) size 769x19 - LayoutText {#text} at (0,0) size 396x18 - text run at (0,0) width 396: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (0,475) size 769x18 - LayoutText {#text} at (0,0) size 550x18 - text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (0,524) size 769x210 - LayoutBlockFlow {P} at (0,0) size 769x32 - LayoutText {#text} at (0,0) size 768x32 - text run at (0,0) width 768: "This sentence is normal for the first division, which is the next five sentences; it should be a" - text run at (0,16) width 120: "monospace font." - LayoutBlockFlow {P} at (0,48) size 769x20 - LayoutText {#text} at (0,0) size 242x19 - text run at (0,0) width 242: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,84) size 769x19 - LayoutText {#text} at (0,0) size 311x18 - text run at (0,0) width 311: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,119) size 769x23 - LayoutText {#text} at (0,0) size 308x23 - text run at (0,0) width 308: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,158) size 769x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,194) size 769x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutTable {TABLE} at (0,747) size 769x561 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x559 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x531 - LayoutTableCell {TD} at (0,279) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x531 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {DIV} at (4,4) size 747x198 - LayoutBlockFlow {P} at (0,0) size 747x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,36) size 747x20 - LayoutText {#text} at (0,0) size 242x19 - text run at (0,0) width 242: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,72) size 747x19 - LayoutText {#text} at (0,0) size 311x18 - text run at (0,0) width 311: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,107) size 747x23 - LayoutText {#text} at (0,0) size 308x23 - text run at (0,0) width 308: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,146) size 747x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,182) size 747x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (4,233) size 747x19 - LayoutText {#text} at (0,0) size 396x18 - text run at (0,0) width 396: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (4,268) size 747x18 - LayoutText {#text} at (0,0) size 550x18 - text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (4,317) size 747x210 - LayoutBlockFlow {P} at (0,0) size 747x32 - LayoutText {#text} at (0,0) size 728x32 - text run at (0,0) width 728: "This sentence is normal for the first division, which is the next five sentences; it should" - text run at (0,16) width 160: "be a monospace font." - LayoutBlockFlow {P} at (0,48) size 747x20 - LayoutText {#text} at (0,0) size 242x19 - text run at (0,0) width 242: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,84) size 747x19 - LayoutText {#text} at (0,0) size 311x18 - text run at (0,0) width 311: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,119) size 747x23 - LayoutText {#text} at (0,0) size 308x23 - text run at (0,0) width 308: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,158) size 747x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,194) size 747x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,430) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,422) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,517) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,509) size 769x2 [border: (1px inset #EEEEEE)] -layer at (25,999) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,215) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1086) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,302) size 747x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_size-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_size-expected.png deleted file mode 100644 index 77bb07f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_size-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_size-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_size-expected.txt deleted file mode 100644 index 9214ad4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_size-expected.txt +++ /dev/null
@@ -1,259 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2877 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2877 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2877.27 - LayoutBlockFlow {BODY} at (8,8) size 769x2861.27 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x320 - LayoutText {#text} at (0,0) size 224x320 - text run at (0,0) width 200: ".one {font-size: medium;}" - text run at (200,0) width 0: " " - text run at (0,16) width 200: ".two {font-size: larger;}" - text run at (200,16) width 0: " " - text run at (0,32) width 224: ".three {font-size: smaller;}" - text run at (224,32) width 0: " " - text run at (0,48) width 224: ".four {font-size: xx-small;}" - text run at (224,48) width 0: " " - text run at (0,64) width 216: ".five {font-size: x-small;}" - text run at (216,64) width 0: " " - text run at (0,80) width 192: ".six {font-size: small;}" - text run at (192,80) width 0: " " - text run at (0,96) width 208: ".seven {font-size: large;}" - text run at (208,96) width 0: " " - text run at (0,112) width 224: ".eight {font-size: x-large;}" - text run at (224,112) width 0: " " - text run at (0,128) width 224: ".nine {font-size: xx-large;}" - text run at (224,128) width 0: " " - text run at (0,144) width 176: ".a {font-size: 0.5in;}" - text run at (176,144) width 0: " " - text run at (0,160) width 160: ".b {font-size: 1cm;}" - text run at (160,160) width 0: " " - text run at (0,176) width 168: ".c {font-size: 10mm;}" - text run at (168,176) width 0: " " - text run at (0,192) width 168: ".d {font-size: 18pt;}" - text run at (168,192) width 0: " " - text run at (0,208) width 176: ".e {font-size: 1.5pc;}" - text run at (176,208) width 0: " " - text run at (0,224) width 160: ".f {font-size: 2em;}" - text run at (160,224) width 0: " " - text run at (0,240) width 160: ".g {font-size: 3ex;}" - text run at (160,240) width 0: " " - text run at (0,256) width 168: ".h {font-size: 25px;}" - text run at (168,256) width 0: " " - text run at (0,272) width 168: ".i {font-size: 200%;}" - text run at (168,272) width 0: " " - text run at (0,288) width 184: ".j {font-size: -0.5in;}" - text run at (184,288) width 0: " " - text run at (0,304) width 0: " " - LayoutBlockFlow {P} at (0,387) size 769x20 - LayoutText {#text} at (0,0) size 688x19 - text run at (0,0) width 688: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - LayoutBlockFlow {P} at (0,423) size 769x20 - LayoutText {#text} at (0,0) size 186x19 - text run at (0,0) width 186: "This sentence has been set to " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (186,3) size 48x16 - text run at (186,3) width 48: "medium" - LayoutText {#text} at (234,0) size 361x19 - text run at (234,0) width 361: ", which may or may not be the same size as unstyled text." - LayoutBlockFlow {P} at (0,462.19) size 769x22 - LayoutText {#text} at (0,0) size 377x21 - text run at (0,0) width 377: "This sentence should be larger than unstyled text." - LayoutBlockFlow {P} at (0,503.38) size 769x16 - LayoutText {#text} at (0,0) size 276x15 - text run at (0,0) width 276: "This sentence should be smaller than unstyled text." - LayoutBlockFlow {P} at (0,532.70) size 769x20 - LayoutText {#text} at (0,5) size 305x12 - text run at (0,5) width 305: "This sentence should be very small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (305,0) size 51x19 - text run at (305,0) width 51: "medium" - LayoutText {#text} at (356,5) size 2x12 - text run at (356,5) width 2: "." - LayoutBlockFlow {P} at (0,562.70) size 769x20 - LayoutText {#text} at (0,5) size 327x12 - text run at (0,5) width 327: "This sentence should be rather small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (327,0) size 51x19 - text run at (327,0) width 51: "medium" - LayoutText {#text} at (378,5) size 3x12 - text run at (378,5) width 3: "." - LayoutBlockFlow {P} at (0,595.70) size 769x20 - LayoutText {#text} at (0,3) size 401x15 - text run at (0,3) width 401: "This sentence should be small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (401,0) size 51x19 - text run at (401,0) width 51: "medium" - LayoutText {#text} at (452,3) size 3x15 - text run at (452,3) width 3: "." - LayoutBlockFlow {P} at (0,633.70) size 769x21 - LayoutText {#text} at (0,0) size 540x20 - text run at (0,0) width 540: "This sentence should be large, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 52x19 - LayoutText {#text} at (539,1) size 52x19 - text run at (539,1) width 52: "medium" - LayoutText {#text} at (590,0) size 6x20 - text run at (590,0) width 6: "." - LayoutBlockFlow {P} at (0,678.70) size 769x56 - LayoutText {#text} at (0,0) size 745x55 - text run at (0,0) width 745: "This sentence should be rather large, but the last word in the sentence should" - text run at (0,28) width 29: "be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (29,34) size 51x19 - text run at (29,34) width 51: "medium" - LayoutText {#text} at (80,28) size 6x27 - text run at (80,28) width 6: "." - LayoutBlockFlow {P} at (0,766.70) size 769x74 - LayoutText {#text} at (0,0) size 752x73 - text run at (0,0) width 752: "This sentence should be very large, but the last word in the" - text run at (0,37) width 248: "sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (248,50) size 51x19 - text run at (248,50) width 51: "medium" - LayoutText {#text} at (299,37) size 8x36 - text run at (299,37) width 8: "." - LayoutBlockFlow {P} at (0,888.70) size 769x114 - LayoutText {#text} at (0,1) size 695x112 - text run at (0,1) width 695: "This sentence should be half an inch" - text run at (0,58) width 72: "tall." - LayoutBlockFlow {P} at (0,1050.70) size 769x45 - LayoutText {#text} at (0,1) size 676x43 - text run at (0,1) width 676: "This sentence should be one centimeter tall." - LayoutBlockFlow {P} at (0,1133.48) size 769x45 - LayoutText {#text} at (0,1) size 682x43 - text run at (0,1) width 682: "This sentence should be ten millimeters tall." - LayoutBlockFlow {P} at (0,1216.27) size 769x28 - LayoutText {#text} at (0,0) size 430x27 - text run at (0,0) width 430: "This sentence should be eighteen points tall." - LayoutBlockFlow {P} at (0,1268.27) size 769x28 - LayoutText {#text} at (0,0) size 499x27 - text run at (0,0) width 499: "This sentence should be one and one half picas tall." - LayoutBlockFlow {P} at (0,1328.27) size 769x37 - LayoutText {#text} at (0,0) size 465x36 - text run at (0,0) width 465: "This sentence should be two em tall." - LayoutBlockFlow {P} at (0,1397.27) size 769x24 - LayoutText {#text} at (0,0) size 312x23 - text run at (0,0) width 312: "This sentence should be three ex tall." - LayoutBlockFlow {P} at (0,1446.27) size 769x30 - LayoutText {#text} at (0,0) size 476x29 - text run at (0,0) width 476: "This sentence should be twenty-five pixels tall." - LayoutBlockFlow {P} at (0,1508.27) size 769x37 - LayoutText {#text} at (0,0) size 546x36 - text run at (0,0) width 546: "This sentence should be twice normal size." - LayoutBlockFlow {P} at (0,1577.27) size 769x20 - LayoutText {#text} at (0,0) size 673x19 - text run at (0,0) width 673: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." - LayoutTable {TABLE} at (0,1613.27) size 769x1248 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1246 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1218 - LayoutTableCell {TD} at (0,623) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1218.27 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 688x19 - text run at (0,0) width 688: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - LayoutBlockFlow {P} at (4,40) size 747x20 - LayoutText {#text} at (0,0) size 186x19 - text run at (0,0) width 186: "This sentence has been set to " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (186,3) size 48x16 - text run at (186,3) width 48: "medium" - LayoutText {#text} at (234,0) size 361x19 - text run at (234,0) width 361: ", which may or may not be the same size as unstyled text." - LayoutBlockFlow {P} at (4,79.19) size 747x22 - LayoutText {#text} at (0,0) size 377x21 - text run at (0,0) width 377: "This sentence should be larger than unstyled text." - LayoutBlockFlow {P} at (4,120.38) size 747x16 - LayoutText {#text} at (0,0) size 276x15 - text run at (0,0) width 276: "This sentence should be smaller than unstyled text." - LayoutBlockFlow {P} at (4,149.70) size 747x20 - LayoutText {#text} at (0,5) size 305x12 - text run at (0,5) width 305: "This sentence should be very small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (305,0) size 51x19 - text run at (305,0) width 51: "medium" - LayoutText {#text} at (356,5) size 2x12 - text run at (356,5) width 2: "." - LayoutBlockFlow {P} at (4,179.70) size 747x20 - LayoutText {#text} at (0,5) size 327x12 - text run at (0,5) width 327: "This sentence should be rather small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (327,0) size 51x19 - text run at (327,0) width 51: "medium" - LayoutText {#text} at (378,5) size 3x12 - text run at (378,5) width 3: "." - LayoutBlockFlow {P} at (4,212.70) size 747x20 - LayoutText {#text} at (0,3) size 401x15 - text run at (0,3) width 401: "This sentence should be small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (401,0) size 51x19 - text run at (401,0) width 51: "medium" - LayoutText {#text} at (452,3) size 3x15 - text run at (452,3) width 3: "." - LayoutBlockFlow {P} at (4,250.70) size 747x21 - LayoutText {#text} at (0,0) size 540x20 - text run at (0,0) width 540: "This sentence should be large, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 52x19 - LayoutText {#text} at (539,1) size 52x19 - text run at (539,1) width 52: "medium" - LayoutText {#text} at (590,0) size 6x20 - text run at (590,0) width 6: "." - LayoutBlockFlow {P} at (4,295.70) size 747x56 - LayoutText {#text} at (0,0) size 745x55 - text run at (0,0) width 745: "This sentence should be rather large, but the last word in the sentence should" - text run at (0,28) width 29: "be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (29,34) size 51x19 - text run at (29,34) width 51: "medium" - LayoutText {#text} at (80,28) size 6x27 - text run at (80,28) width 6: "." - LayoutBlockFlow {P} at (4,383.70) size 747x74 - LayoutText {#text} at (0,0) size 705x73 - text run at (0,0) width 705: "This sentence should be very large, but the last word in" - text run at (0,37) width 295: "the sentence should be " - LayoutInline {SPAN} at (0,0) size 51x19 - LayoutText {#text} at (295,50) size 51x19 - text run at (295,50) width 51: "medium" - LayoutText {#text} at (346,37) size 8x36 - text run at (346,37) width 8: "." - LayoutBlockFlow {P} at (4,505.70) size 747x114 - LayoutText {#text} at (0,1) size 695x112 - text run at (0,1) width 695: "This sentence should be half an inch" - text run at (0,58) width 72: "tall." - LayoutBlockFlow {P} at (4,667.70) size 747x45 - LayoutText {#text} at (0,1) size 676x43 - text run at (0,1) width 676: "This sentence should be one centimeter tall." - LayoutBlockFlow {P} at (4,750.48) size 747x45 - LayoutText {#text} at (0,1) size 682x43 - text run at (0,1) width 682: "This sentence should be ten millimeters tall." - LayoutBlockFlow {P} at (4,833.27) size 747x28 - LayoutText {#text} at (0,0) size 430x27 - text run at (0,0) width 430: "This sentence should be eighteen points tall." - LayoutBlockFlow {P} at (4,885.27) size 747x28 - LayoutText {#text} at (0,0) size 499x27 - text run at (0,0) width 499: "This sentence should be one and one half picas tall." - LayoutBlockFlow {P} at (4,945.27) size 747x37 - LayoutText {#text} at (0,0) size 465x36 - text run at (0,0) width 465: "This sentence should be two em tall." - LayoutBlockFlow {P} at (4,1014.27) size 747x24 - LayoutText {#text} at (0,0) size 312x23 - text run at (0,0) width 312: "This sentence should be three ex tall." - LayoutBlockFlow {P} at (4,1063.27) size 747x30 - LayoutText {#text} at (0,0) size 476x29 - text run at (0,0) width 476: "This sentence should be twenty-five pixels tall." - LayoutBlockFlow {P} at (4,1125.27) size 747x37 - LayoutText {#text} at (0,0) size 546x36 - text run at (0,0) width 546: "This sentence should be twice normal size." - LayoutBlockFlow {P} at (4,1194.27) size 747x20 - LayoutText {#text} at (0,0) size 673x19 - text run at (0,0) width 673: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." -layer at (8,377) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,369) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_style-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_style-expected.png deleted file mode 100644 index 33e7506..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_style-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_style-expected.txt deleted file mode 100644 index 29f5108..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_style-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 248x64 - text run at (0,0) width 208: ".one {font-style: italic;}" - text run at (208,0) width 0: " " - text run at (0,16) width 216: ".two {font-style: oblique;}" - text run at (216,16) width 0: " " - text run at (0,32) width 248: ".three, I {font-style: normal;}" - text run at (248,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 - LayoutText {#text} at (0,0) size 501x19 - text run at (0,0) width 501: "This paragraph should be in italics, but the last word of the sentence should be " - LayoutInline {SPAN} at (0,0) size 45x19 - LayoutText {#text} at (500,0) size 45x19 - text run at (500,0) width 45: "normal" - LayoutText {#text} at (544,0) size 5x19 - text run at (544,0) width 5: "." - LayoutBlockFlow {P} at (0,167) size 784x20 - LayoutText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "This paragraph should be oblique." - LayoutBlockFlow {P} at (0,203) size 784x20 - LayoutInline {I} at (0,0) size 212x19 - LayoutText {#text} at (0,0) size 212x19 - text run at (0,0) width 212: "This paragraph should be normal." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,239) size 571x130 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 569x128 - LayoutTableRow {TR} at (0,0) size 569x28 - LayoutTableCell {TD} at (0,0) size 569x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 569x100 - LayoutTableCell {TD} at (0,64) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 557x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 549x20 - LayoutText {#text} at (0,0) size 501x19 - text run at (0,0) width 501: "This paragraph should be in italics, but the last word of the sentence should be " - LayoutInline {SPAN} at (0,0) size 45x19 - LayoutText {#text} at (500,0) size 45x19 - text run at (500,0) width 45: "normal" - LayoutText {#text} at (544,0) size 5x19 - text run at (544,0) width 5: "." - LayoutBlockFlow {P} at (4,40) size 549x20 - LayoutText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "This paragraph should be oblique." - LayoutBlockFlow {P} at (4,76) size 549x20 - LayoutInline {I} at (0,0) size 212x19 - LayoutText {#text} at (0,0) size 212x19 - text run at (0,0) width 212: "This paragraph should be normal." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_variant-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_variant-expected.png deleted file mode 100644 index c45818c4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_variant-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt deleted file mode 100644 index 84032c44..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 256x48 - text run at (0,0) width 256: ".one {font-variant: small-caps;}" - text run at (256,0) width 0: " " - text run at (0,16) width 224: ".two {font-variant: normal;}" - text run at (224,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x20 - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (0,151) size 784x20 - LayoutText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 48x19 - LayoutText {#text} at (574,0) size 48x19 - text run at (574,0) width 48: "Normal" - LayoutText {#text} at (622,0) size 4x19 - text run at (622,0) width 4: "." - LayoutTable {TABLE} at (0,187) size 648x94 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 646x92 - LayoutTableRow {TR} at (0,0) size 646x28 - LayoutTableCell {TD} at (0,0) size 646x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 646x64 - LayoutTableCell {TD} at (0,46) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 634x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 626x20 - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (4,40) size 626x20 - LayoutText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 48x19 - LayoutText {#text} at (574,0) size 48x19 - text run at (574,0) width 48: "Normal" - LayoutText {#text} at (622,0) size 4x19 - text run at (622,0) width 4: "." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_weight-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_weight-expected.png deleted file mode 100644 index 227a2b5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_weight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt deleted file mode 100644 index b4ddb2ef..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt +++ /dev/null
@@ -1,125 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1105 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1105 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1104.80 - LayoutBlockFlow {BODY} at (8,8) size 769x1088.80 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 240x176 - text run at (0,0) width 200: ".one {font-weight: bold;}" - text run at (200,0) width 0: " " - text run at (0,16) width 216: ".two {font-weight: bolder;}" - text run at (216,16) width 0: " " - text run at (0,32) width 240: ".three {font-weight: lighter;}" - text run at (240,32) width 0: " " - text run at (0,48) width 200: ".four {font-weight: 100;}" - text run at (200,48) width 0: " " - text run at (0,64) width 200: ".five {font-weight: 300;}" - text run at (200,64) width 0: " " - text run at (0,80) width 192: ".six {font-weight: 500;}" - text run at (192,80) width 0: " " - text run at (0,96) width 208: ".seven {font-weight: 700;}" - text run at (208,96) width 0: " " - text run at (0,112) width 208: ".eight {font-weight: 900;}" - text run at (208,112) width 0: " " - text run at (0,128) width 224: ".nine {font-weight: normal;}" - text run at (224,128) width 0: " " - text run at (0,144) width 200: "B {font-weight: lighter;}" - text run at (200,144) width 0: " " - text run at (0,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x20 - LayoutText {#text} at (0,0) size 198x19 - text run at (0,0) width 198: "This sentence should be bold." - LayoutBlockFlow {P} at (0,279) size 769x20 - LayoutText {#text} at (0,0) size 300x19 - text run at (0,0) width 300: "This sentence should be bolder than normal." - LayoutBlockFlow {H4} at (0,320.27) size 769x20 - LayoutText {#text} at (0,0) size 131x19 - text run at (0,0) width 131: "This is a heading-4." - LayoutBlockFlow {H4} at (0,361.53) size 769x20 - LayoutText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This is a bolder heading-4." - LayoutBlockFlow {P} at (0,402.80) size 769x20 - LayoutInline {B} at (0,0) size 353x19 - LayoutText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "This sentence should be normal (boldface made lighter)." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,438.80) size 769x20 - LayoutText {#text} at (0,0) size 230x19 - text run at (0,0) width 230: "This sentence should be weight 100." - LayoutBlockFlow {P} at (0,474.80) size 769x20 - LayoutText {#text} at (0,0) size 230x19 - text run at (0,0) width 230: "This sentence should be weight 300." - LayoutBlockFlow {P} at (0,510.80) size 769x20 - LayoutText {#text} at (0,0) size 230x19 - text run at (0,0) width 230: "This sentence should be weight 500." - LayoutBlockFlow {P} at (0,546.80) size 769x20 - LayoutText {#text} at (0,0) size 241x19 - text run at (0,0) width 241: "This sentence should be weight 700." - LayoutBlockFlow {P} at (0,582.80) size 769x20 - LayoutText {#text} at (0,0) size 241x19 - text run at (0,0) width 241: "This sentence should be weight 900." - LayoutBlockFlow {P} at (0,618.80) size 769x20 - LayoutText {#text} at (0,0) size 493x19 - text run at (0,0) width 493: "This sentence should be bold, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 44x19 - LayoutText {#text} at (493,0) size 44x19 - text run at (493,0) width 44: "normal" - LayoutText {#text} at (537,0) size 4x19 - text run at (537,0) width 4: "." - LayoutTable {TABLE} at (0,654.80) size 563x434 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 561x432 - LayoutTableRow {TR} at (0,0) size 561x28 - LayoutTableCell {TD} at (0,0) size 561x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 561x404 - LayoutTableCell {TD} at (0,216) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 549x403.80 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 541x20 - LayoutText {#text} at (0,0) size 198x19 - text run at (0,0) width 198: "This sentence should be bold." - LayoutBlockFlow {P} at (4,40) size 541x20 - LayoutText {#text} at (0,0) size 300x19 - text run at (0,0) width 300: "This sentence should be bolder than normal." - LayoutBlockFlow {H4} at (4,81.27) size 541x20 - LayoutText {#text} at (0,0) size 131x19 - text run at (0,0) width 131: "This is a heading-4." - LayoutBlockFlow {H4} at (4,122.53) size 541x20 - LayoutText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This is a bolder heading-4." - LayoutBlockFlow {P} at (4,163.80) size 541x20 - LayoutInline {B} at (0,0) size 353x19 - LayoutText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "This sentence should be normal (boldface made lighter)." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,199.80) size 541x20 - LayoutText {#text} at (0,0) size 230x19 - text run at (0,0) width 230: "This sentence should be weight 100." - LayoutBlockFlow {P} at (4,235.80) size 541x20 - LayoutText {#text} at (0,0) size 230x19 - text run at (0,0) width 230: "This sentence should be weight 300." - LayoutBlockFlow {P} at (4,271.80) size 541x20 - LayoutText {#text} at (0,0) size 230x19 - text run at (0,0) width 230: "This sentence should be weight 500." - LayoutBlockFlow {P} at (4,307.80) size 541x20 - LayoutText {#text} at (0,0) size 241x19 - text run at (0,0) width 241: "This sentence should be weight 700." - LayoutBlockFlow {P} at (4,343.80) size 541x20 - LayoutText {#text} at (0,0) size 241x19 - text run at (0,0) width 241: "This sentence should be weight 900." - LayoutBlockFlow {P} at (4,379.80) size 541x20 - LayoutText {#text} at (0,0) size 493x19 - text run at (0,0) width 493: "This sentence should be bold, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 44x19 - LayoutText {#text} at (493,0) size 44x19 - text run at (493,0) width 44: "normal" - LayoutText {#text} at (537,0) size 4x19 - text run at (537,0) width 4: "." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/canvas-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/canvas-expected.png deleted file mode 100644 index a02bac0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/canvas-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt deleted file mode 100644 index a027deb..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (25,25) size 750x550 [bgcolor=#008000] - LayoutBlockFlow {P} at (0,0) size 750x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 750x32 - LayoutText {#text} at (0,0) size 552x32 - text run at (0,0) width 240: "HTML {background-color: aqua;}" - text run at (240,0) width 0: " " - text run at (0,16) width 552: "BODY {background-color: green; background-image: none; margin: 25px;}" - text run at (552,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 750x60 - LayoutText {#text} at (0,0) size 737x59 - text run at (0,0) width 387: "The body of this document should have a green background. " - text run at (387,0) width 308: "It also has a margin of 25 pixels, so the light blue" - text run at (0,20) width 430: "background set for the HTML element should surround the BODY. " - text run at (429,20) width 308: "If the BODY content is significantly shorter than" - text run at (0,40) width 519: "the browser's window height, then the bottom border may be larger than 25 pixels." - LayoutTable {TABLE} at (0,175) size 750x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 748x96 - LayoutTableRow {TR} at (0,0) size 748x28 - LayoutTableCell {TD} at (0,0) size 748x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 748x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 736x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 728x60 - LayoutText {#text} at (0,0) size 706x59 - text run at (0,0) width 387: "The body of this document should have a green background. " - text run at (387,0) width 308: "It also has a margin of 25 pixels, so the light blue" - text run at (0,20) width 430: "background set for the HTML element should surround the BODY. " - text run at (429,20) width 277: "If the BODY content is significantly shorter" - text run at (0,40) width 550: "than the browser's window height, then the bottom border may be larger than 25 pixels." -layer at (25,106) size 750x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 750x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png deleted file mode 100644 index a7eeb697..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt deleted file mode 100644 index a92b1b2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt +++ /dev/null
@@ -1,747 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 6798 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x6798 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x6798 - LayoutBlockFlow {BODY} at (8,8) size 769x6782 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 480x144 - text run at (0,0) width 272: "HR.minor {clear: both; width: 5%;}" - text run at (272,0) width 0: " " - text run at (0,16) width 400: "HR.major {clear: both; width: 75%; margin: 1.5em;}" - text run at (400,16) width 0: " " - text run at (0,32) width 480: "DIV {border: 5px solid purple; padding: 0; margin: 0.125em;}" - text run at (480,32) width 0: " " - text run at (0,48) width 432: "P.left, P.right {width: 10em; padding: 1em; margin: 0;" - text run at (432,48) width 0: " " - text run at (0,64) width 424: " border: 1px solid lime; background-color: silver;}" - text run at (424,64) width 0: " " - text run at (0,80) width 456: "IMG.left, IMG.right {margin: 0; border: 3px solid black;}" - text run at (456,80) width 0: " " - text run at (0,96) width 160: ".left {float: left;}" - text run at (160,96) width 0: " " - text run at (0,112) width 176: ".right {float: right;}" - text run at (176,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow {P} at (0,211) size 769x40 - LayoutText {#text} at (0,0) size 751x39 - text run at (0,0) width 681: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (681,0) width 67: "Other than" - text run at (0,20) width 751: "the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." - LayoutBlockFlow {DIV} at (2,301) size 765x110 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutBlockFlow (floating) {P} at (566,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,5) size 363x99 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 181: "The floating elements within" - text run at (199,25) width 363: "this DIV should not go beyond the left or right inner edge" - text run at (199,45) width 354: "of this DIV, which means that the borders of the floating" - text run at (199,65) width 360: "elements should not overlap the top or side borders of the" - text run at (199,85) width 31: "DIV." - LayoutBlockFlow {DIV} at (2,429) size 765x70 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 726x59 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 537: "The floating images within this DIV should not go beyond the left or right inner edge" - text run at (20,25) width 707: "of this DIV, which means that the borders of the floating images should not overlap the top or side borders of the" - text run at (5,45) width 31: "DIV." - LayoutBlockFlow {DIV} at (2,549) size 442x250 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 122x39 - text run at (17,17) width 122: "This is the first left-" - text run at (17,37) width 119: "floating paragraph." - LayoutBlockFlow (floating) {P} at (199,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 142x39 - text run at (17,17) width 142: "This is the second left-" - text run at (17,37) width 119: "floating paragraph." - LayoutBlockFlow (floating) {P} at (5,79) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 127x39 - text run at (17,17) width 127: "This is the third left-" - text run at (17,37) width 119: "floating paragraph." - LayoutText {#text} at (393,5) size 430x239 - text run at (393,5) width 42: "This is" - text run at (393,25) width 23: "text" - text run at (393,45) width 40: "within" - text run at (393,65) width 19: "the" - text run at (199,85) width 35: "DIV. " - text run at (233,85) width 181: "The floating elements within" - text run at (199,105) width 219: "this DIV should not go beyond the" - text run at (199,125) width 218: "left or right inner edge of this DIV," - text run at (199,145) width 224: "which means that the borders of the" - text run at (5,165) width 412: "floating elements should not overlap the top or side borders of the" - text run at (5,185) width 110: "DIV in any way. " - text run at (114,185) width 298: "In addition, they should not overlap each other." - text run at (5,205) width 425: "The first two should be side by side, whereas the third should be on" - text run at (5,225) width 95: "the next \"line.\"" - LayoutBlockFlow {DIV} at (2,817) size 360x210 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - LayoutText {#text} at (317,5) size 350x199 - text run at (317,5) width 28: "This" - text run at (317,25) width 37: "is text" - text run at (161,45) width 102: "within the DIV. " - text run at (262,45) width 78: "The floating" - text run at (161,65) width 193: "images within this DIV should" - text run at (5,85) width 336: "not go beyond the left or right inner edge of this DIV," - text run at (5,105) width 324: "which means that the borders of the floating images" - text run at (5,125) width 350: "should not overlap the top or side borders of the DIV in" - text run at (5,145) width 61: "any way. " - text run at (65,145) width 258: "In addition, they should not overlap each" - text run at (5,165) width 40: "other. " - text run at (44,165) width 308: "The first two should be side by side, whereas the" - text run at (5,185) width 213: "third should be on the next \"line.\"" - LayoutBlockFlow {DIV} at (2,1077) size 314x384 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutBlockFlow (floating) {P} at (115,99) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,5) size 304x373 - text run at (199,5) width 69: "This is text" - text run at (199,25) width 98: "within the DIV." - text run at (199,45) width 77: "The floating" - text run at (199,65) width 99: "elements within" - text run at (5,99) width 101: "this DIV should" - text run at (5,119) width 91: "not go beyond" - text run at (5,139) width 93: "the left or right" - text run at (5,159) width 109: "inner edge of this" - text run at (5,179) width 74: "DIV, which" - text run at (5,199) width 292: "means that the borders of the floating elements" - text run at (5,219) width 301: "should not overlap the top or side borders of the" - text run at (5,239) width 110: "DIV in any way. " - text run at (114,239) width 174: "In addition, they should not" - text run at (5,259) width 287: "overlap each other in any way, nor should the" - text run at (5,279) width 304: "floated elements be overwritten by the DIV text." - text run at (5,299) width 290: "In addition, the floated elements should not be" - text run at (5,319) width 268: "side-by-side, but instead the first should be" - text run at (5,339) width 288: "floated left, and the second floated to the right" - text run at (5,359) width 94: "below the first." - LayoutBlockFlow {DIV} at (2,1479) size 410x246 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - LayoutText {#text} at (261,5) size 398x235 - text run at (261,5) width 136: "This is text within the" - text run at (5,41) width 35: "DIV. " - text run at (39,41) width 78: "The floating" - text run at (5,61) width 114: "images within this" - text run at (5,81) width 380: "DIV should not go beyond the left or right inner edge of this" - text run at (5,101) width 359: "DIV, which means that the borders of the floating images" - text run at (5,121) width 377: "should not overlap the top or side borders of the DIV in any" - text run at (5,141) width 34: "way. " - text run at (38,141) width 337: "In addition, they should not overlap each other in any" - text run at (5,161) width 368: "way, nor should the floated elements be overwritten by the" - text run at (5,181) width 64: "DIV text. " - text run at (69,181) width 334: "In addition, the floated images should not be side-by-" - text run at (5,201) width 390: "side, but instead the first should be floated left, and the second" - text run at (5,221) width 213: "floated to the right below the first." - LayoutBlockFlow {DIV} at (2,1775) size 765x130 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (566,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 132x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,5) size 549x119 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 181: "The floating elements within" - text run at (199,25) width 350: "this DIV should not go beyond the top side of this DIV," - text run at (199,45) width 335: "which means that the borders of the floating elements" - text run at (199,65) width 350: "should not overlap the top or side borders of the DIV in" - text run at (199,85) width 61: "any way. " - text run at (259,85) width 265: "In addition, the top of the left-floating box" - text run at (5,105) width 365: "should not be higher than the top of the right-floating box." - LayoutBlockFlow {DIV} at (2,1923) size 765x70 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 720x59 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 524: "The floating images within this DIV should not go beyond the top side of this DIV," - text run at (20,25) width 705: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in any" - text run at (5,45) width 34: "way. " - text run at (38,45) width 662: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." - LayoutBlockFlow {DIV} at (2,2043) size 765x150 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 183x19 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (381,5) size 543x39 - text run at (381,5) width 361: " The floating elements within this DIV should not go any" - text run at (199,25) width 477: "higher than the line-box containing the inline content which precedes them. " - text run at (676,25) width 12: "* " - LayoutBlockFlow (floating) {P} at (566,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (688,25) size 755x119 - text run at (688,25) width 72: "This means" - text run at (199,45) width 349: "that the top side of each float can be, at most, as high as" - text run at (199,65) width 352: "the top edge of the inline element containing the content" - text run at (199,85) width 331: "just before the floating elements occur in the source. " - text run at (530,85) width 13: "In" - text run at (5,105) width 544: "order to mark these points clearly, an asterisk has been inserted just before each floated" - text run at (5,125) width 53: "element." - LayoutBlockFlow {DIV} at (2,2211) size 765x90 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 183x19 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (202,5) size 686x39 - text run at (202,5) width 504: " The floating images within this DIV should not go any higher than the line-box" - text run at (20,25) width 323: "containing the inline content which precedes them. " - text run at (343,25) width 12: "* " - LayoutImage (floating) {IMG} at (745,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (355,25) size 738x59 - text run at (355,25) width 376: "This means that the top side of each float can be, at most, as" - text run at (5,45) width 725: "high as the top edge of the inline element containing the content just before the floating images occur in the source. " - text run at (730,45) width 13: "In" - text run at (5,65) width 590: "order to mark these points clearly, an asterisk has been inserted just before each floated image." - LayoutBlockFlow {DIV} at (2,2351) size 765x290 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 183x19 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (381,5) size 543x39 - text run at (381,5) width 361: " The floating elements within this DIV should not go any" - text run at (199,25) width 477: "higher than the line-box containing the inline content which precedes them. " - text run at (676,25) width 12: "* " - LayoutBlockFlow (floating) {P} at (566,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (688,25) size 561x39 - text run at (688,25) width 72: "This means" - text run at (199,45) width 238: "that the top side of each float can be,*" - LayoutBlockFlow (floating) {P} at (199,65) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 117: "paragraph (third in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (437,45) size 274x119 - text run at (437,45) width 119: " at most, as high as" - text run at (393,65) width 156: "the top edge of the inline" - text run at (393,85) width 142: "element containing the" - text run at (393,105) width 139: "content just before the" - text run at (393,125) width 162: "floating elements occur in" - text run at (587,145) width 72: "the source. " - text run at (659,145) width 8: "*" - LayoutBlockFlow (floating) {P} at (393,145) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 126: "paragraph (fourth in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (667,145) size 741x139 - text run at (667,145) width 70: " In order to" - text run at (587,165) width 159: "mark these points clearly," - text run at (587,185) width 125: "an asterisk has been" - text run at (587,205) width 152: "inserted just before each" - text run at (587,225) width 104: "floated element. " - text run at (691,225) width 48: "If a line" - text run at (5,245) width 722: "has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in" - text run at (5,265) width 173: "which the asterisk appears. " - text run at (178,265) width 402: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (2,2659) size 765x130 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 183x19 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (202,5) size 671x39 - text run at (202,5) width 504: " The floating images within this DIV should not go any higher than the line-box" - text run at (35,25) width 323: "containing the inline content which precedes them. " - text run at (358,25) width 12: "* " - LayoutImage (floating) {IMG} at (745,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (370,25) size 318x19 - text run at (370,25) width 310: "This means that the top side of each float can be, " - text run at (680,25) width 8: "*" - LayoutImage (floating) {IMG} at (20,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (688,25) size 721x59 - text run at (688,25) width 53: " at most," - text run at (35,45) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" - text run at (20,65) width 49: "source. " - text run at (69,65) width 8: "*" - LayoutImage (floating) {IMG} at (5,65) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (77,65) size 735x59 - text run at (77,65) width 615: " In order to mark these points clearly, an asterisk has been inserted just before each floated image. " - text run at (691,65) width 49: "If a line" - text run at (20,85) width 700: "has room for a floated image, then the image should float so that its top is aligned with the top of the line-box in" - text run at (5,105) width 173: "which the asterisk appears. " - text run at (178,105) width 402: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (2,2839) size 490x330 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 54x19 - text run at (199,5) width 54: "This is *" - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (253,5) size 12x19 - text run at (253,5) width 12: " *" - LayoutBlockFlow (floating) {P} at (291,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,25) size 475x299 - text run at (199,25) width 90: "text within the" - text run at (199,45) width 35: "DIV. " - text run at (233,45) width 41: "Under" - text run at (199,65) width 88: "CSS1, the left" - text run at (199,85) width 48: "floating" - text run at (5,105) width 475: "element should be placed in the upper left corner of the DIV, and the purple" - text run at (5,125) width 447: "border of the DIV should abut the green border of the floating element." - text run at (5,145) width 443: "Similarly, the right floating element should be placed in the upper right" - text run at (5,165) width 466: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,185) width 451: "border of the floating element. The text of the DIV element should flow" - text run at (5,205) width 461: "between and under the two floating elements. The two asterisk characters" - text run at (5,225) width 468: "mark the insertion points of the floating elements. It is expected that, under" - text run at (5,245) width 470: "future specifications, it may be acceptable for the top of floated elements to" - text run at (5,265) width 475: "align with the top of the line-box following the insertion point of the floated" - text run at (5,285) width 466: "element to avoid floating elements appearing before text which precedes it" - text run at (5,305) width 150: "in the source document." - LayoutBlockFlow {DIV} at (2,3187) size 490x250 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 54x19 - text run at (20,5) width 54: "This is *" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (74,5) size 12x19 - text run at (74,5) width 12: " *" - LayoutImage (floating) {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (86,5) size 480x239 - text run at (86,5) width 133: " text within the DIV. " - text run at (218,5) width 227: "Under CSS1, the left floating image" - text run at (20,25) width 422: "should be placed in the upper left corner of the DIV, and the purple" - text run at (5,45) width 436: "border of the DIV should abut the green border of the floating image." - text run at (5,65) width 476: "Similarly, the right floating image should be placed in the upper right corner" - text run at (5,85) width 467: "of the DIV, and the purple border of the DIV should abut the green border" - text run at (5,105) width 479: "of the floating image. The text of the DIV element should flow between and" - text run at (5,125) width 477: "under the two floating image. The two asterisk characters mark the insertion" - text run at (5,145) width 180: "points of the floating image. " - text run at (185,145) width 300: "It is expected that, under future specifications, it" - text run at (5,165) width 478: "may be acceptable for the top of floated elements to align with the top of the" - text run at (5,185) width 429: "line-box following the insertion point of the floated element to avoid" - text run at (5,205) width 442: "floating elements appearing before text which precedes it in the source" - text run at (5,225) width 66: "document." - LayoutTable {TABLE} at (0,3487) size 769x3295 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x3293 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x3265 - LayoutTableCell {TD} at (0,1646) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x3265 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutText {#text} at (0,0) size 740x59 - text run at (0,0) width 681: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (681,0) width 36: "Other" - text run at (0,20) width 740: "than the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the" - text run at (0,40) width 38: "floats." - LayoutBlockFlow {DIV} at (6,114) size 743x110 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutBlockFlow (floating) {P} at (544,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,5) size 337x99 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 137: "The floating elements" - text run at (199,25) width 337: "within this DIV should not go beyond the left or right" - text run at (199,45) width 332: "inner edge of this DIV, which means that the borders" - text run at (199,65) width 332: "of the floating elements should not overlap the top or" - text run at (199,85) width 151: "side borders of the DIV." - LayoutBlockFlow {DIV} at (6,242) size 743x70 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 716x59 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 503: "The floating images within this DIV should not go beyond the left or right inner" - text run at (20,25) width 701: "edge of this DIV, which means that the borders of the floating images should not overlap the top or side borders" - text run at (5,45) width 71: "of the DIV." - LayoutBlockFlow {DIV} at (6,362) size 442x250 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 122x39 - text run at (17,17) width 122: "This is the first left-" - text run at (17,37) width 119: "floating paragraph." - LayoutBlockFlow (floating) {P} at (199,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 142x39 - text run at (17,17) width 142: "This is the second left-" - text run at (17,37) width 119: "floating paragraph." - LayoutBlockFlow (floating) {P} at (5,79) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 127x39 - text run at (17,17) width 127: "This is the third left-" - text run at (17,37) width 119: "floating paragraph." - LayoutText {#text} at (393,5) size 430x239 - text run at (393,5) width 42: "This is" - text run at (393,25) width 23: "text" - text run at (393,45) width 40: "within" - text run at (393,65) width 19: "the" - text run at (199,85) width 35: "DIV. " - text run at (233,85) width 181: "The floating elements within" - text run at (199,105) width 219: "this DIV should not go beyond the" - text run at (199,125) width 218: "left or right inner edge of this DIV," - text run at (199,145) width 224: "which means that the borders of the" - text run at (5,165) width 412: "floating elements should not overlap the top or side borders of the" - text run at (5,185) width 110: "DIV in any way. " - text run at (114,185) width 298: "In addition, they should not overlap each other." - text run at (5,205) width 425: "The first two should be side by side, whereas the third should be on" - text run at (5,225) width 95: "the next \"line.\"" - LayoutBlockFlow {DIV} at (6,630) size 360x210 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - LayoutText {#text} at (317,5) size 350x199 - text run at (317,5) width 28: "This" - text run at (317,25) width 37: "is text" - text run at (161,45) width 102: "within the DIV. " - text run at (262,45) width 78: "The floating" - text run at (161,65) width 193: "images within this DIV should" - text run at (5,85) width 336: "not go beyond the left or right inner edge of this DIV," - text run at (5,105) width 324: "which means that the borders of the floating images" - text run at (5,125) width 350: "should not overlap the top or side borders of the DIV in" - text run at (5,145) width 61: "any way. " - text run at (65,145) width 258: "In addition, they should not overlap each" - text run at (5,165) width 40: "other. " - text run at (44,165) width 308: "The first two should be side by side, whereas the" - text run at (5,185) width 213: "third should be on the next \"line.\"" - LayoutBlockFlow {DIV} at (6,890) size 314x384 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutBlockFlow (floating) {P} at (115,99) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,5) size 304x373 - text run at (199,5) width 69: "This is text" - text run at (199,25) width 98: "within the DIV." - text run at (199,45) width 77: "The floating" - text run at (199,65) width 99: "elements within" - text run at (5,99) width 101: "this DIV should" - text run at (5,119) width 91: "not go beyond" - text run at (5,139) width 93: "the left or right" - text run at (5,159) width 109: "inner edge of this" - text run at (5,179) width 74: "DIV, which" - text run at (5,199) width 292: "means that the borders of the floating elements" - text run at (5,219) width 301: "should not overlap the top or side borders of the" - text run at (5,239) width 110: "DIV in any way. " - text run at (114,239) width 174: "In addition, they should not" - text run at (5,259) width 287: "overlap each other in any way, nor should the" - text run at (5,279) width 304: "floated elements be overwritten by the DIV text." - text run at (5,299) width 290: "In addition, the floated elements should not be" - text run at (5,319) width 268: "side-by-side, but instead the first should be" - text run at (5,339) width 288: "floated left, and the second floated to the right" - text run at (5,359) width 94: "below the first." - LayoutBlockFlow {DIV} at (6,1292) size 410x246 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - LayoutText {#text} at (261,5) size 398x235 - text run at (261,5) width 136: "This is text within the" - text run at (5,41) width 35: "DIV. " - text run at (39,41) width 78: "The floating" - text run at (5,61) width 114: "images within this" - text run at (5,81) width 380: "DIV should not go beyond the left or right inner edge of this" - text run at (5,101) width 359: "DIV, which means that the borders of the floating images" - text run at (5,121) width 377: "should not overlap the top or side borders of the DIV in any" - text run at (5,141) width 34: "way. " - text run at (38,141) width 337: "In addition, they should not overlap each other in any" - text run at (5,161) width 368: "way, nor should the floated elements be overwritten by the" - text run at (5,181) width 64: "DIV text. " - text run at (69,181) width 334: "In addition, the floated images should not be side-by-" - text run at (5,201) width 390: "side, but instead the first should be floated left, and the second" - text run at (5,221) width 213: "floated to the right below the first." - LayoutBlockFlow {DIV} at (6,1588) size 743x130 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (544,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 132x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,5) size 531x119 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 137: "The floating elements" - text run at (199,25) width 333: "within this DIV should not go beyond the top side of" - text run at (199,45) width 337: "this DIV, which means that the borders of the floating" - text run at (199,65) width 337: "elements should not overlap the top or side borders of" - text run at (199,85) width 133: "the DIV in any way. " - text run at (331,85) width 189: "In addition, the top of the left-" - text run at (5,105) width 445: "floating box should not be higher than the top of the right-floating box." - LayoutBlockFlow {DIV} at (6,1736) size 743x70 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 722x59 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 524: "The floating images within this DIV should not go beyond the top side of this DIV," - text run at (20,25) width 678: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in" - text run at (5,45) width 61: "any way. " - text run at (65,45) width 662: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." - LayoutBlockFlow {DIV} at (6,1856) size 743x150 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 183x19 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (381,5) size 516x39 - text run at (381,5) width 334: " The floating elements within this DIV should not go" - text run at (199,25) width 504: "any higher than the line-box containing the inline content which precedes them. " - text run at (703,25) width 8: "*" - LayoutBlockFlow (floating) {P} at (544,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,45) size 538x99 - text run at (199,45) width 321: "This means that the top side of each float can be, at" - text run at (199,65) width 313: "most, as high as the top edge of the inline element" - text run at (199,85) width 343: "containing the content just before the floating elements" - text run at (5,105) width 127: "occur in the source. " - text run at (132,105) width 411: "In order to mark these points clearly, an asterisk has been inserted" - text run at (5,125) width 203: "just before each floated element." - LayoutBlockFlow {DIV} at (6,2024) size 743x90 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 183x19 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (202,5) size 686x39 - text run at (202,5) width 504: " The floating images within this DIV should not go any higher than the line-box" - text run at (20,25) width 323: "containing the inline content which precedes them. " - text run at (343,25) width 12: "* " - LayoutImage (floating) {IMG} at (723,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (355,25) size 709x59 - text run at (355,25) width 359: "This means that the top side of each float can be, at most," - text run at (5,45) width 689: "as high as the top edge of the inline element containing the content just before the floating images occur in the" - text run at (5,65) width 49: "source. " - text run at (54,65) width 607: "In order to mark these points clearly, an asterisk has been inserted just before each floated image." - LayoutBlockFlow {DIV} at (6,2164) size 743x250 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 183x19 - text run at (199,5) width 175: "This is text within the DIV. " - text run at (373,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (381,5) size 516x39 - text run at (381,5) width 334: " The floating elements within this DIV should not go" - text run at (199,25) width 504: "any higher than the line-box containing the inline content which precedes them. " - text run at (703,25) width 8: "*" - LayoutBlockFlow (floating) {P} at (544,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,45) size 314x19 - text run at (199,45) width 314: "This means that the top side of each float can be,*" - LayoutBlockFlow (floating) {P} at (199,65) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 117: "paragraph (third in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (513,45) size 246x119 - text run at (513,45) width 15: " at" - text run at (393,65) width 147: "most, as high as the top" - text run at (393,85) width 109: "edge of the inline" - text run at (393,105) width 142: "element containing the" - text run at (393,125) width 139: "content just before the" - text run at (393,145) width 238: "floating elements occur in the source. " - text run at (631,145) width 8: "*" - LayoutBlockFlow (floating) {P} at (5,165) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 126: "paragraph (fourth in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (639,145) size 539x99 - text run at (639,145) width 70: " In order to" - text run at (199,165) width 491: "mark these points clearly, an asterisk has been inserted just before each floated" - text run at (199,185) width 57: "element. " - text run at (256,185) width 477: "If a line has room for a floated element, then the element should float so that" - text run at (199,205) width 470: "its top is aligned with the top of the line-box in which the asterisk appears. " - text run at (669,205) width 69: "Otherwise," - text run at (199,225) width 329: "its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (6,2433) size 743x130 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 183x19 - text run at (20,5) width 175: "This is text within the DIV. " - text run at (194,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (202,5) size 671x39 - text run at (202,5) width 504: " The floating images within this DIV should not go any higher than the line-box" - text run at (35,25) width 323: "containing the inline content which precedes them. " - text run at (358,25) width 12: "* " - LayoutImage (floating) {IMG} at (723,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (370,25) size 318x19 - text run at (370,25) width 310: "This means that the top side of each float can be, " - text run at (680,25) width 8: "*" - LayoutImage (floating) {IMG} at (20,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (688,25) size 703x59 - text run at (688,25) width 15: " at" - text run at (35,45) width 688: "most, as high as the top edge of the inline element containing the content just before the floating images occur" - text run at (20,65) width 88: "in the source. " - text run at (108,65) width 8: "*" - LayoutImage (floating) {IMG} at (5,65) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (116,65) size 727x59 - text run at (116,65) width 611: " In order to mark these points clearly, an asterisk has been inserted just before each floated image." - text run at (20,85) width 712: "If a line has room for a floated image, then the image should float so that its top is aligned with the top of the line-" - text run at (5,105) width 217: "box in which the asterisk appears. " - text run at (222,105) width 402: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (6,2613) size 490x330 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 54x19 - text run at (199,5) width 54: "This is *" - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 130x59 - text run at (17,17) width 130: "This is a left-floating" - text run at (17,37) width 112: "paragraph (first in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (253,5) size 12x19 - text run at (253,5) width 12: " *" - LayoutBlockFlow (floating) {P} at (291,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 139x59 - text run at (17,17) width 139: "This is a right-floating" - text run at (17,37) width 132: "paragraph (second in" - text run at (17,57) width 50: "source)." - LayoutText {#text} at (199,25) size 475x299 - text run at (199,25) width 90: "text within the" - text run at (199,45) width 35: "DIV. " - text run at (233,45) width 41: "Under" - text run at (199,65) width 88: "CSS1, the left" - text run at (199,85) width 48: "floating" - text run at (5,105) width 475: "element should be placed in the upper left corner of the DIV, and the purple" - text run at (5,125) width 447: "border of the DIV should abut the green border of the floating element." - text run at (5,145) width 443: "Similarly, the right floating element should be placed in the upper right" - text run at (5,165) width 466: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,185) width 451: "border of the floating element. The text of the DIV element should flow" - text run at (5,205) width 461: "between and under the two floating elements. The two asterisk characters" - text run at (5,225) width 468: "mark the insertion points of the floating elements. It is expected that, under" - text run at (5,245) width 470: "future specifications, it may be acceptable for the top of floated elements to" - text run at (5,265) width 475: "align with the top of the line-box following the insertion point of the floated" - text run at (5,285) width 466: "element to avoid floating elements appearing before text which precedes it" - text run at (5,305) width 150: "in the source document." - LayoutBlockFlow {DIV} at (6,2961) size 490x250 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 54x19 - text run at (20,5) width 54: "This is *" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (74,5) size 12x19 - text run at (74,5) width 12: " *" - LayoutImage (floating) {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (86,5) size 480x239 - text run at (86,5) width 133: " text within the DIV. " - text run at (218,5) width 227: "Under CSS1, the left floating image" - text run at (20,25) width 422: "should be placed in the upper left corner of the DIV, and the purple" - text run at (5,45) width 436: "border of the DIV should abut the green border of the floating image." - text run at (5,65) width 476: "Similarly, the right floating image should be placed in the upper right corner" - text run at (5,85) width 467: "of the DIV, and the purple border of the DIV should abut the green border" - text run at (5,105) width 479: "of the floating image. The text of the DIV element should flow between and" - text run at (5,125) width 477: "under the two floating image. The two asterisk characters mark the insertion" - text run at (5,145) width 180: "points of the floating image. " - text run at (185,145) width 300: "It is expected that, under future specifications, it" - text run at (5,165) width 478: "may be acceptable for the top of floated elements to align with the top of the" - text run at (5,185) width 429: "line-box following the insertion point of the floated element to avoid" - text run at (5,205) width 442: "floating elements appearing before text which precedes it in the source" - text run at (5,225) width 66: "document." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)] -layer at (32,283) size 579x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,275) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,427) size 41x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,419) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,531) size 579x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,523) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,815) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,807) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1059) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,1051) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,1477) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,1469) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1757) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,1749) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,1921) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,1913) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,2025) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,2017) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2209) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2201) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,2333) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,2325) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2657) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2649) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,2821) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,2813) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,3185) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,3177) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,3469) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,3461) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (49,3612) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,88) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,3756) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,232) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,3860) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,336) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,4144) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,620) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,4388) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,864) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,4806) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1282) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5086) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,1562) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,5250) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1726) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5354) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,1830) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,5538) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,2014) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5662) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,2138) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,5947) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,2423) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,6111) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,2587) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,6475) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,2951) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,6759) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,3235) size 562.25x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png deleted file mode 100644 index 320b7fcd..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt deleted file mode 100644 index 114d900..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt +++ /dev/null
@@ -1,134 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2345 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2345 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2345 - LayoutBlockFlow {BODY} at (8,8) size 769x2329 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x288 - LayoutText {#text} at (0,0) size 536x288 - text run at (0,0) width 344: "P.one {font-size: 14px; line-height: 20px;}" - text run at (344,0) width 0: " " - text run at (0,16) width 304: "IMG.onea {vertical-align: text-bottom;" - text run at (304,16) width 0: " " - text run at (0,32) width 272: " width: 200px; height: 200px;}" - text run at (272,32) width 0: " " - text run at (0,48) width 520: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}" - text run at (520,48) width 0: " " - text run at (0,64) width 0: " " - text run at (0,80) width 344: "P.two {font-size: 14px; line-height: 20px;}" - text run at (344,80) width 0: " " - text run at (0,96) width 536: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;" - text run at (536,96) width 0: " " - text run at (0,112) width 312: " padding: 5px; border-style: solid;" - text run at (312,112) width 0: " " - text run at (0,128) width 312: " border-width: 10px; margin: 15px;}" - text run at (312,128) width 0: " " - text run at (0,144) width 280: "IMG.twob {vertical-align: text-top;" - text run at (280,144) width 0: " " - text run at (0,160) width 304: " width: 100px; height: 100px;" - text run at (304,160) width 0: " " - text run at (0,176) width 312: " padding: 5px; border-style: solid;" - text run at (312,176) width 0: " " - text run at (0,192) width 312: " border-width: 10px; margin: 15px;}" - text run at (312,192) width 0: " " - text run at (0,208) width 0: " " - text run at (0,224) width 480: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;" - text run at (480,224) width 0: " " - text run at (0,240) width 312: " padding: 5px; border-style: solid;" - text run at (312,240) width 0: " " - text run at (0,256) width 320: " border-width: 10px; margin: -10px;}" - text run at (320,256) width 0: " " - text run at (0,272) width 0: " " - LayoutBlockFlow {P} at (0,353) size 769x464 - LayoutText {#text} at (0,2) size 767x238 - text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (420,2) width 347: "This means that the lines of text within it should be separated" - text run at (0,22) width 374: "by six pixels, three of which are part of the line-box of each line. " - text run at (374,22) width 375: "Any images within the paragraph should increase the height of the" - text run at (0,224) width 296: "line-box so that they fit within the line box, such as " - LayoutImage {IMG} at (296,40) size 200x200 - LayoutText {#text} at (496,224) size 28x16 - text run at (496,224) width 28: " and " - LayoutImage {IMG} at (524,224) size 200x200 - LayoutText {#text} at (724,224) size 757x238 - text run at (724,224) width 8: ". " - text run at (732,224) width 25: "This" - text run at (0,426) width 744: "is additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top" - text run at (0,446) width 45: "aligned." - LayoutBlockFlow {P} at (0,831) size 769x484 - LayoutText {#text} at (0,2) size 767x198 - text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (420,2) width 347: "This means that the lines of text within it should be separated" - text run at (0,22) width 79: "by six pixels. " - text run at (79,22) width 652: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding" - text run at (0,184) width 396: "(5px), border (10px) and margins (15px) within the line box, such as " - LayoutImage {IMG} at (410.73,55) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (555,184) size 29x16 - text run at (555,184) width 29: " and " - LayoutImage {IMG} at (598.73,199) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (743,184) size 759x256 - text run at (743,184) width 5: "." - text run at (0,346) width 755: "This is additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-" - text run at (0,366) width 71: "top aligned. " - text run at (71,366) width 683: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image" - text run at (0,386) width 759: "the bottom border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin" - text run at (0,424) width 175: "15px below the top of the text " - LayoutImage {IMG} at (165,394) size 80x80 [border: (10px solid #000000)] - LayoutText {#text} at (235,424) size 755x58 - text run at (235,424) width 8: ". " - text run at (243,424) width 512: "The last image in this paragraph has -10px margins set on it, so that should pull the text in" - text run at (0,466) width 443: "toward the image in the vertical direction, and also in the horizontal direction." - LayoutTable {TABLE} at (0,1329) size 769x1000 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x998 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x970 - LayoutTableCell {TD} at (0,499) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x970 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x464 - LayoutText {#text} at (0,2) size 729x238 - text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (420,2) width 291: "This means that the lines of text within it should be" - text run at (0,22) width 430: "separated by six pixels, three of which are part of the line-box of each line. " - text run at (430,22) width 299: "Any images within the paragraph should increase the" - text run at (0,224) width 372: "height of the line-box so that they fit within the line box, such as " - LayoutImage {IMG} at (372,40) size 200x200 - LayoutText {#text} at (572,224) size 28x16 - text run at (572,224) width 28: " and " - LayoutImage {IMG} at (0,244) size 200x200 - LayoutText {#text} at (200,244) size 741x218 - text run at (200,244) width 8: ". " - text run at (208,244) width 533: "This is additional text to make sure that there is enough room left below the image so that this" - text run at (0,446) width 285: "line does not hit the image that is text-top aligned." - LayoutBlockFlow {P} at (4,482) size 747x484 - LayoutText {#text} at (0,2) size 738x198 - text run at (0,2) width 420: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (420,2) width 291: "This means that the lines of text within it should be" - text run at (0,22) width 135: "separated by six pixels. " - text run at (135,22) width 603: "Any images within the paragraph should increase the height of the line-box so that they fit, including their" - text run at (0,184) width 445: "padding (5px), border (10px) and margins (15px) within the line box, such as " - LayoutImage {IMG} at (459.73,55) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (604,184) size 29x16 - text run at (604,184) width 29: " and " - LayoutImage {IMG} at (15,219) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (160,204) size 736x236 - text run at (160,204) width 8: ". " - text run at (168,204) width 558: "This is additional text to make sure that there is enough room left below the image so that this line" - text run at (0,366) width 264: "does not hit the image that is text-top aligned. " - text run at (264,366) width 472: "It is the outer edge of the margin that should be text-bottom and text-top aligned in" - text run at (0,386) width 730: "this paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the" - text run at (0,424) width 415: "second image the top border should begin 15px below the top of the text " - LayoutImage {IMG} at (405,394) size 80x80 [border: (10px solid #000000)] - LayoutText {#text} at (475,424) size 724x58 - text run at (475,424) width 8: ". " - text run at (483,424) width 241: "The last image in this paragraph has -10px" - text run at (0,466) width 714: "margins set on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction." -layer at (8,345) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,337) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png deleted file mode 100644 index c79ca93..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png deleted file mode 100644 index 9ee24fb7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt deleted file mode 100644 index 23fb586..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt +++ /dev/null
@@ -1,97 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 791 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x790 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x790.33 - LayoutBlockFlow {BODY} at (8,8) size 769x774.33 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 560x112 - text run at (0,0) width 208: "P.one {line-height: 200%;}" - text run at (208,0) width 0: " " - text run at (0,16) width 552: "SPAN.two {border-style: solid; border-width: 10px; border-color: red;" - text run at (552,16) width 0: " " - text run at (0,32) width 304: " padding: 2pt; margin: 30pt;}" - text run at (304,32) width 0: " " - text run at (0,48) width 360: "P.three {font-size: 10pt; line-height: 12pt;}" - text run at (360,48) width 0: " " - text run at (0,64) width 560: "SPAN.four {border-style: solid; border-width: 12px; border-color: red;" - text run at (560,64) width 0: " " - text run at (0,80) width 192: " padding: 2pt;}" - text run at (192,80) width 0: " " - text run at (0,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 769x192 - LayoutText {#text} at (0,6) size 187x19 - text run at (0,6) width 187: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 761x173 [border: (10px solid #FF0000)] - LayoutText {#text} at (239,6) size 761x147 - text run at (239,6) width 522: "very long span in it, and the span has a 10px red border separated from the span by" - text run at (0,38) width 167: "2pt, and a margin of 30pt. " - text run at (166,38) width 561: "The padding and border should be present on all sides of the span (although vertical lines" - text run at (0,70) width 539: "should appear only at the beginning and the end of the whole span, not on each line). " - text run at (539,70) width 208: "The padding, border, and margin" - text run at (0,102) width 388: "should all be noticeable at the beginning and end of the span. " - text run at (388,102) width 366: "However, the line height should not be changed by any of" - text run at (0,134) width 585: "them, so the margin should be unnoticeable and the border should overlap text on other lines." - LayoutText {#text} at (636,134) size 761x51 - text run at (636,134) width 5: " " - text run at (640,134) width 121: "The line spacing in" - text run at (0,166) width 336: "the whole paragraph should be 200% of the font size." - LayoutBlockFlow {P} at (0,387) size 769x64 - LayoutText {#text} at (0,0) size 159x15 - text run at (0,0) width 159: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 764x93 [border: (12px solid #FF0000)] - LayoutText {#text} at (173,0) size 764x63 - text run at (173,0) width 552: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 764: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the padding" - text run at (0,32) width 240: "and border should not effect the line height. " - text run at (239,32) width 525: "The span's border should have vertical lines only at the beginning and end of the whole span, not" - text run at (0,48) width 69: "on each line." - LayoutText {#text} at (83,48) size 415x15 - text run at (83,48) width 3: " " - text run at (86,48) width 412: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." - LayoutTable {TABLE} at (0,464.33) size 769x310 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x308 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x280 - LayoutTableCell {TD} at (0,154) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x192 - LayoutText {#text} at (0,6) size 187x19 - text run at (0,6) width 187: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 747x173 [border: (10px solid #FF0000)] - LayoutText {#text} at (239,6) size 747x147 - text run at (239,6) width 502: "very long span in it, and the span has a 10px red border separated from the span" - text run at (0,38) width 187: "by 2pt, and a margin of 30pt. " - text run at (186,38) width 561: "The padding and border should be present on all sides of the span (although vertical lines" - text run at (0,70) width 539: "should appear only at the beginning and the end of the whole span, not on each line). " - text run at (539,70) width 208: "The padding, border, and margin" - text run at (0,102) width 388: "should all be noticeable at the beginning and end of the span. " - text run at (388,102) width 349: "However, the line height should not be changed by any" - text run at (0,134) width 602: "of them, so the margin should be unnoticeable and the border should overlap text on other lines." - LayoutText {#text} at (653,134) size 710x51 - text run at (653,134) width 5: " " - text run at (657,134) width 53: "The line" - text run at (0,166) width 404: "spacing in the whole paragraph should be 200% of the font size." - LayoutBlockFlow {P} at (4,212) size 747x64 - LayoutText {#text} at (0,0) size 159x15 - text run at (0,0) width 159: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 725x93 [border: (12px solid #FF0000)] - LayoutText {#text} at (173,0) size 725x63 - text run at (173,0) width 552: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 716: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the" - text run at (0,32) width 288: "padding and border should not effect the line height. " - text run at (287,32) width 437: "The span's border should have vertical lines only at the beginning and end of the" - text run at (0,48) width 157: "whole span, not on each line." - LayoutText {#text} at (171,48) size 415x15 - text run at (171,48) width 3: " " - text run at (174,48) width 412: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png deleted file mode 100644 index c2dfaa2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt deleted file mode 100644 index bf3b75c2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt +++ /dev/null
@@ -1,88 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2377 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2377 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2377 - LayoutBlockFlow {BODY} at (8,8) size 769x2361 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x128 - LayoutText {#text} at (0,0) size 504x128 - text run at (0,0) width 208: "IMG.one {display: inline;}" - text run at (208,0) width 0: " " - text run at (0,16) width 200: "IMG.two {display: block;}" - text run at (200,16) width 0: " " - text run at (0,32) width 208: "IMG.three {display: block;" - text run at (208,32) width 0: " " - text run at (0,48) width 504: " margin-right: auto; margin-left: auto; width: auto;}" - text run at (504,48) width 0: " " - text run at (0,64) width 200: "IMG.four {display: block;" - text run at (200,64) width 0: " " - text run at (0,80) width 488: " margin-right: auto; margin-left: auto; width: 50%;}" - text run at (488,80) width 0: " " - text run at (0,96) width 200: "IMG.five {display: block;" - text run at (200,96) width 0: " " - text run at (0,112) width 464: " margin-right: 0; margin-left: auto; width: 50%;}" - text run at (464,112) width 0: " " - LayoutBlockFlow {P} at (0,195) size 769x20 - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 434x19 - text run at (15,0) width 434: "The image at the beginning of this sentence should be a 15px square." - LayoutImage {IMG} at (0,231) size 15x15 - LayoutBlockFlow {P} at (0,262) size 769x20 - LayoutText {#text} at (0,0) size 489x19 - text run at (0,0) width 489: "The above image should be a 15px square with the same left edge as this text." - LayoutImage {IMG} at (377,298) size 15x15 - LayoutBlockFlow {P} at (0,329) size 769x20 - LayoutText {#text} at (0,0) size 400x19 - text run at (0,0) width 400: "The above image should be a 15px square aligned at the center." - LayoutImage {IMG} at (192.25,365) size 384.50x384.50 - LayoutBlockFlow {P} at (0,765.50) size 769x40 - LayoutText {#text} at (0,0) size 766x39 - text run at (0,0) width 766: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within" - text run at (0,20) width 123: "the parent element: " - text run at (123,20) width 395: "the document body in the first half, and the table in the second." - LayoutImage {IMG} at (384.50,821.50) size 384.50x384.50 - LayoutBlockFlow {P} at (0,1222) size 769x40 - LayoutText {#text} at (0,0) size 758x39 - text run at (0,0) width 758: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the" - text run at (0,20) width 100: "parent element: " - text run at (100,20) width 395: "the document body in the first half, and the table in the second." - LayoutTable {TABLE} at (0,1278) size 769x1083 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1081 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1053 - LayoutTableCell {TD} at (0,540) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1053 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 434x19 - text run at (15,0) width 434: "The image at the beginning of this sentence should be a 15px square." - LayoutImage {IMG} at (4,40) size 15x15 - LayoutBlockFlow {P} at (4,71) size 747x20 - LayoutText {#text} at (0,0) size 489x19 - text run at (0,0) width 489: "The above image should be a 15px square with the same left edge as this text." - LayoutImage {IMG} at (370,107) size 15x15 - LayoutBlockFlow {P} at (4,138) size 747x20 - LayoutText {#text} at (0,0) size 400x19 - text run at (0,0) width 400: "The above image should be a 15px square aligned at the center." - LayoutImage {IMG} at (190.75,174) size 373.50x373.50 - LayoutBlockFlow {P} at (4,563.50) size 747x40 - LayoutText {#text} at (0,0) size 722x39 - text run at (0,0) width 722: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally" - text run at (0,20) width 167: "within the parent element: " - text run at (167,20) width 395: "the document body in the first half, and the table in the second." - LayoutImage {IMG} at (377.50,619.50) size 373.50x373.50 - LayoutBlockFlow {P} at (4,1009) size 747x40 - LayoutText {#text} at (0,0) size 735x39 - text run at (0,0) width 735: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of" - text run at (0,20) width 123: "the parent element: " - text run at (123,20) width 395: "the document body in the first half, and the table in the second." -layer at (8,185) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,177) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png deleted file mode 100644 index 7a7b891..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt deleted file mode 100644 index c0137c4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt +++ /dev/null
@@ -1,173 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2599 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2599 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2598.78 - LayoutBlockFlow {BODY} at (8,8) size 769x2582.78 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x320 - LayoutText {#text} at (0,0) size 496x320 - text run at (0,0) width 368: "P.one {margin-bottom: 2cm; padding-bottom: 0;}" - text run at (368,0) width 0: " " - text run at (0,16) width 320: "P.two {margin-top: 2cm; padding-top: 0;}" - text run at (320,16) width 0: " " - text run at (0,32) width 320: "P.three {margin-top: 0; padding-top: 0;}" - text run at (320,32) width 0: " " - text run at (0,48) width 344: "P.four {margin-top: -1cm; margin-bottom: 0;" - text run at (344,48) width 0: " " - text run at (0,64) width 344: " padding-top: 0; padding-bottom: 0;}" - text run at (344,64) width 0: " " - text run at (0,80) width 368: "DIV.five {margin-top: 1cm; margin-bottom: 1cm;" - text run at (368,80) width 0: " " - text run at (0,96) width 376: " padding-top: 1cm; padding-bottom: 0;}" - text run at (376,96) width 0: " " - text run at (0,112) width 344: "P.six {margin-top: 1cm; margin-bottom: 1cm;" - text run at (344,112) width 0: " " - text run at (0,128) width 336: " padding-top: 0; padding-bottom: 0;}" - text run at (336,128) width 0: " " - text run at (0,144) width 336: "P.seven {margin-top: 1cm; padding-top: 0;}" - text run at (336,144) width 0: " " - text run at (0,160) width 408: "P.eight {margin-bottom: -1cm; padding-bottom: 2cm;}" - text run at (408,160) width 0: " " - text run at (0,176) width 344: "P.nine {margin-top: -1cm; padding-top: 1cm;" - text run at (344,176) width 0: " " - text run at (0,192) width 376: " padding-bottom: 0; margin-bottom: 1cm;}" - text run at (376,192) width 0: " " - text run at (0,208) width 304: "P.ten {margin-top: 1cm;padding-top: 0;" - text run at (304,208) width 0: " " - text run at (0,224) width 248: " float: left;width: 50%;}" - text run at (248,224) width 0: " " - text run at (0,240) width 448: "P.eleven {margin-top: 1cm; padding-top: 0; clear: none;}" - text run at (448,240) width 0: " " - text run at (0,256) width 496: "P.twelve {margin-bottom: 0; padding-bottom: 1cm; clear: both;}" - text run at (496,256) width 0: " " - text run at (0,272) width 360: "P.thirteen {margin-top: 0; padding-top: 1cm;}" - text run at (360,272) width 0: " " - text run at (0,288) width 160: "TABLE {clear: both;}" - text run at (160,288) width 0: " " - text run at (0,304) width 0: " " - LayoutBlockFlow {P} at (0,387) size 769x40 - LayoutText {#text} at (0,0) size 754x39 - text run at (0,0) width 754: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" - text run at (0,20) width 255: "collapse to the maximum of the margins." - LayoutBlockFlow {P} at (0,502.58) size 769x20 - LayoutText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This is another paragraph." - LayoutBlockFlow {P} at (0,538.58) size 769x20 - LayoutText {#text} at (0,0) size 494x19 - text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next." - LayoutBlockFlow {P} at (0,634.16) size 769x20 - LayoutText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This is another paragraph." - LayoutBlockFlow {P} at (0,670.16) size 769x40 - LayoutText {#text} at (0,0) size 719x39 - text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" - text run at (0,20) width 465: "margin, the two margins should be added (the minus sign should be kept)." - LayoutBlockFlow {P} at (0,747.95) size 769x20 - LayoutText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This is another paragraph." - LayoutBlockFlow {DIV} at (0,805.73) size 769x135.56 - LayoutBlockFlow {P} at (0,75.56) size 769x60 - LayoutText {#text} at (0,0) size 759x59 - text run at (0,0) width 757: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the" - text run at (0,20) width 759: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the" - text run at (0,40) width 54: "margins." - LayoutBlockFlow {P} at (0,979.08) size 769x20 - LayoutText {#text} at (0,0) size 109x19 - text run at (0,0) width 109: "This is more text." - LayoutBlockFlow {P} at (0,1015.08) size 769x115.58 - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" - text run at (0,20) width 456: "negative margin with the largest absolute value of the margins collapsed." - LayoutBlockFlow {P} at (0,1092.88) size 769x77.78 - LayoutText {#text} at (0,37) size 765x40 - text run at (0,37) width 765: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the" - text run at (0,57) width 181: "one below it and to the right." - LayoutBlockFlow (floating) {P} at (0,1246.22) size 384.50x60 - LayoutText {#text} at (0,0) size 382x59 - text run at (0,0) width 382: "There should be two centimeters between this paragraph and" - text run at (0,20) width 365: "the one above it, since margins do not collapse on floating" - text run at (0,40) width 59: "elements." - LayoutBlockFlow {P} at (0,1208.44) size 769x60 - LayoutText {#text} at (384,0) size 376x59 - text run at (384,0) width 376: "There should be one centimeter between this paragraph and" - text run at (384,20) width 357: "the (non-floating) one above it, since the float should not" - text run at (384,40) width 182: "effect the paragraph spacing." - LayoutBlockFlow {P} at (0,1322.22) size 769x77.78 - LayoutText {#text} at (0,0) size 749x39 - text run at (0,0) width 554: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (553,0) width 196: "Padding does not collapse, and" - text run at (0,20) width 234: "there is 1cm of padding on each side." - LayoutBlockFlow {P} at (0,1400) size 769x57.78 - LayoutText {#text} at (0,37) size 167x20 - text run at (0,37) width 167: "This is the next paragraph." - LayoutTable {TABLE} at (0,1473.78) size 769x1109 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1107 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1079 - LayoutTableCell {TD} at (0,553) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1078.78 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 708x39 - text run at (0,0) width 708: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins" - text run at (0,20) width 301: "should collapse to the maximum of the margins." - LayoutBlockFlow {P} at (4,119.58) size 747x20 - LayoutText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This is another paragraph." - LayoutBlockFlow {P} at (4,155.58) size 747x20 - LayoutText {#text} at (0,0) size 494x19 - text run at (0,0) width 494: "There should be a two-centimeter margin between this paragraph and the next." - LayoutBlockFlow {P} at (4,251.16) size 747x20 - LayoutText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This is another paragraph." - LayoutBlockFlow {P} at (4,287.16) size 747x40 - LayoutText {#text} at (0,0) size 719x39 - text run at (0,0) width 719: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" - text run at (0,20) width 465: "margin, the two margins should be added (the minus sign should be kept)." - LayoutBlockFlow {P} at (4,364.95) size 747x20 - LayoutText {#text} at (0,0) size 164x19 - text run at (0,0) width 164: "This is another paragraph." - LayoutBlockFlow {DIV} at (4,422.73) size 747x135.56 - LayoutBlockFlow {P} at (0,75.56) size 747x60 - LayoutText {#text} at (0,0) size 734x59 - text run at (0,0) width 734: "There should be three centimeters between this text and the text above, but only one centimeter between this text and" - text run at (0,20) width 702: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding" - text run at (0,40) width 134: "between the margins." - LayoutBlockFlow {P} at (4,596.08) size 747x20 - LayoutText {#text} at (0,0) size 109x19 - text run at (0,0) width 109: "This is more text." - LayoutBlockFlow {P} at (4,632.08) size 747x115.58 - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" - text run at (0,20) width 456: "negative margin with the largest absolute value of the margins collapsed." - LayoutBlockFlow {P} at (4,709.88) size 747x77.78 - LayoutText {#text} at (0,37) size 742x40 - text run at (0,37) width 742: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and" - text run at (0,57) width 204: "the one below it and to the right." - LayoutBlockFlow (floating) {P} at (4,863.22) size 373.50x60 - LayoutText {#text} at (0,0) size 355x59 - text run at (0,0) width 355: "There should be two centimeters between this paragraph" - text run at (0,20) width 340: "and the one above it, since margins do not collapse on" - text run at (0,40) width 111: "floating elements." - LayoutBlockFlow {P} at (4,825.44) size 747x60 - LayoutText {#text} at (373,0) size 360x59 - text run at (373,0) width 349: "There should be one centimeter between this paragraph" - text run at (373,20) width 360: "and the (non-floating) one above it, since the float should" - text run at (373,40) width 206: "not effect the paragraph spacing." - LayoutBlockFlow {P} at (4,939.22) size 747x77.78 - LayoutText {#text} at (0,0) size 722x39 - text run at (0,0) width 554: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (553,0) width 169: "Padding does not collapse," - text run at (0,20) width 261: "and there is 1cm of padding on each side." - LayoutBlockFlow {P} at (4,1017) size 747x57.78 - LayoutText {#text} at (0,37) size 167x20 - text run at (0,37) width 167: "This is the next paragraph." -layer at (8,377) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,369) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/anchor-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/anchor-expected.png deleted file mode 100644 index b4e611b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/anchor-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/anchor-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/anchor-expected.txt deleted file mode 100644 index dde77cd..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/anchor-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 737 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x737 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x737 - LayoutBlockFlow {BODY} at (8,8) size 769x721 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 200x96 - text run at (0,0) width 136: "A {color: green;}" - text run at (136,0) width 0: " " - text run at (0,16) width 184: "A:link {color: purple;}" - text run at (184,16) width 0: " " - text run at (0,32) width 192: "A:visited {color: lime;}" - text run at (192,32) width 0: " " - text run at (0,48) width 200: "A:active {color: maroon;}" - text run at (200,48) width 0: " " - text run at (0,64) width 176: "#one {color: #006600;}" - text run at (176,64) width 0: " " - text run at (0,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 500x19 - text run at (0,0) width 500: "The following anchors should appear as described; none of them should be red." - LayoutBlockFlow {UL} at (0,199) size 769x160 - LayoutListItem {LI} at (40,0) size 729x120 - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 567x19 - text run at (0,0) width 567: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - LayoutBlockFlow {UL} at (0,20) size 729x100 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 109x19 [color=#800080] - LayoutText {#text} at (0,0) size 109x19 - text run at (0,0) width 109: "W3C Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,20) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 111x19 [color=#800080] - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "NIST Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,40) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 124x19 [color=#800080] - LayoutText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,60) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 47x19 [color=#800080] - LayoutText {#text} at (0,0) size 47x19 - text run at (0,0) width 47: "Yahoo!" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,80) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 58x19 [color=#800080] - LayoutText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "Erewhon" - LayoutText {#text} at (58,0) size 219x19 - text run at (58,0) width 219: " (don't click on it, it goes nowhere)" - LayoutListItem {LI} at (40,120) size 729x40 - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 204x19 - text run at (0,0) width 204: "Dark green in any circumstance:" - LayoutBlockFlow {UL} at (0,20) size 729x20 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 124x19 [color=#006600] - LayoutText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,375) size 769x40 - LayoutText {#text} at (0,0) size 120x19 - text run at (0,0) width 120: "The quoted word \"" - LayoutInline {A} at (0,0) size 43x19 [color=#008000] - LayoutText {#text} at (120,0) size 43x19 - text run at (120,0) width 43: "anchor" - LayoutText {#text} at (163,0) size 731x39 - text run at (163,0) width 377: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (539,0) width 192: "It's a named anchor, and styles" - text run at (0,20) width 350: "declared for the A tag are applied to them under CSS1. " - text run at (350,20) width 326: "It also should NOT turn orange when clicked upon." - LayoutTable {TABLE} at (0,431) size 769x290 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x288 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x260 - LayoutTableCell {TD} at (0,144) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x260 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 500x19 - text run at (0,0) width 500: "The following anchors should appear as described; none of them should be red." - LayoutBlockFlow {UL} at (4,40) size 747x160 - LayoutListItem {LI} at (40,0) size 707x120 - LayoutBlockFlow (anonymous) at (0,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 567x19 - text run at (0,0) width 567: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - LayoutBlockFlow {UL} at (0,20) size 707x100 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 109x19 [color=#800080] - LayoutText {#text} at (0,0) size 109x19 - text run at (0,0) width 109: "W3C Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,20) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 111x19 [color=#800080] - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "NIST Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,40) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 124x19 [color=#800080] - LayoutText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,60) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 47x19 [color=#800080] - LayoutText {#text} at (0,0) size 47x19 - text run at (0,0) width 47: "Yahoo!" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,80) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 58x19 [color=#800080] - LayoutText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "Erewhon" - LayoutText {#text} at (58,0) size 219x19 - text run at (58,0) width 219: " (don't click on it, it goes nowhere)" - LayoutListItem {LI} at (40,120) size 707x40 - LayoutBlockFlow (anonymous) at (0,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 204x19 - text run at (0,0) width 204: "Dark green in any circumstance:" - LayoutBlockFlow {UL} at (0,20) size 707x20 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 124x19 [color=#006600] - LayoutText {#text} at (0,0) size 124x19 - text run at (0,0) width 124: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,216) size 747x40 - LayoutText {#text} at (0,0) size 120x19 - text run at (0,0) width 120: "The quoted word \"" - LayoutInline {A} at (0,0) size 43x19 [color=#008000] - LayoutText {#text} at (120,0) size 43x19 - text run at (120,0) width 43: "anchor" - LayoutText {#text} at (163,0) size 731x39 - text run at (163,0) width 377: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (539,0) width 192: "It's a named anchor, and styles" - text run at (0,20) width 350: "declared for the A tag are applied to them under CSS1. " - text run at (350,20) width 326: "It also should NOT turn orange when clicked upon." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstletter-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstletter-expected.png deleted file mode 100644 index 508325c6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstletter-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt deleted file mode 100644 index f4b1834..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt +++ /dev/null
@@ -1,94 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 751 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x751 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x751 - LayoutBlockFlow {BODY} at (8,8) size 769x735 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x19 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (10,0) size 345x19 - text run at (10,0) width 345: "he style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 312x64 - text run at (0,0) width 248: "P:first-letter {color: maroon;}" - text run at (248,0) width 0: " " - text run at (0,16) width 288: ".two:first-letter {font-size: 200%;}" - text run at (288,16) width 0: " " - text run at (0,32) width 312: "P.three:first-letter {font-size: 350%;}" - text run at (312,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x19 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (10,0) size 764x59 - text run at (10,0) width 434: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (444,0) width 320: "If this precise combination does not occur, then the" - text run at (0,20) width 187: "user agent has failed this test. " - text run at (187,20) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" - text run at (0,40) width 85: "than one line." - LayoutBlockFlow {P} at (0,207) size 769x77 - LayoutInline {<pseudo:first-letter>} at (0,0) size 20x36 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 20x36 - text run at (0,0) width 20: "T" - LayoutTextFragment {#text} at (20,13) size 757x63 - text run at (20,13) width 611: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (630,13) width 85: "If this precise" - text run at (0,37) width 423: "combination does not occur, then the user agent has failed this test. " - text run at (422,37) width 335: "Remember that in order to ensure a complete test, the" - text run at (0,57) width 325: "paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,300) size 769x106 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 76x64 - text run at (0,1) width 76: "\"W" - LayoutTextFragment {#text} at (76,36) size 760x69 - text run at (76,36) width 319: "e should check for quotation support,\" it was said. " - text run at (395,36) width 365: "The first two characters in this paragraph-- a double-quote" - text run at (0,66) width 578: "mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (578,66) width 178: "Note that this is not required" - text run at (0,86) width 228: "under CSS1, but it is recommended." - LayoutTable {TABLE} at (0,422) size 769x313 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x311 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x283 - LayoutTableCell {TD} at (0,155) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x283 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x19 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (10,0) size 741x59 - text run at (10,0) width 434: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (444,0) width 297: "If this precise combination does not occur, then" - text run at (0,20) width 210: "the user agent has failed this test. " - text run at (210,20) width 518: "Remember that in order to ensure a complete test, the paragraph must be displayed" - text run at (0,40) width 141: "on more than one line." - LayoutBlockFlow {P} at (4,80) size 747x77 - LayoutInline {<pseudo:first-letter>} at (0,0) size 20x36 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 20x36 - text run at (0,0) width 20: "T" - LayoutTextFragment {#text} at (20,13) size 734x63 - text run at (20,13) width 611: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (630,13) width 85: "If this precise" - text run at (0,37) width 423: "combination does not occur, then the user agent has failed this test. " - text run at (422,37) width 312: "Remember that in order to ensure a complete test," - text run at (0,57) width 348: "the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,173) size 747x106 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 76x64 - text run at (0,1) width 76: "\"W" - LayoutTextFragment {#text} at (76,36) size 739x69 - text run at (76,36) width 319: "e should check for quotation support,\" it was said. " - text run at (395,36) width 330: "The first two characters in this paragraph-- a double-" - text run at (0,66) width 617: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (617,66) width 122: "Note that this is not" - text run at (0,86) width 284: "required under CSS1, but it is recommended." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstline-expected.png deleted file mode 100644 index a867f30b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstline-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstline-expected.txt deleted file mode 100644 index e3fe5eb..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/firstline-expected.txt +++ /dev/null
@@ -1,83 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 699 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x699 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x699 - LayoutBlockFlow {BODY} at (8,8) size 769x683 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 360x64 - text run at (0,0) width 224: "P:first-line {color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 272: ".two:first-line {font-size: 200%;}" - text run at (272,16) width 0: " " - text run at (0,32) width 360: ".three:first-line {font-variant: small-caps;}" - text run at (360,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x60 - LayoutText {#text} at (0,0) size 761x59 - text run at (0,0) width 423: "The first line of this paragraph, and only that one, should be green. " - text run at (423,0) width 320: "If this precise combination does not occur, then the" - text run at (0,20) width 187: "user agent has failed this test. " - text run at (187,20) width 574: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" - text run at (0,40) width 85: "than one line." - LayoutBlockFlow {P} at (0,207) size 769x77 - LayoutText {#text} at (0,0) size 767x76 - text run at (0,0) width 767: "The first line of this paragraph, and only that one, should be" - text run at (0,37) width 216: "a larger font size as well as green. " - text run at (215,37) width 508: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,57) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,300) size 769x80 - LayoutText {#text} at (0,0) size 762x59 - text run at (0,0) width 604: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (603,0) width 155: "Thus, if the first line is" - text run at (0,20) width 762: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although" - text run at (0,40) width 165: "the problem might be that " - LayoutInline {CODE} at (0,0) size 80x16 - LayoutText {#text} at (165,43) size 80x16 - text run at (165,43) width 80: "small-caps" - LayoutText {#text} at (245,40) size 754x39 - text run at (245,40) width 225: " is not supported by your browser). " - text run at (470,40) width 284: "This is extra text included for the purposes of" - text run at (0,60) width 395: "making the paragraph long enough to have more than one line." - LayoutTable {TABLE} at (0,396) size 769x287 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x285 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x257 - LayoutTableCell {TD} at (0,142) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x257 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutText {#text} at (0,0) size 743x59 - text run at (0,0) width 423: "The first line of this paragraph, and only that one, should be green. " - text run at (423,0) width 320: "If this precise combination does not occur, then the" - text run at (0,20) width 187: "user agent has failed this test. " - text run at (187,20) width 538: "Remember that in order to ensure a complete test, the paragraph must be displayed on" - text run at (0,40) width 121: "more than one line." - LayoutBlockFlow {P} at (4,80) size 747x77 - LayoutText {#text} at (0,0) size 742x76 - text run at (0,0) width 729: "The first line of this paragraph, and only that one, should" - text run at (0,37) width 235: "be a larger font size as well as green. " - text run at (234,37) width 508: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,57) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,173) size 747x80 - LayoutText {#text} at (0,0) size 744x59 - text run at (0,0) width 604: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (603,0) width 141: "Thus, if the first line" - text run at (0,20) width 712: "is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" - text run at (0,40) width 229: "(although the problem might be that " - LayoutInline {CODE} at (0,0) size 80x16 - LayoutText {#text} at (229,43) size 80x16 - text run at (229,43) width 80: "small-caps" - LayoutText {#text} at (309,40) size 741x39 - text run at (309,40) width 225: " is not supported by your browser). " - text run at (534,40) width 207: "This is extra text included for the" - text run at (0,60) width 472: "purposes of making the paragraph long enough to have more than one line." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png deleted file mode 100644 index 2113b53..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt deleted file mode 100644 index dc49c2e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt +++ /dev/null
@@ -1,105 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1089 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1089 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1089 - LayoutBlockFlow {BODY} at (8,8) size 769x1073 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x19 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (10,0) size 345x19 - text run at (10,0) width 345: "he style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 368x112 - text run at (0,0) width 224: "P:first-line {color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 248: "P:first-letter {color: maroon;}" - text run at (248,16) width 0: " " - text run at (0,32) width 272: ".two:first-line {font-size: 200%;}" - text run at (272,32) width 0: " " - text run at (0,48) width 288: ".two:first-letter {font-size: 350%;}" - text run at (288,48) width 0: " " - text run at (0,64) width 312: "P.three:first-letter {font-size: 350%;}" - text run at (312,64) width 0: " " - text run at (0,80) width 368: "P.three:first-line {font-variant: small-caps;}" - text run at (368,80) width 0: " " - text run at (0,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 769x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x19 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (10,0) size 764x59 - text run at (10,0) width 717: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be" - text run at (0,20) width 43: "green. " - text run at (43,20) width 511: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (553,20) width 211: "Remember that in order to ensure" - text run at (0,40) width 449: "a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,255) size 769x192 - LayoutInline {<pseudo:first-letter>} at (0,0) size 68x127 [color=#800000] - LayoutTextFragment (anonymous) at (0,2) size 68x127 - text run at (0,2) width 68: "T" - LayoutTextFragment {#text} at (68,74) size 751x117 - text run at (68,74) width 634: "he first letter of this paragraph, and only that one," - text run at (0,132) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" - text run at (0,152) width 299: "should be 200% bigger than normal and green. " - text run at (299,152) width 452: "If this precise combination does not occur, then the user agent has failed" - text run at (0,172) width 55: "this test. " - text run at (55,172) width 663: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,463) size 769x126 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 76x64 - text run at (0,1) width 76: "\"W" - LayoutTextFragment {#text} at (76,36) size 765x89 - text run at (76,36) width 333: "e should check for quotation support,\" it was said. " - text run at (408,36) width 354: "The first two characters in this paragraph-- a double-" - text run at (0,66) width 683: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (683,66) width 81: "Note that the" - text run at (0,86) width 765: "inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended." - text run at (0,106) width 450: "In addition, the entire first line should be in a small-caps font and green." - LayoutTable {TABLE} at (0,605) size 769x468 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x466 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x438 - LayoutTableCell {TD} at (0,233) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x438 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x19 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (10,0) size 727x59 - text run at (10,0) width 717: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be" - text run at (0,20) width 43: "green. " - text run at (43,20) width 511: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (553,20) width 166: "Remember that in order to" - text run at (0,40) width 494: "ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,80) size 747x212 - LayoutInline {<pseudo:first-letter>} at (0,0) size 68x127 [color=#800000] - LayoutTextFragment (anonymous) at (0,2) size 68x127 - text run at (0,2) width 68: "T" - LayoutTextFragment {#text} at (68,74) size 736x137 - text run at (68,74) width 634: "he first letter of this paragraph, and only that one," - text run at (0,132) width 736: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" - text run at (0,152) width 299: "should be 200% bigger than normal and green. " - text run at (299,152) width 413: "If this precise combination does not occur, then the user agent has" - text run at (0,172) width 94: "failed this test. " - text run at (94,172) width 632: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" - text run at (0,192) width 27: "line." - LayoutBlockFlow {P} at (4,308) size 747x126 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 76x64 - text run at (0,1) width 76: "\"W" - LayoutTextFragment {#text} at (76,36) size 739x89 - text run at (76,36) width 333: "e should check for quotation support,\" it was said. " - text run at (408,36) width 300: "The first two characters in this paragraph-- a" - text run at (0,66) width 727: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red)." - text run at (0,86) width 739: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it" - text run at (0,106) width 111: "is recommended. " - text run at (111,106) width 450: "In addition, the entire first line should be in a small-caps font and green." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png deleted file mode 100644 index e780cc7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt deleted file mode 100644 index 92c169e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 605 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x605 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x605 - LayoutBlockFlow {BODY} at (8,8) size 769x589 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 380x19 - text run at (0,0) width 380: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 264x64 - text run at (0,0) width 264: "P:first-line {font-weight: bold;}" - text run at (264,0) width 0: " " - text run at (0,16) width 256: "P.two:first-line {color: green;}" - text run at (256,16) width 0: " " - text run at (0,32) width 256: "P:first-line.three {color: red;}" - text run at (256,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x40 - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " - text run at (339,0) width 379: "This test is included simply to establish a baseline for the" - text run at (0,20) width 636: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - LayoutBlockFlow {P} at (0,187) size 769x40 - LayoutText {#text} at (0,0) size 754x39 - text run at (0,0) width 555: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (554,0) width 200: "If this is not the case, then the" - text run at (0,20) width 565: "user agent may have failed to properly parse the selector, or it may simply not support the " - LayoutInline {TT} at (0,0) size 89x16 - LayoutText {#text} at (564,23) size 89x16 - text run at (564,23) width 89: ":first-line" - LayoutText {#text} at (652,20) size 108x19 - text run at (652,20) width 108: " pseudo-element." - LayoutBlockFlow {P} at (0,243) size 769x80 - LayoutText {#text} at (0,0) size 766x79 - text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " - text run at (339,0) width 415: "If it is red, then the user agent has violated the specification in" - text run at (0,20) width 431: "allowing pseudo-elements at a point other than the end of a selector. " - text run at (430,20) width 336: "If neither is the case, then the user agent has correctly" - text run at (0,40) width 750: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have" - text run at (0,60) width 87: "failed the test." - LayoutTable {TABLE} at (0,339) size 769x250 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x248 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x220 - LayoutTableCell {TD} at (0,124) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x220 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " - text run at (339,0) width 379: "This test is included simply to establish a baseline for the" - text run at (0,20) width 636: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - LayoutBlockFlow {P} at (4,60) size 747x60 - LayoutText {#text} at (0,0) size 729x39 - text run at (0,0) width 555: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (554,0) width 175: "If this is not the case, then" - text run at (0,20) width 588: "the user agent may have failed to properly parse the selector, or it may simply not support the " - LayoutInline {TT} at (0,0) size 89x16 - LayoutText {#text} at (587,23) size 89x16 - text run at (587,23) width 89: ":first-line" - LayoutText {#text} at (675,20) size 730x39 - text run at (675,20) width 55: " pseudo-" - text run at (0,40) width 53: "element." - LayoutBlockFlow {P} at (4,136) size 747x80 - LayoutText {#text} at (0,0) size 737x79 - text run at (0,0) width 339: "The first line of this sentence should be boldfaced. " - text run at (339,0) width 398: "If it is red, then the user agent has violated the specification" - text run at (0,20) width 447: "in allowing pseudo-elements at a point other than the end of a selector. " - text run at (446,20) width 277: "If neither is the case, then the user agent has" - text run at (0,40) width 687: "correctly ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be" - text run at (0,60) width 209: "considered to have failed the test." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png deleted file mode 100644 index 3656028..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt deleted file mode 100644 index a1814ed..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt +++ /dev/null
@@ -1,140 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1481 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1481 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1481 - LayoutBlockFlow {BODY} at (8,8) size 769x1465 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 264x176 - text run at (0,0) width 232: ".one {letter-spacing: 0.3in;}" - text run at (232,0) width 0: " " - text run at (0,16) width 232: ".two {letter-spacing: 0.5cm;}" - text run at (232,16) width 0: " " - text run at (0,32) width 232: ".three {letter-spacing: 5mm;}" - text run at (232,32) width 0: " " - text run at (0,48) width 224: ".four {letter-spacing: 3pt;}" - text run at (224,48) width 0: " " - text run at (0,64) width 248: ".five {letter-spacing: 0.25pc;}" - text run at (248,64) width 0: " " - text run at (0,80) width 216: ".six {letter-spacing: 1em;}" - text run at (216,80) width 0: " " - text run at (0,96) width 232: ".seven {letter-spacing: 1ex;}" - text run at (232,96) width 0: " " - text run at (0,112) width 232: ".eight {letter-spacing: 5px;}" - text run at (232,112) width 0: " " - text run at (0,128) width 248: ".nine {letter-spacing: normal;}" - text run at (248,128) width 0: " " - text run at (0,144) width 224: ".ten {letter-spacing: 300%;}" - text run at (224,144) width 0: " " - text run at (0,160) width 264: ".eleven {letter-spacing: -0.1em;}" - text run at (264,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x80 - LayoutText {#text} at (0,0) size 710x79 - text run at (0,0) width 687: "This letters in this" - text run at (0,20) width 710: "sentence should have" - text run at (0,40) width 675: "extra space between" - text run at (0,60) width 179: "them." - LayoutBlockFlow {P} at (0,339) size 769x60 - LayoutText {#text} at (0,0) size 718x59 - text run at (0,0) width 718: "This letters in this sentence" - text run at (0,20) width 585: "should have extra space" - text run at (0,40) width 338: "between them." - LayoutBlockFlow {P} at (0,415) size 769x60 - LayoutText {#text} at (0,0) size 718x59 - text run at (0,0) width 718: "This letters in this sentence" - text run at (0,20) width 585: "should have extra space" - text run at (0,40) width 338: "between them." - LayoutBlockFlow {P} at (0,491) size 769x20 - LayoutText {#text} at (0,0) size 687x19 - text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,527) size 769x20 - LayoutText {#text} at (0,0) size 687x19 - text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,563) size 769x60 - LayoutText {#text} at (0,0) size 703x59 - text run at (0,0) width 633: "This letters in this sentence" - text run at (0,20) width 703: "should have extra space between" - text run at (0,40) width 115: "them." - LayoutBlockFlow {P} at (0,639) size 769x40 - LayoutText {#text} at (0,0) size 694x39 - text run at (0,0) width 694: "This letters in this sentence should have extra space" - text run at (0,20) width 183: "between them." - LayoutBlockFlow {P} at (0,695) size 769x40 - LayoutText {#text} at (0,0) size 754x39 - text run at (0,0) width 754: "This letters in this sentence should have extra space between them," - text run at (0,20) width 435: "but the last few words in the sentence " - LayoutInline {SPAN} at (0,0) size 180x19 - LayoutText {#text} at (435,20) size 180x19 - text run at (435,20) width 180: "should show normal spacing" - LayoutText {#text} at (615,20) size 9x19 - text run at (615,20) width 9: "." - LayoutBlockFlow {P} at (0,751) size 769x40 - LayoutText {#text} at (0,0) size 731x39 - text run at (0,0) width 731: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" - text run at (0,20) width 56: "property." - LayoutBlockFlow {P} at (0,807) size 769x20 - LayoutText {#text} at (0,0) size 565x19 - text run at (0,0) width 565: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." - LayoutTable {TABLE} at (0,843) size 769x622 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x620 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x592 - LayoutTableCell {TD} at (0,310) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x592 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x80 - LayoutText {#text} at (0,0) size 710x79 - text run at (0,0) width 687: "This letters in this" - text run at (0,20) width 710: "sentence should have" - text run at (0,40) width 675: "extra space between" - text run at (0,60) width 179: "them." - LayoutBlockFlow {P} at (4,100) size 747x60 - LayoutText {#text} at (0,0) size 718x59 - text run at (0,0) width 718: "This letters in this sentence" - text run at (0,20) width 585: "should have extra space" - text run at (0,40) width 338: "between them." - LayoutBlockFlow {P} at (4,176) size 747x60 - LayoutText {#text} at (0,0) size 718x59 - text run at (0,0) width 718: "This letters in this sentence" - text run at (0,20) width 585: "should have extra space" - text run at (0,40) width 338: "between them." - LayoutBlockFlow {P} at (4,252) size 747x20 - LayoutText {#text} at (0,0) size 687x19 - text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,288) size 747x20 - LayoutText {#text} at (0,0) size 687x19 - text run at (0,0) width 687: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,324) size 747x60 - LayoutText {#text} at (0,0) size 703x59 - text run at (0,0) width 633: "This letters in this sentence" - text run at (0,20) width 703: "should have extra space between" - text run at (0,40) width 115: "them." - LayoutBlockFlow {P} at (4,400) size 747x40 - LayoutText {#text} at (0,0) size 694x39 - text run at (0,0) width 694: "This letters in this sentence should have extra space" - text run at (0,20) width 183: "between them." - LayoutBlockFlow {P} at (4,456) size 747x40 - LayoutText {#text} at (0,0) size 685x39 - text run at (0,0) width 685: "This letters in this sentence should have extra space between" - text run at (0,20) width 504: "them, but the last few words in the sentence " - LayoutInline {SPAN} at (0,0) size 180x19 - LayoutText {#text} at (504,20) size 180x19 - text run at (504,20) width 180: "should show normal spacing" - LayoutText {#text} at (684,20) size 9x19 - text run at (684,20) width 9: "." - LayoutBlockFlow {P} at (4,512) size 747x40 - LayoutText {#text} at (0,0) size 731x39 - text run at (0,0) width 731: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" - text run at (0,20) width 56: "property." - LayoutBlockFlow {P} at (4,568) size 747x20 - LayoutText {#text} at (0,0) size 565x19 - text run at (0,0) width 565: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/line_height-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/line_height-expected.png deleted file mode 100644 index 7fa6c3d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/line_height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/line_height-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/line_height-expected.txt deleted file mode 100644 index 44b32b6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/line_height-expected.txt +++ /dev/null
@@ -1,183 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2697 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2697 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2697 - LayoutBlockFlow {BODY} at (8,8) size 769x2681 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x224 - LayoutText {#text} at (0,0) size 400x224 - text run at (0,0) width 344: ".one {line-height: 0.5in; font-size: 12px;}" - text run at (344,0) width 0: " " - text run at (0,16) width 328: ".two {line-height: 2cm; font-size: 12px;}" - text run at (328,16) width 0: " " - text run at (0,32) width 352: ".three {line-height: 20mm; font-size: 12px;}" - text run at (352,32) width 0: " " - text run at (0,48) width 344: ".four {line-height: 24pt; font-size: 12px;}" - text run at (344,48) width 0: " " - text run at (0,64) width 336: ".five {line-height: 2pc; font-size: 12px;}" - text run at (336,64) width 0: " " - text run at (0,80) width 328: ".six {line-height: 2em; font-size: 12px;}" - text run at (328,80) width 0: " " - text run at (0,96) width 344: ".seven {line-height: 3ex; font-size: 12px;}" - text run at (344,96) width 0: " " - text run at (0,112) width 352: ".eight {line-height: 200%; font-size: 12px;}" - text run at (352,112) width 0: " " - text run at (0,128) width 320: ".nine {line-height: 2; font-size: 12px;}" - text run at (320,128) width 0: " " - text run at (0,144) width 336: ".ten {line-height: 50px; font-size: 12px;}" - text run at (336,144) width 0: " " - text run at (0,160) width 360: ".eleven {line-height: -1em; font-size: 12px;}" - text run at (360,160) width 0: " " - text run at (0,176) width 400: "TABLE .ten {line-height: normal; font-size: 12px;}" - text run at (400,176) width 0: " " - text run at (0,192) width 248: "DIV {background-color: silver;}" - text run at (248,192) width 0: " " - text run at (0,208) width 304: "SPAN.color {background-color: silver;}" - text run at (304,208) width 0: " " - LayoutBlockFlow {P} at (0,287) size 769x48 - LayoutText {#text} at (0,16) size 507x15 - text run at (0,16) width 507: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,347) size 769x75 - LayoutText {#text} at (0,30) size 526x15 - text run at (0,30) width 526: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,434) size 769x75 - LayoutText {#text} at (0,30) size 539x15 - text run at (0,30) width 539: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,521) size 769x32 - LayoutText {#text} at (0,8) size 540x15 - text run at (0,8) width 540: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,565) size 769x32 - LayoutText {#text} at (0,8) size 497x15 - text run at (0,8) width 497: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,609) size 769x24 - LayoutText {#text} at (0,4) size 487x15 - text run at (0,4) width 487: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,645) size 769x18 - LayoutText {#text} at (0,1) size 489x15 - text run at (0,1) width 489: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,675) size 769x24 - LayoutText {#text} at (0,4) size 537x15 - text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (0,711) size 769x168 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 769x24 - LayoutText {#text} at (0,4) size 592x15 - text run at (0,4) width 592: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 769x72 - LayoutText {#text} at (0,-2) size 763x75 - text run at (0,-2) width 748: "This sentence should have a line-height of twice the DIV's font size, or 28px;" - text run at (0,22) width 763: "this should not cause extra spacing between the lines, since the line-height and" - text run at (0,46) width 364: "font-size should have the same value." - LayoutBlockFlow (anonymous) at (0,144) size 769x24 - LayoutText {#text} at (0,4) size 606x15 - text run at (0,4) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,891) size 769x24 - LayoutText {#text} at (0,4) size 537x15 - text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (0,927) size 769x240 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 769x24 - LayoutText {#text} at (0,4) size 592x15 - text run at (0,4) width 592: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 769x144 - LayoutText {#text} at (0,10) size 749x123 - text run at (0,10) width 749: "This sentence should have a line-height of twice the font size, which is 200%" - text run at (0,58) width 742: "normal thanks to an inline style; this should cause extra spacing between the" - text run at (0,106) width 654: "lines, as the font-size will be 28px and the line-height will be 56px." - LayoutBlockFlow (anonymous) at (0,216) size 769x24 - LayoutText {#text} at (0,4) size 606x15 - text run at (0,4) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,1179) size 769x100 - LayoutText {#text} at (0,17) size 745x65 - text run at (0,17) width 592: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (592,17) width 153: "In the second section (within the" - text run at (0,67) width 181: "table) its line-height should be normal." - LayoutBlockFlow {P} at (0,1291) size 769x16 - LayoutText {#text} at (0,0) size 504x15 - text run at (0,0) width 504: "This sentence should have a normal line-height, because negative values are not permitted for this property." - LayoutBlockFlow {P} at (0,1319) size 769x150 - LayoutInline {SPAN} at (0,0) size 758x90 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,30) size 758x90 - text run at (0,30) width 758: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but no" - text run at (0,105) width 663: "padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1481) size 769x1200 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1198 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1170 - LayoutTableCell {TD} at (0,599) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1170 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x48 - LayoutText {#text} at (0,16) size 507x15 - text run at (0,16) width 507: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,64) size 747x75 - LayoutText {#text} at (0,30) size 526x15 - text run at (0,30) width 526: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,151) size 747x75 - LayoutText {#text} at (0,30) size 539x15 - text run at (0,30) width 539: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,238) size 747x32 - LayoutText {#text} at (0,8) size 540x15 - text run at (0,8) width 540: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,282) size 747x32 - LayoutText {#text} at (0,8) size 497x15 - text run at (0,8) width 497: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,326) size 747x24 - LayoutText {#text} at (0,4) size 487x15 - text run at (0,4) width 487: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,362) size 747x18 - LayoutText {#text} at (0,1) size 489x15 - text run at (0,1) width 489: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,392) size 747x24 - LayoutText {#text} at (0,4) size 537x15 - text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (4,428) size 747x168 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 747x24 - LayoutText {#text} at (0,4) size 592x15 - text run at (0,4) width 592: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 747x72 - LayoutText {#text} at (0,-2) size 722x75 - text run at (0,-2) width 687: "This sentence should have a line-height of twice the DIV's font size, or" - text run at (0,22) width 722: "28px; this should not cause extra spacing between the lines, since the line-" - text run at (0,46) width 472: "height and font-size should have the same value." - LayoutBlockFlow (anonymous) at (0,144) size 747x24 - LayoutText {#text} at (0,4) size 606x15 - text run at (0,4) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,608) size 747x24 - LayoutText {#text} at (0,4) size 537x15 - text run at (0,4) width 537: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (4,644) size 747x288 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 747x24 - LayoutText {#text} at (0,4) size 592x15 - text run at (0,4) width 592: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 747x192 - LayoutText {#text} at (0,10) size 717x171 - text run at (0,10) width 687: "This sentence should have a line-height of twice the font size, which is" - text run at (0,58) width 681: "200% normal thanks to an inline style; this should cause extra spacing" - text run at (0,106) width 717: "between the lines, as the font-size will be 28px and the line-height will be" - text run at (0,154) width 54: "56px." - LayoutBlockFlow (anonymous) at (0,264) size 747x24 - LayoutText {#text} at (0,4) size 606x15 - text run at (0,4) width 606: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,944) size 747x32 - LayoutText {#text} at (0,0) size 745x31 - text run at (0,0) width 592: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (592,0) width 153: "In the second section (within the" - text run at (0,16) width 181: "table) its line-height should be normal." - LayoutBlockFlow {P} at (4,988) size 747x16 - LayoutText {#text} at (0,0) size 504x15 - text run at (0,0) width 504: "This sentence should have a normal line-height, because negative values are not permitted for this property." - LayoutBlockFlow {P} at (4,1016) size 747x150 - LayoutInline {SPAN} at (0,0) size 743x90 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,30) size 743x90 - text run at (0,30) width 743: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but" - text run at (0,105) width 678: "no padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,281) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,273) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_align-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_align-expected.png deleted file mode 100644 index f3c86e42..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_align-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_align-expected.txt deleted file mode 100644 index ecbf55b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_align-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x80 - LayoutText {#text} at (0,0) size 224x80 - text run at (0,0) width 192: ".one {text-align: left;}" - text run at (192,0) width 0: " " - text run at (0,16) width 200: ".two {text-align: right;}" - text run at (200,16) width 0: " " - text run at (0,32) width 224: ".three {text-align: center;}" - text run at (224,32) width 0: " " - text run at (0,48) width 224: ".four {text-align: justify;}" - text run at (224,48) width 0: " " - text run at (0,64) width 0: " " - LayoutBlockFlow {P} at (0,147) size 784x20 - LayoutText {#text} at (0,0) size 234x19 - text run at (0,0) width 234: "This sentence should be left-justified." - LayoutBlockFlow {P} at (0,183) size 784x20 - LayoutText {#text} at (541,0) size 243x19 - text run at (541,0) width 243: "This sentence should be right-justified." - LayoutBlockFlow {P} at (0,219) size 784x20 - LayoutText {#text} at (286,0) size 212x19 - text run at (286,0) width 212: "This sentence should be centered." - LayoutBlockFlow {P} at (0,255) size 784x60 - LayoutText {#text} at (0,0) size 784x59 - text run at (0,0) width 784: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" - text run at (0,20) width 784: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western" - text run at (0,40) width 67: "languages." - LayoutTable {TABLE} at (0,331) size 784x206 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x204 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x176 - LayoutTableCell {TD} at (0,102) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x176 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 - LayoutText {#text} at (0,0) size 234x19 - text run at (0,0) width 234: "This sentence should be left-justified." - LayoutBlockFlow {P} at (4,40) size 762x20 - LayoutText {#text} at (519,0) size 243x19 - text run at (519,0) width 243: "This sentence should be right-justified." - LayoutBlockFlow {P} at (4,76) size 762x20 - LayoutText {#text} at (275,0) size 212x19 - text run at (275,0) width 212: "This sentence should be centered." - LayoutBlockFlow {P} at (4,112) size 762x60 - LayoutText {#text} at (0,0) size 762x59 - text run at (0,0) width 762: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" - text run at (0,20) width 762: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in" - text run at (0,40) width 122: "Western languages." -layer at (8,137) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png deleted file mode 100644 index cb83a82..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt deleted file mode 100644 index f8e39654..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt +++ /dev/null
@@ -1,199 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1225 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1225 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1225 - LayoutBlockFlow {BODY} at (8,8) size 769x1209 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x128 - LayoutText {#text} at (0,0) size 464x128 - text run at (0,0) width 272: ".one {text-decoration: underline;}" - text run at (272,0) width 0: " " - text run at (0,16) width 264: ".two {text-decoration: overline;}" - text run at (264,16) width 0: " " - text run at (0,32) width 312: ".three {text-decoration: line-through;}" - text run at (312,32) width 0: " " - text run at (0,48) width 248: ".four {text-decoration: blink;}" - text run at (248,48) width 0: " " - text run at (0,64) width 248: "B.five {text-decoration: none;}" - text run at (248,64) width 0: " " - text run at (0,80) width 344: ".six {text-decoration: underline overline;}" - text run at (344,80) width 0: " " - text run at (0,96) width 464: ".seven {text-decoration: underline overline line-through;}" - text run at (464,96) width 0: " " - text run at (0,112) width 0: " " - LayoutBlockFlow {P} at (0,195) size 769x20 - LayoutText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This sentence should be underlined." - LayoutBlockFlow {P} at (0,231) size 769x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be overlined." - LayoutBlockFlow {P} at (0,267) size 769x20 - LayoutText {#text} at (0,0) size 336x19 - text run at (0,0) width 336: "This sentence should have stricken text (linethrough)." - LayoutBlockFlow {P} at (0,303) size 769x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 210: "This element should be blinking. " - text run at (210,0) width 380: "(It is not required, however, that UAs support this behavior.)" - LayoutBlockFlow {P} at (0,339) size 769x40 - LayoutText {#text} at (0,0) size 508x19 - text run at (0,0) width 291: "The text in this element should be underlined. " - text run at (291,0) width 217: "The boldfaced text in this element " - LayoutInline {B} at (0,0) size 173x19 - LayoutText {#text} at (508,0) size 173x19 - text run at (508,0) width 173: "should also be underlined" - LayoutText {#text} at (681,0) size 731x39 - text run at (681,0) width 8: ". " - text run at (689,0) width 42: "This is" - text run at (0,20) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - LayoutBlockFlow {P} at (0,395) size 769x20 - LayoutText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This sentence should be underlined and overlined." - LayoutBlockFlow {P} at (0,431) size 769x20 - LayoutText {#text} at (0,0) size 377x19 - text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." - LayoutBlockFlow {P} at (0,467) size 769x0 - LayoutBlockFlow {P} at (0,467) size 769x40 - LayoutText {#text} at (0,0) size 761x39 - text run at (0,0) width 761: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with class" - text run at (0,20) width 62: "of seven)." - LayoutBlockFlow {P} at (0,523) size 769x60 - LayoutText {#text} at (0,0) size 633x19 - text run at (0,0) width 633: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - LayoutInline {EM} at (0,0) size 21x19 - LayoutText {#text} at (632,0) size 21x19 - text run at (632,0) width 21: "not" - LayoutText {#text} at (652,0) size 91x19 - text run at (652,0) width 91: " be overlined: " - LayoutImage {IMG} at (742.88,0) size 15x15 - LayoutText {#text} at (757,0) size 762x59 - text run at (757,0) width 5: "." - text run at (0,20) width 729: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child" - text run at (0,40) width 59: "elements." - LayoutBlockFlow {P} at (0,599) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 105x19 - text run at (0,0) width 105: "The underlining " - LayoutInline {SPAN} at (0,0) size 96x19 [color=#0000FF] - LayoutText {#text} at (105,0) size 96x19 - text run at (105,0) width 96: "in this sentence" - LayoutText {#text} at (201,0) size 233x19 - text run at (201,0) width 233: " should be green, no matter what the " - LayoutInline {SPAN} at (0,0) size 109x19 [color=#000000] - LayoutText {#text} at (434,0) size 109x19 - text run at (434,0) width 109: "text color may be" - LayoutText {#text} at (543,0) size 4x19 - text run at (543,0) width 4: "." - LayoutBlockFlow {P} at (0,635) size 769x40 - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "The colors of the " - LayoutInline {SPAN} at (0,0) size 72x19 [color=#800080] - LayoutText {#text} at (111,0) size 72x19 - text run at (111,0) width 72: "underlining" - LayoutText {#text} at (183,0) size 20x19 - text run at (183,0) width 20: " in " - LayoutInline {SPAN} at (0,0) size 80x19 [color=#0000FF] - LayoutText {#text} at (203,0) size 80x19 - text run at (203,0) width 80: "this sentence" - LayoutText {#text} at (283,0) size 69x19 - text run at (283,0) width 69: " should be " - LayoutInline {SPAN} at (0,0) size 209x19 [color=#808080] - LayoutText {#text} at (352,0) size 209x19 - text run at (352,0) width 209: "the same as that of the parent text" - LayoutText {#text} at (561,0) size 738x39 - text run at (561,0) width 177: " (that is, the first word in the" - text run at (0,20) width 213: "sentence, which should be black)." - LayoutTable {TABLE} at (0,691) size 769x518 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x516 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x488 - LayoutTableCell {TD} at (0,258) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x488 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This sentence should be underlined." - LayoutBlockFlow {P} at (4,40) size 747x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be overlined." - LayoutBlockFlow {P} at (4,76) size 747x20 - LayoutText {#text} at (0,0) size 336x19 - text run at (0,0) width 336: "This sentence should have stricken text (linethrough)." - LayoutBlockFlow {P} at (4,112) size 747x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 210: "This element should be blinking. " - text run at (210,0) width 380: "(It is not required, however, that UAs support this behavior.)" - LayoutBlockFlow {P} at (4,148) size 747x40 - LayoutText {#text} at (0,0) size 508x19 - text run at (0,0) width 291: "The text in this element should be underlined. " - text run at (291,0) width 217: "The boldfaced text in this element " - LayoutInline {B} at (0,0) size 173x19 - LayoutText {#text} at (508,0) size 173x19 - text run at (508,0) width 173: "should also be underlined" - LayoutText {#text} at (681,0) size 731x39 - text run at (681,0) width 8: ". " - text run at (689,0) width 42: "This is" - text run at (0,20) width 716: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - LayoutBlockFlow {P} at (4,204) size 747x20 - LayoutText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This sentence should be underlined and overlined." - LayoutBlockFlow {P} at (4,240) size 747x20 - LayoutText {#text} at (0,0) size 377x19 - text run at (0,0) width 377: "This sentence should be underlined, overlined, and stricken." - LayoutBlockFlow {P} at (4,276) size 747x0 - LayoutBlockFlow {P} at (4,276) size 747x40 - LayoutText {#text} at (0,0) size 727x39 - text run at (0,0) width 727: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with" - text run at (0,20) width 96: "class of seven)." - LayoutBlockFlow {P} at (4,332) size 747x60 - LayoutText {#text} at (0,0) size 633x19 - text run at (0,0) width 633: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - LayoutInline {EM} at (0,0) size 21x19 - LayoutText {#text} at (632,0) size 21x19 - text run at (632,0) width 21: "not" - LayoutText {#text} at (652,0) size 91x19 - text run at (652,0) width 91: " be overlined: " - LayoutImage {IMG} at (0,20) size 15x15 - LayoutText {#text} at (15,20) size 717x39 - text run at (15,20) width 8: ". " - text run at (23,20) width 694: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans'" - text run at (0,40) width 94: "child elements." - LayoutBlockFlow {P} at (4,408) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 105x19 - text run at (0,0) width 105: "The underlining " - LayoutInline {SPAN} at (0,0) size 96x19 [color=#0000FF] - LayoutText {#text} at (105,0) size 96x19 - text run at (105,0) width 96: "in this sentence" - LayoutText {#text} at (201,0) size 233x19 - text run at (201,0) width 233: " should be green, no matter what the " - LayoutInline {SPAN} at (0,0) size 109x19 [color=#000000] - LayoutText {#text} at (434,0) size 109x19 - text run at (434,0) width 109: "text color may be" - LayoutText {#text} at (543,0) size 4x19 - text run at (543,0) width 4: "." - LayoutBlockFlow {P} at (4,444) size 747x40 - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "The colors of the " - LayoutInline {SPAN} at (0,0) size 72x19 [color=#800080] - LayoutText {#text} at (111,0) size 72x19 - text run at (111,0) width 72: "underlining" - LayoutText {#text} at (183,0) size 20x19 - text run at (183,0) width 20: " in " - LayoutInline {SPAN} at (0,0) size 80x19 [color=#0000FF] - LayoutText {#text} at (203,0) size 80x19 - text run at (203,0) width 80: "this sentence" - LayoutText {#text} at (283,0) size 69x19 - text run at (283,0) width 69: " should be " - LayoutInline {SPAN} at (0,0) size 209x19 [color=#808080] - LayoutText {#text} at (352,0) size 209x19 - text run at (352,0) width 209: "the same as that of the parent text" - LayoutText {#text} at (561,0) size 738x39 - text run at (561,0) width 177: " (that is, the first word in the" - text run at (0,20) width 213: "sentence, which should be black)." -layer at (8,185) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,177) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_indent-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_indent-expected.png deleted file mode 100644 index bac5342..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_indent-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt deleted file mode 100644 index b4fab2d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt +++ /dev/null
@@ -1,137 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1329 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1329 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1329 - LayoutBlockFlow {BODY} at (8,8) size 769x1313 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 384x176 - text run at (0,0) width 352: ".one {text-indent: 0.5in; background: aqua;}" - text run at (352,0) width 0: " " - text run at (0,16) width 336: ".two {text-indent: 2cm; background: aqua;}" - text run at (336,16) width 0: " " - text run at (0,32) width 360: ".three {text-indent: 20mm; background: aqua;}" - text run at (360,32) width 0: " " - text run at (0,48) width 352: ".four {text-indent: 24pt; background: aqua;}" - text run at (352,48) width 0: " " - text run at (0,64) width 344: ".five {text-indent: 2pc; background: aqua;}" - text run at (344,64) width 0: " " - text run at (0,80) width 336: ".six {text-indent: 2em; background: aqua;}" - text run at (336,80) width 0: " " - text run at (0,96) width 352: ".seven {text-indent: 2ex; background: aqua;}" - text run at (352,96) width 0: " " - text run at (0,112) width 352: ".eight {text-indent: 50%; background: aqua;}" - text run at (352,112) width 0: " " - text run at (0,128) width 352: ".nine {text-indent: 25px; background: aqua;}" - text run at (352,128) width 0: " " - text run at (0,144) width 384: "blockquote {text-indent: 50%; background: aqua;}" - text run at (384,144) width 0: " " - text run at (0,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 386x19 - text run at (48,0) width 386: "The first line of this sentence should be indented half an inch." - LayoutBlockFlow {P} at (0,279) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 412x19 - text run at (75,0) width 412: "The first line of this sentence should be indented two centimeters." - LayoutBlockFlow {P} at (0,315) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 429x19 - text run at (75,0) width 429: "The first line of this sentence should be indented twenty millimeters." - LayoutBlockFlow {P} at (0,351) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 428x19 - text run at (32,0) width 428: "The first line of this sentence should be indented twenty-four points." - LayoutBlockFlow {P} at (0,387) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 372x19 - text run at (32,0) width 372: "The first line of this sentence should be indented two picas." - LayoutBlockFlow {P} at (0,423) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 359x19 - text run at (32,0) width 359: "The first line of this sentence should be indented two em." - LayoutBlockFlow {P} at (0,459) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (14,0) size 355x19 - text run at (14,0) width 355: "The first line of this sentence should be indented two ex." - LayoutBlockFlow {P} at (0,495) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (384,0) size 744x39 - text run at (384,0) width 360: "The first line of this sentence should be indented halfway" - text run at (0,20) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." - LayoutBlockFlow {P} at (0,551) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 723x39 - text run at (25,0) width 698: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" - text run at (0,20) width 122: "margin of the page." - LayoutBlockFlow {P} at (0,607) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 416x19 - text run at (48,0) width 416: "Only the first line of this sentence should be indented half an inch," - LayoutBR {BR} at (464,15) size 0x0 - LayoutText {#text} at (0,20) size 259x19 - text run at (0,20) width 259: "no matter where the lines might start, and" - LayoutBR {BR} at (259,35) size 0x0 - LayoutInline {EM} at (0,0) size 198x19 - LayoutText {#text} at (0,40) size 198x19 - text run at (0,40) width 198: "regardless of any other markup" - LayoutText {#text} at (197,40) size 147x19 - text run at (197,40) width 147: " which may be present." - LayoutBlockFlow {BLOCKQUOTE} at (40,683) size 689x60 [bgcolor=#00FFFF] - LayoutText {#text} at (384,0) size 646x59 - text run at (384,0) width 222: "In the first half of the test page, this" - text run at (0,20) width 646: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,40) width 511: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." - LayoutTable {TABLE} at (0,759) size 769x554 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x552 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x524 - LayoutTableCell {TD} at (0,276) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x524 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 386x19 - text run at (48,0) width 386: "The first line of this sentence should be indented half an inch." - LayoutBlockFlow {P} at (4,40) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 412x19 - text run at (75,0) width 412: "The first line of this sentence should be indented two centimeters." - LayoutBlockFlow {P} at (4,76) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 429x19 - text run at (75,0) width 429: "The first line of this sentence should be indented twenty millimeters." - LayoutBlockFlow {P} at (4,112) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 428x19 - text run at (32,0) width 428: "The first line of this sentence should be indented twenty-four points." - LayoutBlockFlow {P} at (4,148) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 372x19 - text run at (32,0) width 372: "The first line of this sentence should be indented two picas." - LayoutBlockFlow {P} at (4,184) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 359x19 - text run at (32,0) width 359: "The first line of this sentence should be indented two em." - LayoutBlockFlow {P} at (4,220) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (14,0) size 355x19 - text run at (14,0) width 355: "The first line of this sentence should be indented two ex." - LayoutBlockFlow {P} at (4,256) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (373,0) size 733x39 - text run at (373,0) width 360: "The first line of this sentence should be indented halfway" - text run at (0,20) width 555: "across the page, but the rest of it should be flush with the normal left margin of the page." - LayoutBlockFlow {P} at (4,312) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 723x39 - text run at (25,0) width 698: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" - text run at (0,20) width 122: "margin of the page." - LayoutBlockFlow {P} at (4,368) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 416x19 - text run at (48,0) width 416: "Only the first line of this sentence should be indented half an inch," - LayoutBR {BR} at (464,15) size 0x0 - LayoutText {#text} at (0,20) size 259x19 - text run at (0,20) width 259: "no matter where the lines might start, and" - LayoutBR {BR} at (259,35) size 0x0 - LayoutInline {EM} at (0,0) size 198x19 - LayoutText {#text} at (0,40) size 198x19 - text run at (0,40) width 198: "regardless of any other markup" - LayoutText {#text} at (197,40) size 147x19 - text run at (197,40) width 147: " which may be present." - LayoutBlockFlow {BLOCKQUOTE} at (44,444) size 667x60 [bgcolor=#00FFFF] - LayoutText {#text} at (373,0) size 646x59 - text run at (373,0) width 222: "In the first half of the test page, this" - text run at (0,20) width 646: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,40) width 511: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_transform-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_transform-expected.png deleted file mode 100644 index 4074ca7e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt deleted file mode 100644 index 864692f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt +++ /dev/null
@@ -1,107 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 785 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x785 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x785 - LayoutBlockFlow {BODY} at (8,8) size 769x769 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x80 - LayoutText {#text} at (0,0) size 272x80 - text run at (0,0) width 224: ".ttn {text-transform: none;}" - text run at (224,0) width 0: " " - text run at (0,16) width 272: ".cap {text-transform: capitalize;}" - text run at (272,16) width 0: " " - text run at (0,32) width 264: ".upp {text-transform: uppercase;}" - text run at (264,32) width 0: " " - text run at (0,48) width 264: ".low {text-transform: lowercase;}" - text run at (264,48) width 0: " " - text run at (0,64) width 0: " " - LayoutBlockFlow {P} at (0,147) size 769x40 - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" - text run at (0,20) width 48: "normal." - LayoutBlockFlow {P} at (0,203) size 769x60 - LayoutText {#text} at (0,0) size 748x59 - text run at (0,0) width 748: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That" - text run at (0,20) width 722: "Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-" - text run at (0,40) width 538: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - LayoutBlockFlow {P} at (0,279) size 769x40 - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 752: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this" - text run at (0,20) width 304: "sentence should have one, and only one, capital " - LayoutInline {SPAN} at (0,0) size 37x19 - LayoutText {#text} at (304,20) size 17x19 - text run at (304,20) width 17: "Le" - LayoutInline {SPAN} at (0,0) size 8x19 - LayoutText {#text} at (321,20) size 8x19 - text run at (321,20) width 8: "tt" - LayoutText {#text} at (329,20) size 12x19 - text run at (329,20) width 12: "er" - LayoutText {#text} at (341,20) size 4x19 - text run at (341,20) width 4: "." - LayoutBlockFlow {P} at (0,335) size 769x60 - LayoutText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,20) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (359,20) width 284: "IN THE LAST SENTENCE, HOWEVER, " - LayoutInline {SPAN} at (0,0) size 765x39 - LayoutText {#text} at (643,20) size 765x39 - text run at (643,20) width 122: "the last eight words" - text run at (0,40) width 152: "should not be uppercase" - LayoutText {#text} at (152,40) size 4x19 - text run at (152,40) width 4: "." - LayoutBlockFlow {P} at (0,411) size 769x20 - LayoutText {#text} at (0,0) size 726x19 - text run at (0,0) width 726: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." - LayoutTable {TABLE} at (0,447) size 769x322 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x320 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x292 - LayoutTableCell {TD} at (0,160) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x292 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" - text run at (0,20) width 48: "normal." - LayoutBlockFlow {P} at (4,60) size 747x60 - LayoutText {#text} at (0,0) size 718x59 - text run at (0,0) width 715: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words" - text run at (0,20) width 718: "That Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A" - text run at (0,40) width 571: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - LayoutBlockFlow {P} at (4,136) size 747x40 - LayoutText {#text} at (0,0) size 726x39 - text run at (0,0) width 726: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in" - text run at (0,20) width 330: "this sentence should have one, and only one, capital " - LayoutInline {SPAN} at (0,0) size 37x19 - LayoutText {#text} at (330,20) size 17x19 - text run at (330,20) width 17: "Le" - LayoutInline {SPAN} at (0,0) size 8x19 - LayoutText {#text} at (347,20) size 8x19 - text run at (347,20) width 8: "tt" - LayoutText {#text} at (355,20) size 12x19 - text run at (355,20) width 12: "er" - LayoutText {#text} at (367,20) size 4x19 - text run at (367,20) width 4: "." - LayoutBlockFlow {P} at (4,192) size 747x60 - LayoutText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,20) width 359: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (359,20) width 284: "IN THE LAST SENTENCE, HOWEVER, " - LayoutInline {SPAN} at (0,0) size 722x39 - LayoutText {#text} at (643,20) size 722x39 - text run at (643,20) width 79: "the last eight" - text run at (0,40) width 195: "words should not be uppercase" - LayoutText {#text} at (195,40) size 4x19 - text run at (195,40) width 4: "." - LayoutBlockFlow {P} at (4,268) size 747x20 - LayoutText {#text} at (0,0) size 726x19 - text run at (0,0) width 726: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." -layer at (8,137) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png deleted file mode 100644 index 8b69dd9..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt deleted file mode 100644 index 26d66b4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt +++ /dev/null
@@ -1,722 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4501 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4501 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4501.31 - LayoutBlockFlow {BODY} at (8,8) size 769x4485.31 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x288 - LayoutText {#text} at (0,0) size 512x288 - text run at (0,0) width 160: "P {font-size: 12pt;}" - text run at (160,0) width 0: " " - text run at (0,16) width 216: ".one {vertical-align: sub;}" - text run at (216,16) width 0: " " - text run at (0,32) width 232: ".two {vertical-align: super;}" - text run at (232,32) width 0: " " - text run at (0,48) width 368: ".three {vertical-align: top; font-size: 12pt;}" - text run at (368,48) width 0: " " - text run at (0,64) width 400: ".four {vertical-align: text-top; font-size: 12pt;}" - text run at (400,64) width 0: " " - text run at (0,80) width 384: ".five {vertical-align: middle; font-size: 12pt;}" - text run at (384,80) width 0: " " - text run at (0,96) width 376: ".six {vertical-align: bottom; font-size: 12pt;}" - text run at (376,96) width 0: " " - text run at (0,112) width 432: ".seven {vertical-align: text-bottom; font-size: 12pt;}" - text run at (432,112) width 0: " " - text run at (0,128) width 408: ".eight {vertical-align: baseline; font-size: 12pt;}" - text run at (408,128) width 0: " " - text run at (0,144) width 512: ".nine {vertical-align: 50%; font-size: 12px; line-height: 16px;}" - text run at (512,144) width 0: " " - text run at (0,160) width 0: " " - text run at (0,176) width 224: "P.example {font-size: 14pt;}" - text run at (224,176) width 0: " " - text run at (0,192) width 176: "BIG {font-size: 16pt;}" - text run at (176,192) width 0: " " - text run at (0,208) width 192: "SMALL {font-size: 12pt;}" - text run at (192,208) width 0: " " - text run at (0,224) width 304: ".ttopalign {vertical-align: text-top;}" - text run at (304,224) width 0: " " - text run at (0,240) width 256: ".topalign {vertical-align: top;}" - text run at (256,240) width 0: " " - text run at (0,256) width 280: ".midalign {vertical-align: middle;}" - text run at (280,256) width 0: " " - text run at (0,272) width 0: " " - LayoutBlockFlow {P} at (0,355) size 769x79 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (15,39) size 126x19 - text run at (15,39) width 126: "The first four words" - LayoutText {#text} at (141,35) size 750x43 - text run at (141,35) width 284: " in this sentence should be subscript-aligned. " - text run at (425,35) width 325: "The font size of the superscripted text should not be" - text run at (0,59) width 254: "different from that of the parent element." - LayoutBlockFlow {P} at (0,450) size 769x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (15,29) size 126x19 - text run at (15,29) width 126: "The first four words" - LayoutText {#text} at (141,35) size 750x39 - text run at (141,35) width 296: " in this sentence should be superscript-aligned. " - text run at (437,35) width 313: "The font size of the subscripted text should not be" - text run at (0,55) width 254: "different from that of the parent element." - LayoutBlockFlow {P} at (0,541) size 769x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (15,0) size 126x19 - text run at (15,0) width 126: "The first four words" - LayoutText {#text} at (141,35) size 765x39 - text run at (141,35) width 624: " in this sentence should be top-aligned, which will align their tops with the top of the tallest element" - text run at (0,55) width 267: "in the line (probably the orange rectangle)." - LayoutBlockFlow {P} at (0,632) size 769x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 754x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (19,22) size 126x19 - text run at (19,22) width 126: "The first four words" - LayoutText {#text} at (145,22) size 754x110 - text run at (145,22) width 556: " in this sentence should be text-top-aligned," - text run at (0,59) width 754: "which should align their tops with the top of the tallest text" - text run at (0,96) width 136: "in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,781) size 769x70 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 739x56 - text run at (15,13) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" - text run at (0,50) width 310: "defined as the text baseline plus half the x-height." - LayoutBlockFlow {P} at (0,867) size 769x124 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 733x123 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (19,30) size 126x19 - text run at (19,30) width 126: "The first four words" - LayoutText {#text} at (145,0) size 733x123 - text run at (145,0) width 544: " in this sentence should be 12pt in size and" - text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 517: "bottom of the lowest element in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1007) size 769x161 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 745x160 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 293x19 - LayoutText {#text} at (19,16) size 293x19 - text run at (19,16) width 293: "The first eight words (\"eight\" has a descender)" - LayoutText {#text} at (312,0) size 745x160 - text run at (312,0) width 433: " in this sentence should be 12pt in" - text run at (0,50) width 692: "size and text-bottom-aligned, which should align their" - text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 294: "descenders) in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1184) size 769x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 759x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (19,35) size 126x19 - text run at (19,35) width 126: "The first four words" - LayoutText {#text} at (145,22) size 759x110 - text run at (145,22) width 544: " in this sentence should be 12pt in size and" - text run at (0,59) width 759: "baseline-aligned, which should align their baseline with the" - text run at (0,96) width 522: "baseline of the rest of the text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1333) size 769x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 96x15 - LayoutText {#text} at (15,30) size 96x15 - text run at (15,30) width 96: "The first four words" - LayoutText {#text} at (111,35) size 750x39 - text run at (111,35) width 639: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," - text run at (0,55) width 376: "which should raise them 8px relative to the natural baseline." - LayoutBlockFlow {P} at (0,1424) size 769x40 - LayoutText {#text} at (0,0) size 742x39 - text run at (0,0) width 742: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" - text run at (0,20) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (0,1482.66) size 769x328 - LayoutText {#text} at (0,27) size 120x21 - text run at (0,27) width 120: "This paragraph " - LayoutImage {IMG} at (120,27) size 9x30 - LayoutText {#text} at (129,27) size 5x21 - text run at (129,27) width 5: " " - LayoutInline {SPAN} at (0,0) size 422x53 - LayoutText {#text} at (134,1) size 422x53 - text run at (134,1) width 422: "contains many images" - LayoutText {#text} at (556,27) size 5x21 - text run at (556,27) width 5: " " - LayoutImage {IMG} at (561,27) size 15x50 - LayoutText {#text} at (576,27) size 5x21 - text run at (576,27) width 5: " " - LayoutInline {BIG} at (0,0) size 156x23 - LayoutText {#text} at (581,25) size 156x23 - text run at (581,25) width 156: "of varying heights" - LayoutText {#text} at (737,27) size 5x21 - text run at (737,27) width 5: " " - LayoutImage {IMG} at (742,27) size 3x10 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SMALL} at (0,0) size 69x19 - LayoutText {#text} at (0,126) size 69x19 - text run at (0,126) width 69: "and widths" - LayoutText {#text} at (69,125) size 5x21 - text run at (69,125) width 5: " " - LayoutImage {IMG} at (74,125) size 6x20 - LayoutText {#text} at (80,125) size 101x21 - text run at (80,125) width 101: " all of which " - LayoutImage {IMG} at (181,125) size 19.50x65 - LayoutText {#text} at (200,125) size 6x21 - text run at (200,125) width 6: " " - LayoutInline {SPAN} at (0,0) size 263x42 - LayoutText {#text} at (205,108) size 263x42 - text run at (205,108) width 263: "should be aligned" - LayoutText {#text} at (467,125) size 6x21 - text run at (467,125) width 6: " " - LayoutImage {IMG} at (472.50,125) size 10.50x35 - LayoutText {#text} at (483,125) size 123x21 - text run at (483,125) width 123: " with the top of " - LayoutImage {IMG} at (606,125) size 9x30 - LayoutText {#text} at (615,125) size 5x21 - text run at (615,125) width 5: " " - LayoutInline {SPAN} at (0,0) size 732x146 - LayoutText {#text} at (620,115) size 19x33 - text run at (620,115) width 19: "a " - LayoutInline {SPAN} at (0,0) size 732x193 - LayoutText {#text} at (639,78) size 732x193 - text run at (639,78) width 93: "14-" - text run at (0,191) width 143: "point" - LayoutText {#text} at (143,228) size 144x33 - text run at (143,228) width 144: " text element" - LayoutText {#text} at (287,238) size 5x21 - text run at (287,238) width 5: " " - LayoutImage {IMG} at (292,238) size 15x50 - LayoutText {#text} at (307,238) size 5x21 - text run at (307,238) width 5: " " - LayoutInline {SMALL} at (0,0) size 189x19 - LayoutText {#text} at (312,239) size 189x19 - text run at (312,239) width 189: "regardless of the line in which" - LayoutText {#text} at (501,238) size 5x21 - text run at (501,238) width 5: " " - LayoutImage {IMG} at (506,238) size 4.50x15 - LayoutText {#text} at (510,238) size 6x21 - text run at (510,238) width 6: " " - LayoutInline {BIG} at (0,0) size 156x23 - LayoutText {#text} at (515,236) size 156x23 - text run at (515,236) width 156: "the images appear." - LayoutText {#text} at (670,238) size 6x21 - text run at (670,238) width 6: " " - LayoutImage {IMG} at (675.31,238) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1829.31) size 769x40 - LayoutText {#text} at (0,0) size 749x39 - text run at (0,0) width 749: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be" - text run at (0,20) width 362: "aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (0,1885.31) size 769x233 - LayoutText {#text} at (0,22) size 99x19 - text run at (0,22) width 99: "This paragraph " - LayoutImage {IMG} at (99,19) size 9x30 - LayoutText {#text} at (108,22) size 4x19 - text run at (108,22) width 4: " " - LayoutInline {SPAN} at (0,0) size 357x46 - LayoutText {#text} at (112,1) size 357x46 - text run at (112,1) width 357: "contains many images" - LayoutText {#text} at (469,22) size 4x19 - text run at (469,22) width 4: " " - LayoutImage {IMG} at (473,9) size 15x50 - LayoutText {#text} at (488,22) size 122x19 - text run at (488,22) width 122: " of varying heights " - LayoutImage {IMG} at (610,29) size 3x10 - LayoutText {#text} at (613,22) size 4x19 - text run at (613,22) width 4: " " - LayoutInline {SMALL} at (0,0) size 69x19 - LayoutText {#text} at (617,22) size 69x19 - text run at (617,22) width 69: "and widths" - LayoutText {#text} at (686,22) size 4x19 - text run at (686,22) width 4: " " - LayoutImage {IMG} at (690,24) size 6x20 - LayoutText {#text} at (696,22) size 732x96 - text run at (696,22) width 36: " all of" - text run at (0,99) width 43: "which " - LayoutImage {IMG} at (43,78) size 19.50x65 - LayoutText {#text} at (62,99) size 120x19 - text run at (62,99) width 120: " should be aligned " - LayoutImage {IMG} at (181.50,93) size 10.50x35 - LayoutText {#text} at (192,99) size 4x19 - text run at (192,99) width 4: " " - LayoutInline {SPAN} at (0,0) size 236x36 - LayoutText {#text} at (196,86) size 236x36 - text run at (196,86) width 236: "with the middle of" - LayoutText {#text} at (432,99) size 4x19 - text run at (432,99) width 4: " " - LayoutImage {IMG} at (436,86) size 15x50 - LayoutText {#text} at (451,99) size 4x19 - text run at (451,99) width 4: " " - LayoutInline {SPAN} at (0,0) size 719x104 - LayoutText {#text} at (455,93) size 17x27 - text run at (455,93) width 17: "a " - LayoutInline {SPAN} at (0,0) size 204x68 - LayoutText {#text} at (472,60) size 204x68 - text run at (472,60) width 204: "14-point" - LayoutText {#text} at (676,93) size 719x104 - text run at (676,93) width 43: " text" - text run at (0,170) width 78: "element" - LayoutText {#text} at (78,176) size 4x19 - text run at (78,176) width 4: " " - LayoutImage {IMG} at (82,163) size 15x50 - LayoutText {#text} at (97,176) size 4x19 - text run at (97,176) width 4: " " - LayoutInline {SMALL} at (0,0) size 189x19 - LayoutText {#text} at (101,176) size 189x19 - text run at (101,176) width 189: "regardless of the line in which" - LayoutText {#text} at (290,176) size 4x19 - text run at (290,176) width 4: " " - LayoutImage {IMG} at (294,180) size 4.50x15 - LayoutText {#text} at (298,176) size 5x19 - text run at (298,176) width 5: " " - LayoutInline {BIG} at (0,0) size 156x23 - LayoutText {#text} at (302,173) size 156x23 - text run at (302,173) width 156: "the images appear." - LayoutText {#text} at (457,176) size 5x19 - text run at (457,176) width 5: " " - LayoutImage {IMG} at (461.31,143) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,2134.31) size 769x40 - LayoutText {#text} at (0,0) size 733x39 - text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" - text run at (0,20) width 173: "element is an image or not. " - text run at (173,20) width 554: "Each fragment of text has been SPANned appropriately in order to cause this to happen." - LayoutBlockFlow {P} at (0,2190.31) size 769x203 - LayoutInline {SPAN} at (0,0) size 95x19 - LayoutText {#text} at (0,0) size 95x19 - text run at (0,0) width 95: "This paragraph" - LayoutText {#text} at (95,0) size 4x19 - text run at (95,0) width 4: " " - LayoutImage {IMG} at (99,0) size 3x10 - LayoutText {#text} at (102,0) size 4x19 - text run at (102,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 357x46 - LayoutText {#text} at (106,1) size 357x46 - text run at (106,1) width 357: "contains many images" - LayoutText {#text} at (463,0) size 4x19 - text run at (463,0) width 4: " " - LayoutImage {IMG} at (467,0) size 3x10 - LayoutText {#text} at (470,0) size 4x19 - text run at (470,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 87x19 - LayoutText {#text} at (474,0) size 87x19 - text run at (474,0) width 87: "and some text" - LayoutText {#text} at (561,0) size 4x19 - text run at (561,0) width 4: " " - LayoutImage {IMG} at (565,0) size 3x10 - LayoutText {#text} at (568,0) size 4x19 - text run at (568,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 114x19 - LayoutText {#text} at (572,0) size 114x19 - text run at (572,0) width 114: "of varying heights" - LayoutText {#text} at (686,0) size 4x19 - text run at (686,0) width 4: " " - LayoutImage {IMG} at (690,0) size 3x10 - LayoutText {#text} at (693,0) size 4x19 - text run at (693,0) width 4: " " - LayoutInline {BIG} at (0,0) size 728x71 - LayoutText {#text} at (697,0) size 728x71 - text run at (697,0) width 31: "and" - text run at (0,48) width 57: "widths" - LayoutText {#text} at (57,48) size 4x19 - text run at (57,48) width 4: " " - LayoutImage {IMG} at (61,48) size 6x20 - LayoutText {#text} at (67,48) size 4x19 - text run at (67,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 75x19 - LayoutText {#text} at (71,48) size 75x19 - text run at (71,48) width 75: "all of which" - LayoutText {#text} at (146,48) size 4x19 - text run at (146,48) width 4: " " - LayoutImage {IMG} at (150,48) size 19.50x65 - LayoutText {#text} at (169,48) size 5x19 - text run at (169,48) width 5: " " - LayoutInline {SPAN} at (0,0) size 112x19 - LayoutText {#text} at (173,48) size 112x19 - text run at (173,48) width 112: "should be aligned" - LayoutText {#text} at (284,48) size 5x19 - text run at (284,48) width 5: " " - LayoutImage {IMG} at (288.50,48) size 10.50x35 - LayoutText {#text} at (299,48) size 4x19 - text run at (299,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 188x36 - LayoutText {#text} at (303,48) size 188x36 - text run at (303,48) width 188: "with the top of" - LayoutText {#text} at (491,48) size 4x19 - text run at (491,48) width 4: " " - LayoutImage {IMG} at (495,48) size 15x50 - LayoutText {#text} at (510,48) size 4x19 - text run at (510,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 128x19 - LayoutText {#text} at (514,48) size 128x19 - text run at (514,48) width 128: "the tallest element in" - LayoutText {#text} at (642,48) size 4x19 - text run at (642,48) width 4: " " - LayoutImage {IMG} at (646,48) size 4.50x15 - LayoutText {#text} at (650,48) size 5x19 - text run at (650,48) width 5: " " - LayoutInline {BIG} at (0,0) size 743x88 - LayoutText {#text} at (654,48) size 743x88 - text run at (654,48) width 89: "whichever" - text run at (0,113) width 207: "line the elements appear." - LayoutText {#text} at (206,113) size 5x19 - text run at (206,113) width 5: " " - LayoutImage {IMG} at (210.81,113) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,2409.31) size 769x2076 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2074 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x2046 - LayoutTableCell {TD} at (0,1037) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x2046.31 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x79 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (15,39) size 126x19 - text run at (15,39) width 126: "The first four words" - LayoutText {#text} at (141,35) size 731x43 - text run at (141,35) width 284: " in this sentence should be subscript-aligned. " - text run at (425,35) width 306: "The font size of the superscripted text should not" - text run at (0,59) width 273: "be different from that of the parent element." - LayoutBlockFlow {P} at (4,99) size 747x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (15,29) size 126x19 - text run at (15,29) width 126: "The first four words" - LayoutText {#text} at (141,35) size 731x39 - text run at (141,35) width 296: " in this sentence should be superscript-aligned. " - text run at (437,35) width 294: "The font size of the subscripted text should not" - text run at (0,55) width 273: "be different from that of the parent element." - LayoutBlockFlow {P} at (4,190) size 747x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (15,0) size 126x19 - text run at (15,0) width 126: "The first four words" - LayoutText {#text} at (141,35) size 712x39 - text run at (141,35) width 571: " in this sentence should be top-aligned, which will align their tops with the top of the tallest" - text run at (0,55) width 320: "element in the line (probably the orange rectangle)." - LayoutBlockFlow {P} at (4,281) size 747x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 701x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (19,22) size 126x19 - text run at (19,22) width 126: "The first four words" - LayoutText {#text} at (145,22) size 701x110 - text run at (145,22) width 556: " in this sentence should be text-top-aligned," - text run at (0,59) width 698: "which should align their tops with the top of the tallest" - text run at (0,96) width 192: "text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,430) size 747x70 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 739x56 - text run at (15,13) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" - text run at (0,50) width 310: "defined as the text baseline plus half the x-height." - LayoutBlockFlow {P} at (4,516) size 747x124 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 733x123 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (19,30) size 126x19 - text run at (19,30) width 126: "The first four words" - LayoutText {#text} at (145,0) size 733x123 - text run at (145,0) width 544: " in this sentence should be 12pt in size and" - text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 517: "bottom of the lowest element in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,656) size 747x161 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 745x160 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 293x19 - LayoutText {#text} at (19,16) size 293x19 - text run at (19,16) width 293: "The first eight words (\"eight\" has a descender)" - LayoutText {#text} at (312,0) size 745x160 - text run at (312,0) width 433: " in this sentence should be 12pt in" - text run at (0,50) width 692: "size and text-bottom-aligned, which should align their" - text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 294: "descenders) in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,833) size 747x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 712x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 126x19 - LayoutText {#text} at (19,35) size 126x19 - text run at (19,35) width 126: "The first four words" - LayoutText {#text} at (145,22) size 712x110 - text run at (145,22) width 544: " in this sentence should be 12pt in size and" - text run at (0,59) width 712: "baseline-aligned, which should align their baseline with" - text run at (0,96) width 569: "the baseline of the rest of the text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,982) size 747x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 96x15 - LayoutText {#text} at (15,30) size 96x15 - text run at (15,30) width 96: "The first four words" - LayoutText {#text} at (111,35) size 700x39 - text run at (111,35) width 589: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-" - text run at (0,55) width 430: "aligned, which should raise them 8px relative to the natural baseline." - LayoutBlockFlow {P} at (4,1073) size 747x40 - LayoutText {#text} at (0,0) size 742x39 - text run at (0,0) width 742: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" - text run at (0,20) width 661: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (4,1131.66) size 747x328 - LayoutText {#text} at (0,27) size 120x21 - text run at (0,27) width 120: "This paragraph " - LayoutImage {IMG} at (120,27) size 9x30 - LayoutText {#text} at (129,27) size 5x21 - text run at (129,27) width 5: " " - LayoutInline {SPAN} at (0,0) size 422x53 - LayoutText {#text} at (134,1) size 422x53 - text run at (134,1) width 422: "contains many images" - LayoutText {#text} at (556,27) size 5x21 - text run at (556,27) width 5: " " - LayoutImage {IMG} at (561,27) size 15x50 - LayoutText {#text} at (576,27) size 5x21 - text run at (576,27) width 5: " " - LayoutInline {BIG} at (0,0) size 156x23 - LayoutText {#text} at (581,25) size 156x23 - text run at (581,25) width 156: "of varying heights" - LayoutText {#text} at (737,27) size 5x21 - text run at (737,27) width 5: " " - LayoutImage {IMG} at (742,27) size 3x10 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SMALL} at (0,0) size 69x19 - LayoutText {#text} at (0,126) size 69x19 - text run at (0,126) width 69: "and widths" - LayoutText {#text} at (69,125) size 5x21 - text run at (69,125) width 5: " " - LayoutImage {IMG} at (74,125) size 6x20 - LayoutText {#text} at (80,125) size 101x21 - text run at (80,125) width 101: " all of which " - LayoutImage {IMG} at (181,125) size 19.50x65 - LayoutText {#text} at (200,125) size 6x21 - text run at (200,125) width 6: " " - LayoutInline {SPAN} at (0,0) size 263x42 - LayoutText {#text} at (205,108) size 263x42 - text run at (205,108) width 263: "should be aligned" - LayoutText {#text} at (467,125) size 6x21 - text run at (467,125) width 6: " " - LayoutImage {IMG} at (472.50,125) size 10.50x35 - LayoutText {#text} at (483,125) size 123x21 - text run at (483,125) width 123: " with the top of " - LayoutImage {IMG} at (606,125) size 9x30 - LayoutText {#text} at (615,125) size 5x21 - text run at (615,125) width 5: " " - LayoutInline {SPAN} at (0,0) size 732x146 - LayoutText {#text} at (620,115) size 19x33 - text run at (620,115) width 19: "a " - LayoutInline {SPAN} at (0,0) size 732x193 - LayoutText {#text} at (639,78) size 732x193 - text run at (639,78) width 93: "14-" - text run at (0,191) width 143: "point" - LayoutText {#text} at (143,228) size 144x33 - text run at (143,228) width 144: " text element" - LayoutText {#text} at (287,238) size 5x21 - text run at (287,238) width 5: " " - LayoutImage {IMG} at (292,238) size 15x50 - LayoutText {#text} at (307,238) size 5x21 - text run at (307,238) width 5: " " - LayoutInline {SMALL} at (0,0) size 189x19 - LayoutText {#text} at (312,239) size 189x19 - text run at (312,239) width 189: "regardless of the line in which" - LayoutText {#text} at (501,238) size 5x21 - text run at (501,238) width 5: " " - LayoutImage {IMG} at (506,238) size 4.50x15 - LayoutText {#text} at (510,238) size 6x21 - text run at (510,238) width 6: " " - LayoutInline {BIG} at (0,0) size 156x23 - LayoutText {#text} at (515,236) size 156x23 - text run at (515,236) width 156: "the images appear." - LayoutText {#text} at (670,238) size 6x21 - text run at (670,238) width 6: " " - LayoutImage {IMG} at (675.31,238) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,1478.31) size 747x40 - LayoutText {#text} at (0,0) size 730x39 - text run at (0,0) width 730: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should" - text run at (0,20) width 381: "be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (4,1534.31) size 747x233 - LayoutText {#text} at (0,22) size 99x19 - text run at (0,22) width 99: "This paragraph " - LayoutImage {IMG} at (99,19) size 9x30 - LayoutText {#text} at (108,22) size 4x19 - text run at (108,22) width 4: " " - LayoutInline {SPAN} at (0,0) size 357x46 - LayoutText {#text} at (112,1) size 357x46 - text run at (112,1) width 357: "contains many images" - LayoutText {#text} at (469,22) size 4x19 - text run at (469,22) width 4: " " - LayoutImage {IMG} at (473,9) size 15x50 - LayoutText {#text} at (488,22) size 122x19 - text run at (488,22) width 122: " of varying heights " - LayoutImage {IMG} at (610,29) size 3x10 - LayoutText {#text} at (613,22) size 4x19 - text run at (613,22) width 4: " " - LayoutInline {SMALL} at (0,0) size 69x19 - LayoutText {#text} at (617,22) size 69x19 - text run at (617,22) width 69: "and widths" - LayoutText {#text} at (686,22) size 4x19 - text run at (686,22) width 4: " " - LayoutImage {IMG} at (690,24) size 6x20 - LayoutText {#text} at (696,22) size 732x96 - text run at (696,22) width 36: " all of" - text run at (0,99) width 43: "which " - LayoutImage {IMG} at (43,78) size 19.50x65 - LayoutText {#text} at (62,99) size 120x19 - text run at (62,99) width 120: " should be aligned " - LayoutImage {IMG} at (181.50,93) size 10.50x35 - LayoutText {#text} at (192,99) size 4x19 - text run at (192,99) width 4: " " - LayoutInline {SPAN} at (0,0) size 236x36 - LayoutText {#text} at (196,86) size 236x36 - text run at (196,86) width 236: "with the middle of" - LayoutText {#text} at (432,99) size 4x19 - text run at (432,99) width 4: " " - LayoutImage {IMG} at (436,86) size 15x50 - LayoutText {#text} at (451,99) size 4x19 - text run at (451,99) width 4: " " - LayoutInline {SPAN} at (0,0) size 719x104 - LayoutText {#text} at (455,93) size 17x27 - text run at (455,93) width 17: "a " - LayoutInline {SPAN} at (0,0) size 204x68 - LayoutText {#text} at (472,60) size 204x68 - text run at (472,60) width 204: "14-point" - LayoutText {#text} at (676,93) size 719x104 - text run at (676,93) width 43: " text" - text run at (0,170) width 78: "element" - LayoutText {#text} at (78,176) size 4x19 - text run at (78,176) width 4: " " - LayoutImage {IMG} at (82,163) size 15x50 - LayoutText {#text} at (97,176) size 4x19 - text run at (97,176) width 4: " " - LayoutInline {SMALL} at (0,0) size 189x19 - LayoutText {#text} at (101,176) size 189x19 - text run at (101,176) width 189: "regardless of the line in which" - LayoutText {#text} at (290,176) size 4x19 - text run at (290,176) width 4: " " - LayoutImage {IMG} at (294,180) size 4.50x15 - LayoutText {#text} at (298,176) size 5x19 - text run at (298,176) width 5: " " - LayoutInline {BIG} at (0,0) size 156x23 - LayoutText {#text} at (302,173) size 156x23 - text run at (302,173) width 156: "the images appear." - LayoutText {#text} at (457,176) size 5x19 - text run at (457,176) width 5: " " - LayoutImage {IMG} at (461.31,143) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,1783.31) size 747x40 - LayoutText {#text} at (0,0) size 733x39 - text run at (0,0) width 733: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" - text run at (0,20) width 173: "element is an image or not. " - text run at (173,20) width 554: "Each fragment of text has been SPANned appropriately in order to cause this to happen." - LayoutBlockFlow {P} at (4,1839.31) size 747x203 - LayoutInline {SPAN} at (0,0) size 95x19 - LayoutText {#text} at (0,0) size 95x19 - text run at (0,0) width 95: "This paragraph" - LayoutText {#text} at (95,0) size 4x19 - text run at (95,0) width 4: " " - LayoutImage {IMG} at (99,0) size 3x10 - LayoutText {#text} at (102,0) size 4x19 - text run at (102,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 357x46 - LayoutText {#text} at (106,1) size 357x46 - text run at (106,1) width 357: "contains many images" - LayoutText {#text} at (463,0) size 4x19 - text run at (463,0) width 4: " " - LayoutImage {IMG} at (467,0) size 3x10 - LayoutText {#text} at (470,0) size 4x19 - text run at (470,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 87x19 - LayoutText {#text} at (474,0) size 87x19 - text run at (474,0) width 87: "and some text" - LayoutText {#text} at (561,0) size 4x19 - text run at (561,0) width 4: " " - LayoutImage {IMG} at (565,0) size 3x10 - LayoutText {#text} at (568,0) size 4x19 - text run at (568,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 114x19 - LayoutText {#text} at (572,0) size 114x19 - text run at (572,0) width 114: "of varying heights" - LayoutText {#text} at (686,0) size 4x19 - text run at (686,0) width 4: " " - LayoutImage {IMG} at (690,0) size 3x10 - LayoutText {#text} at (693,0) size 4x19 - text run at (693,0) width 4: " " - LayoutInline {BIG} at (0,0) size 728x71 - LayoutText {#text} at (697,0) size 728x71 - text run at (697,0) width 31: "and" - text run at (0,48) width 57: "widths" - LayoutText {#text} at (57,48) size 4x19 - text run at (57,48) width 4: " " - LayoutImage {IMG} at (61,48) size 6x20 - LayoutText {#text} at (67,48) size 4x19 - text run at (67,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 75x19 - LayoutText {#text} at (71,48) size 75x19 - text run at (71,48) width 75: "all of which" - LayoutText {#text} at (146,48) size 4x19 - text run at (146,48) width 4: " " - LayoutImage {IMG} at (150,48) size 19.50x65 - LayoutText {#text} at (169,48) size 5x19 - text run at (169,48) width 5: " " - LayoutInline {SPAN} at (0,0) size 112x19 - LayoutText {#text} at (173,48) size 112x19 - text run at (173,48) width 112: "should be aligned" - LayoutText {#text} at (284,48) size 5x19 - text run at (284,48) width 5: " " - LayoutImage {IMG} at (288.50,48) size 10.50x35 - LayoutText {#text} at (299,48) size 4x19 - text run at (299,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 188x36 - LayoutText {#text} at (303,48) size 188x36 - text run at (303,48) width 188: "with the top of" - LayoutText {#text} at (491,48) size 4x19 - text run at (491,48) width 4: " " - LayoutImage {IMG} at (495,48) size 15x50 - LayoutText {#text} at (510,48) size 4x19 - text run at (510,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 128x19 - LayoutText {#text} at (514,48) size 128x19 - text run at (514,48) width 128: "the tallest element in" - LayoutText {#text} at (642,48) size 4x19 - text run at (642,48) width 4: " " - LayoutImage {IMG} at (646,48) size 4.50x15 - LayoutText {#text} at (650,48) size 5x19 - text run at (650,48) width 5: " " - LayoutInline {BIG} at (0,0) size 743x88 - LayoutText {#text} at (654,48) size 743x88 - text run at (654,48) width 89: "whichever" - text run at (0,113) width 207: "line the elements appear." - LayoutText {#text} at (206,113) size 5x19 - text run at (206,113) width 5: " " - LayoutImage {IMG} at (210.81,113) size 27x90 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,345) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,337) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png deleted file mode 100644 index badd717a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt deleted file mode 100644 index 94365a1..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt +++ /dev/null
@@ -1,118 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1057 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1057 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1057 - LayoutBlockFlow {BODY} at (8,8) size 769x1041 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x192 - LayoutText {#text} at (0,0) size 248x192 - text run at (0,0) width 216: ".one {word-spacing: 0.3in;}" - text run at (216,0) width 0: " " - text run at (0,16) width 216: ".two {word-spacing: 0.5cm;}" - text run at (216,16) width 0: " " - text run at (0,32) width 216: ".three {word-spacing: 5mm;}" - text run at (216,32) width 0: " " - text run at (0,48) width 208: ".four {word-spacing: 3pt;}" - text run at (208,48) width 0: " " - text run at (0,64) width 232: ".five {word-spacing: 0.25pc;}" - text run at (232,64) width 0: " " - text run at (0,80) width 200: ".six {word-spacing: 1em;}" - text run at (200,80) width 0: " " - text run at (0,96) width 216: ".seven {word-spacing: 1ex;}" - text run at (216,96) width 0: " " - text run at (0,112) width 216: ".eight {word-spacing: 5px;}" - text run at (216,112) width 0: " " - text run at (0,128) width 232: ".nine {word-spacing: normal;}" - text run at (232,128) width 0: " " - text run at (0,144) width 208: ".ten {word-spacing: 300%;}" - text run at (208,144) width 0: " " - text run at (0,160) width 248: ".eleven {word-spacing: -0.2em;}" - text run at (248,160) width 0: " " - text run at (0,176) width 0: " " - LayoutBlockFlow {P} at (0,259) size 769x20 - LayoutText {#text} at (0,0) size 709x19 - text run at (0,0) width 709: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,295) size 769x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,331) size 769x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,367) size 769x20 - LayoutText {#text} at (0,0) size 461x19 - text run at (0,0) width 461: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,403) size 769x20 - LayoutText {#text} at (0,0) size 461x19 - text run at (0,0) width 461: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,439) size 769x20 - LayoutText {#text} at (0,0) size 581x19 - text run at (0,0) width 581: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,475) size 769x20 - LayoutText {#text} at (0,0) size 491x19 - text run at (0,0) width 491: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,511) size 769x40 - LayoutText {#text} at (0,0) size 751x19 - text run at (0,0) width 751: "This words in this sentence should have extra space between them, but the last few words in the sentence" - LayoutInline {SPAN} at (0,0) size 176x19 - LayoutText {#text} at (0,20) size 176x19 - text run at (0,20) width 176: "should have normal spacing" - LayoutText {#text} at (176,20) size 4x19 - text run at (176,20) width 4: "." - LayoutBlockFlow {P} at (0,567) size 769x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This sentence should have normal word-spacing, since percentage values are not allowed on this property." - LayoutBlockFlow {P} at (0,603) size 769x20 - LayoutText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." - LayoutTable {TABLE} at (0,639) size 769x402 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x400 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x372 - LayoutTableCell {TD} at (0,200) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x372 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 709x19 - text run at (0,0) width 709: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,40) size 747x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,76) size 747x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,112) size 747x20 - LayoutText {#text} at (0,0) size 461x19 - text run at (0,0) width 461: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,148) size 747x20 - LayoutText {#text} at (0,0) size 461x19 - text run at (0,0) width 461: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,184) size 747x20 - LayoutText {#text} at (0,0) size 581x19 - text run at (0,0) width 581: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,220) size 747x20 - LayoutText {#text} at (0,0) size 491x19 - text run at (0,0) width 491: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,256) size 747x40 - LayoutText {#text} at (0,0) size 688x39 - text run at (0,0) width 688: "This words in this sentence should have extra space between them, but the last few words in the" - text run at (0,20) width 63: "sentence " - LayoutInline {SPAN} at (0,0) size 176x19 - LayoutText {#text} at (63,20) size 176x19 - text run at (63,20) width 176: "should have normal spacing" - LayoutText {#text} at (239,20) size 4x19 - text run at (239,20) width 4: "." - LayoutBlockFlow {P} at (4,312) size 747x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This sentence should have normal word-spacing, since percentage values are not allowed on this property." - LayoutBlockFlow {P} at (4,348) size 747x20 - LayoutText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." -layer at (8,249) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,241) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/color_units-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/color_units-expected.png deleted file mode 100644 index f4bae11..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/color_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/color_units-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/color_units-expected.txt deleted file mode 100644 index ac0a5e3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/color_units-expected.txt +++ /dev/null
@@ -1,239 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1805 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1805 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1805 - LayoutBlockFlow {BODY} at (8,8) size 769x1789 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x192 - LayoutText {#text} at (0,0) size 288x192 - text run at (0,0) width 160: "BODY {color: black;}" - text run at (160,0) width 0: " " - text run at (0,16) width 152: ".one {color: #080;}" - text run at (152,16) width 0: " " - text run at (0,32) width 176: ".two {color: #008000;}" - text run at (176,32) width 0: " " - text run at (0,48) width 232: ".three {color: rgb(0,128,0);}" - text run at (232,48) width 0: " " - text run at (0,64) width 240: ".four {color: rgb(0%,50%,0%);}" - text run at (240,64) width 0: " " - text run at (0,80) width 288: ".five {color: rgb(0.0%,50.0%,0.0%);}" - text run at (288,80) width 0: " " - text run at (0,96) width 160: ".six {color: green;}" - text run at (160,96) width 0: " " - text run at (0,112) width 232: ".seven {color: invalidValue;}" - text run at (232,112) width 0: " " - text run at (0,128) width 256: ".eight {color: rgb(0,128,1280);}" - text run at (256,128) width 0: " " - text run at (0,144) width 240: ".nine {color: rgb(0,128,255);}" - text run at (240,144) width 0: " " - text run at (0,160) width 264: ".ten {color: rgb(50%,-500%,60%);}" - text run at (264,160) width 0: " " - text run at (0,176) width 264: ".eleven {color: rgb(50%,0%,60%);}" - text run at (264,176) width 0: " " - LayoutBlockFlow {P} at (0,259) size 769x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (0,295) size 769x20 [color=#008800] - LayoutText {#text} at (0,0) size 506x19 - text run at (0,0) width 506: "This sentence should be green, although slightly different from those that follow." - LayoutBlockFlow {P} at (0,331) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,367) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,403) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,439) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,475) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (0,511) size 769x20 - LayoutText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "This sentence should be black, because the value given for class " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (407,3) size 48x16 - text run at (407,3) width 48: ".seven" - LayoutText {#text} at (455,0) size 65x19 - text run at (455,0) width 65: " is invalid." - LayoutBlockFlow {P} at (0,547) size 769x40 [color=#0080FF] - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,20) width 67: "paragraph." - LayoutBlockFlow {P} at (0,603) size 769x40 [color=#0080FF] - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 752: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 67: "paragraph." - LayoutBlockFlow {P} at (0,659) size 769x20 [color=#800099] - LayoutText {#text} at (0,0) size 769x19 - text run at (0,0) width 769: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next paragraph." - LayoutBlockFlow {P} at (0,695) size 769x40 [color=#800099] - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 67: "paragraph." - LayoutBlockFlow {P} at (0,751) size 769x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (0,787) size 769x20 [color=#008800] - LayoutText {#text} at (0,0) size 399x19 - text run at (0,0) width 399: "This sentence should be a slightly different green, and used the " - LayoutInline {TT} at (0,0) size 41x16 - LayoutText {#text} at (398,3) size 41x16 - text run at (398,3) width 41: "style" - LayoutText {#text} at (438,0) size 60x19 - text run at (438,0) width 60: " attribute." - LayoutBlockFlow {P} at (0,823) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (0,859) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (0,895) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (0,931) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (0,967) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutTable {TABLE} at (0,1003) size 769x786 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x784 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x756 - LayoutTableCell {TD} at (0,392) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x756 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (4,40) size 747x20 [color=#008800] - LayoutText {#text} at (0,0) size 506x19 - text run at (0,0) width 506: "This sentence should be green, although slightly different from those that follow." - LayoutBlockFlow {P} at (4,76) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,112) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,148) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,184) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,220) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be green." - LayoutBlockFlow {P} at (4,256) size 747x20 - LayoutText {#text} at (0,0) size 407x19 - text run at (0,0) width 407: "This sentence should be black, because the value given for class " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (407,3) size 48x16 - text run at (407,3) width 48: ".seven" - LayoutText {#text} at (455,0) size 65x19 - text run at (455,0) width 65: " is invalid." - LayoutBlockFlow {P} at (4,292) size 747x40 [color=#0080FF] - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,20) width 67: "paragraph." - LayoutBlockFlow {P} at (4,348) size 747x40 [color=#0080FF] - LayoutText {#text} at (0,0) size 694x39 - text run at (0,0) width 694: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the" - text run at (0,20) width 125: "previous paragraph." - LayoutBlockFlow {P} at (4,404) size 747x40 [color=#800099] - LayoutText {#text} at (0,0) size 698x39 - text run at (0,0) width 698: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next" - text run at (0,20) width 67: "paragraph." - LayoutBlockFlow {P} at (4,460) size 747x40 [color=#800099] - LayoutText {#text} at (0,0) size 725x39 - text run at (0,0) width 725: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 67: "paragraph." - LayoutBlockFlow {P} at (4,516) size 747x20 - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This sentence should be black." - LayoutBlockFlow {P} at (4,552) size 747x20 [color=#008800] - LayoutText {#text} at (0,0) size 399x19 - text run at (0,0) width 399: "This sentence should be a slightly different green, and used the " - LayoutInline {TT} at (0,0) size 41x16 - LayoutText {#text} at (398,3) size 41x16 - text run at (398,3) width 41: "style" - LayoutText {#text} at (438,0) size 60x19 - text run at (438,0) width 60: " attribute." - LayoutBlockFlow {P} at (4,588) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (4,624) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (4,660) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (4,696) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." - LayoutBlockFlow {P} at (4,732) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 281x19 - text run at (0,0) width 281: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (281,3) size 40x16 - text run at (281,3) width 40: "style" - LayoutText {#text} at (321,0) size 59x19 - text run at (321,0) width 59: " attribute." -layer at (8,249) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,241) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/length_units-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/length_units-expected.png deleted file mode 100644 index 88cfcd4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/length_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/length_units-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/length_units-expected.txt deleted file mode 100644 index a8965ee..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/length_units-expected.txt +++ /dev/null
@@ -1,173 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1673 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1673 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1673 - LayoutBlockFlow {BODY} at (8,8) size 769x1657 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 624x176 - text run at (0,0) width 184: ".zero {margin-left: 0;}" - text run at (184,0) width 0: " " - text run at (0,16) width 192: ".one {margin-left: 3em;}" - text run at (192,16) width 0: " " - text run at (0,32) width 192: ".two {margin-left: 3ex;}" - text run at (192,32) width 0: " " - text run at (0,48) width 216: ".three {margin-left: 36px;}" - text run at (216,48) width 0: " " - text run at (0,64) width 216: ".four {margin-left: 0.5in;}" - text run at (216,64) width 0: " " - text run at (0,80) width 224: ".five {margin-left: 1.27cm;}" - text run at (224,80) width 0: " " - text run at (0,96) width 216: ".six {margin-left: 12.7mm;}" - text run at (216,96) width 0: " " - text run at (0,112) width 216: ".seven {margin-left: 36pt;}" - text run at (216,112) width 0: " " - text run at (0,128) width 208: ".eight {margin-left: 3pc;}" - text run at (208,128) width 0: " " - text run at (0,144) width 208: ".nine {margin-left: +3pc;}" - text run at (208,144) width 0: " " - text run at (0,160) width 624: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}" - text run at (624,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x40 - LayoutText {#text} at (0,0) size 761x39 - text run at (0,0) width 761: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges" - text run at (0,20) width 347: "should therefore be appropriately shifted to the right of " - LayoutInline {EM} at (0,0) size 22x19 - LayoutText {#text} at (347,20) size 22x19 - text run at (347,20) width 22: "this" - LayoutText {#text} at (369,20) size 138x19 - text run at (369,20) width 138: " paragraph's left edge." - LayoutBlockFlow {P} at (48,299) size 721x20 - LayoutText {#text} at (0,0) size 310x19 - text run at (0,0) width 310: "This paragraph should have a left margin of 3em." - LayoutBlockFlow {P} at (21,335) size 748x20 - LayoutText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "This paragraph should have a left margin of 3ex." - LayoutBlockFlow {P} at (36,371) size 733x20 - LayoutText {#text} at (0,0) size 340x19 - text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels." - LayoutBlockFlow {P} at (48,407) size 721x20 - LayoutText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This paragraph should have a left margin of half an inch." - LayoutBlockFlow {P} at (48,443) size 721x20 - LayoutText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm." - LayoutBlockFlow {P} at (48,479) size 721x20 - LayoutText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm." - LayoutBlockFlow {P} at (48,515) size 721x20 - LayoutText {#text} at (0,0) size 341x19 - text run at (0,0) width 341: "This paragraph should have a left margin of 36 points." - LayoutBlockFlow {P} at (48,551) size 721x20 - LayoutText {#text} at (0,0) size 327x19 - text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas." - LayoutBlockFlow {P} at (48,587) size 721x20 - LayoutText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - LayoutBlockFlow {P} at (0,647) size 769x240 [bgcolor=#00FFFF] [border: none (18px solid #800080)] - LayoutText {#text} at (18,1) size 310x46 - text run at (18,1) width 310: "This element has a " - LayoutInline {CODE} at (0,0) size 216x42 - LayoutText {#text} at (328,6) size 216x42 - text run at (328,6) width 216: "font-size" - LayoutText {#text} at (544,1) size 53x46 - text run at (544,1) width 53: " of " - LayoutInline {CODE} at (0,0) size 96x42 - LayoutText {#text} at (597,6) size 96x42 - text run at (597,6) width 96: "40px" - LayoutText {#text} at (693,1) size 743x94 - text run at (693,1) width 68: " and" - text run at (18,49) width 28: "a " - LayoutInline {CODE} at (0,0) size 264x42 - LayoutText {#text} at (46,54) size 264x42 - text run at (46,54) width 264: "border-left" - LayoutText {#text} at (310,49) size 53x46 - text run at (310,49) width 53: " of " - LayoutInline {CODE} at (0,0) size 384x42 - LayoutText {#text} at (363,54) size 384x42 - text run at (363,54) width 384: "1ex solid purple" - LayoutText {#text} at (747,49) size 739x190 - text run at (747,49) width 10: "." - text run at (18,97) width 673: "This should make the left border the same" - text run at (18,145) width 711: "number of pixels as the lower-case 'x' in this" - text run at (18,193) width 611: "element's font, as well as solid purple." - LayoutTable {TABLE} at (0,927) size 769x730 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x728 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x700 - LayoutTableCell {TD} at (0,364) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x700 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 721x39 - text run at (0,0) width 721: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)" - text run at (0,20) width 387: "edges should therefore be appropriately shifted to the right of " - LayoutInline {EM} at (0,0) size 22x19 - LayoutText {#text} at (387,20) size 22x19 - text run at (387,20) width 22: "this" - LayoutText {#text} at (409,20) size 138x19 - text run at (409,20) width 138: " paragraph's left edge." - LayoutBlockFlow {P} at (52,60) size 699x20 - LayoutText {#text} at (0,0) size 310x19 - text run at (0,0) width 310: "This paragraph should have a left margin of 3em." - LayoutBlockFlow {P} at (25,96) size 726x20 - LayoutText {#text} at (0,0) size 306x19 - text run at (0,0) width 306: "This paragraph should have a left margin of 3ex." - LayoutBlockFlow {P} at (40,132) size 711x20 - LayoutText {#text} at (0,0) size 340x19 - text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels." - LayoutBlockFlow {P} at (52,168) size 699x20 - LayoutText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This paragraph should have a left margin of half an inch." - LayoutBlockFlow {P} at (52,204) size 699x20 - LayoutText {#text} at (0,0) size 330x19 - text run at (0,0) width 330: "This paragraph should have a left margin of 1.27cm." - LayoutBlockFlow {P} at (52,240) size 699x20 - LayoutText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "This paragraph should have a left margin of 12.7mm." - LayoutBlockFlow {P} at (52,276) size 699x20 - LayoutText {#text} at (0,0) size 341x19 - text run at (0,0) width 341: "This paragraph should have a left margin of 36 points." - LayoutBlockFlow {P} at (52,312) size 699x20 - LayoutText {#text} at (0,0) size 327x19 - text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas." - LayoutBlockFlow {P} at (52,348) size 699x20 - LayoutText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - LayoutBlockFlow {P} at (4,408) size 747x288 [bgcolor=#00FFFF] [border: none (18px solid #800080)] - LayoutText {#text} at (18,1) size 310x46 - text run at (18,1) width 310: "This element has a " - LayoutInline {CODE} at (0,0) size 216x42 - LayoutText {#text} at (328,6) size 216x42 - text run at (328,6) width 216: "font-size" - LayoutText {#text} at (544,1) size 53x46 - text run at (544,1) width 53: " of " - LayoutInline {CODE} at (0,0) size 96x42 - LayoutText {#text} at (597,6) size 96x42 - text run at (597,6) width 96: "40px" - LayoutText {#text} at (18,49) size 96x46 - text run at (18,49) width 96: "and a " - LayoutInline {CODE} at (0,0) size 264x42 - LayoutText {#text} at (114,54) size 264x42 - text run at (114,54) width 264: "border-left" - LayoutText {#text} at (378,49) size 53x46 - text run at (378,49) width 53: " of " - LayoutInline {CODE} at (0,0) size 629x90 - LayoutText {#text} at (431,54) size 629x90 - text run at (431,54) width 216: "1ex solid" - text run at (18,102) width 144: "purple" - LayoutText {#text} at (162,97) size 710x190 - text run at (162,97) width 20: ". " - text run at (182,97) width 521: "This should make the left border" - text run at (18,145) width 710: "the same number of pixels as the lower-case" - text run at (18,193) width 642: "'x' in this element's font, as well as solid" - text run at (18,241) width 112: "purple." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/percentage_units-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/percentage_units-expected.png deleted file mode 100644 index 5f2ae23..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/percentage_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/percentage_units-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/percentage_units-expected.txt deleted file mode 100644 index c629852..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/percentage_units-expected.txt +++ /dev/null
@@ -1,67 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 601 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x601 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x601 - LayoutBlockFlow {BODY} at (8,8) size 769x585 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x80 - LayoutText {#text} at (0,0) size 504x80 - text run at (0,0) width 224: ".zero { background: yellow }" - text run at (224,0) width 0: " " - text run at (0,16) width 504: ".one { margin-left: 25%; margin-right: 25%; background: white }" - text run at (504,16) width 0: " " - text run at (0,32) width 496: ".two { margin-left: 50%; margin-right: 0%; background: white }" - text run at (496,32) width 0: " " - text run at (0,48) width 208: ".three {margin-left: 25%;}" - text run at (208,48) width 0: " " - text run at (0,64) width 0: " " - LayoutBlockFlow {DIV} at (0,147) size 769x136 [bgcolor=#FFFF00] - LayoutBlockFlow {DIV} at (192.25,0) size 384.50x60 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 384.50x60 - LayoutText {#text} at (0,0) size 326x59 - text run at (0,0) width 326: "This paragraph should be centered within its yellow" - text run at (0,20) width 323: "containing block and its width should be half of the" - text run at (0,40) width 109: "containing block." - LayoutBlockFlow {DIV} at (384.50,76) size 384.50x60 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 384.50x60 - LayoutText {#text} at (0,0) size 353x59 - text run at (0,0) width 353: "This paragraph should be right-aligned within its yellow" - text run at (0,20) width 323: "containing block and its width should be half of the" - text run at (0,40) width 109: "containing block." - LayoutBlockFlow {P} at (192.25,299) size 576.75x40 - LayoutText {#text} at (0,0) size 549x39 - text run at (0,0) width 549: "This paragraph should have a left margin of 25% the width of its parent element, which" - text run at (0,20) width 356: "should require some extra text in order to test effectively." - LayoutTable {TABLE} at (0,355) size 769x230 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x228 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x200 - LayoutTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {DIV} at (4,4) size 747x136 [bgcolor=#FFFF00] - LayoutBlockFlow {DIV} at (186.75,0) size 373.50x60 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 373.50x60 - LayoutText {#text} at (0,0) size 326x59 - text run at (0,0) width 326: "This paragraph should be centered within its yellow" - text run at (0,20) width 323: "containing block and its width should be half of the" - text run at (0,40) width 109: "containing block." - LayoutBlockFlow {DIV} at (373.50,76) size 373.50x60 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 373.50x60 - LayoutText {#text} at (0,0) size 353x59 - text run at (0,0) width 353: "This paragraph should be right-aligned within its yellow" - text run at (0,20) width 323: "containing block and its width should be half of the" - text run at (0,40) width 109: "containing block." - LayoutBlockFlow {P} at (190.75,156) size 560.25x40 - LayoutText {#text} at (0,0) size 549x39 - text run at (0,0) width 549: "This paragraph should have a left margin of 25% the width of its parent element, which" - text run at (0,20) width 356: "should require some extra text in order to test effectively." -layer at (8,137) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/urls-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/urls-expected.png deleted file mode 100644 index 6c22c11..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/urls-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/urls-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/urls-expected.txt deleted file mode 100644 index 1c05dc9..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/css1/units/urls-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 355x19 - text run at (0,0) width 355: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 648x64 - text run at (0,0) width 648: "<LINK rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../resources/bg.gif\">" - text run at (648,0) width 0: " " - text run at (0,16) width 296: "@import url(../resources/sec642.css);" - text run at (296,16) width 0: " " - text run at (0,32) width 352: "BODY {background: url(../resources/bg.gif);}" - text run at (352,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 - LayoutText {#text} at (0,0) size 386x19 - text run at (0,0) width 386: "This page should have a green grid pattern as its background." - LayoutBlockFlow {P} at (0,167) size 784x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 779x59 - text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (620,0) width 159: "If an image, in this case a" - text run at (0,20) width 756: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,40) width 274: "document's URL, not the stylesheet's URL." - LayoutBlockFlow {P} at (0,243) size 784x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 779x59 - text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (620,0) width 159: "If an image, in this case a" - text run at (0,20) width 756: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,40) width 274: "document's URL, not the stylesheet's URL." - LayoutTable {TABLE} at (0,319) size 784x210 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x208 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x19 - LayoutText {#text} at (4,4) size 161x19 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x180 - LayoutTableCell {TD} at (0,104) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x180 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 - LayoutText {#text} at (0,0) size 386x19 - text run at (0,0) width 386: "This page should have a green grid pattern as its background." - LayoutBlockFlow {P} at (4,40) size 762x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 759x59 - text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (620,0) width 117: "If an image, in this" - text run at (0,20) width 759: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" - text run at (0,40) width 313: "to the document's URL, not the stylesheet's URL." - LayoutBlockFlow {P} at (4,116) size 762x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 759x59 - text run at (0,0) width 620: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (620,0) width 117: "If an image, in this" - text run at (0,20) width 759: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation" - text run at (0,40) width 313: "to the document's URL, not the stylesheet's URL." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/018-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/018-expected.png deleted file mode 100644 index f280ad41..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/018-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/023-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/023-expected.png deleted file mode 100644 index 1030ac3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/023-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/040-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/040-expected.png deleted file mode 100644 index 4b9c6716..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/040-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png deleted file mode 100644 index fbd974e93..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png deleted file mode 100644 index cdaf87f5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png deleted file mode 100644 index e4f3178..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png deleted file mode 100644 index 15310455..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png deleted file mode 100644 index bb1b60a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png deleted file mode 100644 index a1c79e4..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png deleted file mode 100644 index 7a8ffcfa..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 0ccb774..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png deleted file mode 100644 index ea7452f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-expected.png deleted file mode 100644 index a0c502e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png deleted file mode 100644 index c39a02a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png deleted file mode 100644 index f22c2a2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png deleted file mode 100644 index 9195dc3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png deleted file mode 100644 index 8cb863b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 5d23144..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png deleted file mode 100644 index 961d05c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png deleted file mode 100644 index 078e822..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png deleted file mode 100644 index 78d20b8..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png deleted file mode 100644 index 766d2dc0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png deleted file mode 100644 index c99b42d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png deleted file mode 100644 index c99b42d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png deleted file mode 100644 index 690b06a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png deleted file mode 100644 index 718169d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png deleted file mode 100644 index cd888c5d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png deleted file mode 100644 index 7ec152e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png deleted file mode 100644 index 156feef..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png deleted file mode 100644 index a082f03..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png deleted file mode 100644 index 1ac8174..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 9bac91f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png deleted file mode 100644 index 1e9dd9d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-expected.png deleted file mode 100644 index a7ba12e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png deleted file mode 100644 index c447521e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png deleted file mode 100644 index 023fefa..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png deleted file mode 100644 index c41a5eb..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png deleted file mode 100644 index be7d730..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png deleted file mode 100644 index caf2312..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png deleted file mode 100644 index 22a53e9..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png deleted file mode 100644 index 6805b78..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png deleted file mode 100644 index a898578..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png deleted file mode 100644 index c5ec366..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png deleted file mode 100644 index e29da8f6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png deleted file mode 100644 index 6a55218c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png deleted file mode 100644 index 639d965..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png deleted file mode 100644 index 695a85f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png deleted file mode 100644 index 0de6ddd..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png deleted file mode 100644 index b69d8ae..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png deleted file mode 100644 index 11f55d96..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png deleted file mode 100644 index 13746729..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png deleted file mode 100644 index fbda3b0..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png deleted file mode 100644 index 7d566680..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/003-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/003-expected.png deleted file mode 100644 index 6a82258..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/003-vertical-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/003-vertical-expected.png deleted file mode 100644 index 09c54a1..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/003-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png deleted file mode 100644 index eb2d9b8..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png deleted file mode 100644 index 0731a155..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png deleted file mode 100644 index 566b399..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png deleted file mode 100644 index 4d9f66c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png deleted file mode 100644 index 84a6dc5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png deleted file mode 100644 index ba5d5b7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png deleted file mode 100644 index 065664f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/edge-offsets-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/edge-offsets-expected.png deleted file mode 100644 index 52485a5..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/edge-offsets-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/empty-cells-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/empty-cells-expected.png deleted file mode 100644 index 8d98f0a..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/empty-cells-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png deleted file mode 100644 index 9e039c7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png deleted file mode 100644 index 27cc952..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/form-with-table-style-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/form-with-table-style-expected.png deleted file mode 100644 index 261d30d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/form-with-table-style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/frame-and-rules-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/frame-and-rules-expected.png deleted file mode 100644 index de5f502f..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/frame-and-rules-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/generated-caption-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/generated-caption-expected.png deleted file mode 100644 index 30e4ae1..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/generated-caption-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png deleted file mode 100644 index ba980ff..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png deleted file mode 100644 index 23f81c3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png deleted file mode 100644 index 23f81c3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png deleted file mode 100644 index 90f0dab..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png deleted file mode 100644 index d608e89..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/row-height-recalc-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/row-height-recalc-expected.png deleted file mode 100644 index d9fb4f7..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/row-height-recalc-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png deleted file mode 100644 index 060f187..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png deleted file mode 100644 index 72fbff1e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png deleted file mode 100644 index 2eed1a2..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/tbody-background-image-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/tbody-background-image-expected.png deleted file mode 100644 index 5c16b77..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/tbody-background-image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png deleted file mode 100644 index a67c52e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/text-field-baseline-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/text-field-baseline-expected.png deleted file mode 100644 index d82700c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/fast/table/text-field-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/images/gif-animated-partial-load-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/images/gif-animated-partial-load-expected.png deleted file mode 100644 index 92dcd244..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/images/gif-animated-partial-load-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png deleted file mode 100644 index 6558104..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/acid2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/acid2-expected.png deleted file mode 100644 index 6f47393..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/acid2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/acid3-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/acid3-expected.png deleted file mode 100644 index c713ea3..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/acid3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/iframe404-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/iframe404-expected.png deleted file mode 100644 index 6ee4f86d..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/iframe404-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt deleted file mode 100644 index 66c4848..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,8) size 304x154 - LayoutIFrame {IFRAME} at (0,0) size 304x154 [border: (2px inset #EEEEEE)] - layer at (0,0) size 300x150 - LayoutView at (0,0) size 300x150 - layer at (0,0) size 300x150 - LayoutBlockFlow {HTML} at (0,0) size 300x150 - LayoutBlockFlow {BODY} at (8,8) size 284x134 - LayoutText {#text} at (0,0) size 71x19 - text run at (0,0) width 71: "SUCCESS"
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png deleted file mode 100644 index df91e1c..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt deleted file mode 100644 index 174f4ef..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt +++ /dev/null
@@ -1,66 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x462 - LayoutBlockFlow {HTML} at (0,0) size 800x461.50 - LayoutBlockFlow {BODY} at (4,4) size 136x449 [border: (0.50px dashed #C0C0C0)] - LayoutBlockFlow {P} at (0.50,9.50) size 135x27 - LayoutText {#text} at (0,-2) size 135x30 - text run at (0,-2) width 135: "The following six blue boxes must" - text run at (0,7) width 126: "be of the same width. There must" - text run at (0,16) width 37: "be no red." - LayoutBlockFlow {P} at (9.50,45.50) size 117x27 [bgcolor=#008000] [border: (9px solid #0000FF)] - LayoutText {#text} at (9,7) size 2x12 - text run at (9,7) width 2: " " - LayoutBlockFlow {P} at (0.50,126.50) size 135x9 - LayoutText {#text} at (0,-2) size 12x12 - text run at (0,-2) width 12: " " - LayoutBlockFlow {P} at (0.50,189.50) size 135x9 - LayoutTable (anonymous) at (0.50,252.50) size 135x44 - LayoutTableSection (anonymous) at (0,0) size 135x44 - LayoutTableRow (anonymous) at (0,0) size 135x44 - LayoutTableCell {P} at (0,0) size 135x43.75 [r=0 c=0 rs=1 cs=1] - LayoutTable {TABLE} at (0.50,350.50) size 135x44 - LayoutTableSection {TBODY} at (0,0) size 135x44 - LayoutTableRow {TR} at (0,0) size 135x44 - LayoutTableCell {TD} at (0,0) size 135x43.75 [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow (floating) {P} at (0.50,448.50) size 135x9 -layer at (14,131) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,194) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,257) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,355) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,453) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png deleted file mode 100644 index cabe47b..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt deleted file mode 100644 index a25991d6..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x56 - LayoutBlockFlow {HTML} at (0,0) size 800x56 - LayoutBlockFlow {BODY} at (8,8) size 784x40 - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This tests slow loading png images referenced from a image element inside a SVG pattern resource." - LayoutBR {BR} at (627,0) size 0x19 - LayoutText {#text} at (0,20) size 562x19 - text run at (0,20) width 562: "You should see a 400x300 rect containing a tiled rendering of the Acid3 reference image." -layer at (10,50) size 406x306 clip at (13,53) size 400x300 - LayoutSVGRoot (positioned) {svg} at (10,50) size 406x306 - LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 - LayoutSVGResourcePattern {pattern} [id="pattern"] [patternUnits=userSpaceOnUse] [patternContentUnits=userSpaceOnUse] - LayoutSVGImage {image} at (0,0) size 800x600 - LayoutSVGRect {rect} at (0,0) size 400x300 [fill={[type=PATTERN] [id="pattern"]}] [x=0.00] [y=0.00] [width=400.00] [height=300.00]
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/uri/css-href-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/uri/css-href-expected.png deleted file mode 100644 index 10f5fb8..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/uri/css-href-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png b/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png deleted file mode 100644 index ac1d868e..0000000 --- a/third_party/blink/web_tests/platform/linux/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/comments-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/comments-expected.png deleted file mode 100644 index 69059f5b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/comments-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/containment-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/containment-expected.png deleted file mode 100644 index 5711471..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/containment-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png deleted file mode 100644 index 332a918..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/grouping-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/grouping-expected.png deleted file mode 100644 index 4f4526d..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/grouping-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/id_as_selector-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/id_as_selector-expected.png deleted file mode 100644 index d0e2b37..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/id_as_selector-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/inheritance-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/inheritance-expected.png deleted file mode 100644 index 22b6457..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/basic/inheritance-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border-expected.png deleted file mode 100644 index a18edef3..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png deleted file mode 100644 index 8c97e28..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png deleted file mode 100644 index 6d5c804..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png deleted file mode 100644 index b49ed61..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png deleted file mode 100644 index 4342308..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_color-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_color-expected.png deleted file mode 100644 index 03354a5..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png deleted file mode 100644 index 557e5fa..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_inline-expected.png deleted file mode 100644 index 523936b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left-expected.png deleted file mode 100644 index 40e2c01..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png deleted file mode 100644 index a3aaeaa..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png deleted file mode 100644 index 57e649a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png deleted file mode 100644 index 83cb014..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right-expected.png deleted file mode 100644 index 247ed16a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png deleted file mode 100644 index 7950501..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png deleted file mode 100644 index 9ca89fd..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png deleted file mode 100644 index 49d4a38..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_style-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_style-expected.png deleted file mode 100644 index cec66f2..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png deleted file mode 100644 index 3c44236..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top-expected.png deleted file mode 100644 index b4367933..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png deleted file mode 100644 index e6f6d80..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png deleted file mode 100644 index 4f269ce..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png deleted file mode 100644 index 82fa8e2..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_width-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_width-expected.png deleted file mode 100644 index 91f7f83..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png deleted file mode 100644 index 60a896f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/clear-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/clear-expected.png deleted file mode 100644 index 286c6ef..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/clear-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/clear_float-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/clear_float-expected.png deleted file mode 100644 index c9a420e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/clear_float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float-expected.png deleted file mode 100644 index b626d1c..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png deleted file mode 100644 index 8e1a3f39..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float_margin-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float_margin-expected.png deleted file mode 100644 index b0c898b1..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/float_margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/height-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/height-expected.png deleted file mode 100644 index 7c577da..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin-expected.png deleted file mode 100644 index bbd0dcd..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png deleted file mode 100644 index 80e86c11..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png deleted file mode 100644 index 4bed312..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png deleted file mode 100644 index cc35b47..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_left-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_left-expected.png deleted file mode 100644 index 68312529..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png deleted file mode 100644 index 9cf2635..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_right-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_right-expected.png deleted file mode 100644 index f3bd879..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png deleted file mode 100644 index 4e3768f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_top-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_top-expected.png deleted file mode 100644 index 70f6e9c6..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png deleted file mode 100644 index f7e1ec0f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding-expected.png deleted file mode 100644 index 0af2932..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png deleted file mode 100644 index 6f8b3176..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png deleted file mode 100644 index 37ff2d1..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png deleted file mode 100644 index 1d75b80..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_left-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_left-expected.png deleted file mode 100644 index 32baba0..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png deleted file mode 100644 index 57edf69..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_right-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_right-expected.png deleted file mode 100644 index 87a7dcfe..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png deleted file mode 100644 index 374781c..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_top-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_top-expected.png deleted file mode 100644 index 23ae134..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png deleted file mode 100644 index 356f3ef..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/width-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/width-expected.png deleted file mode 100644 index 41072bb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/box_properties/width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/cascade/cascade_order-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/cascade/cascade_order-expected.png deleted file mode 100644 index 7a9c602..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/cascade/cascade_order-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/cascade/important-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/cascade/important-expected.png deleted file mode 100644 index eabc354..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/cascade/important-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/display-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/display-expected.png deleted file mode 100644 index 725d0d5..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style-expected.png deleted file mode 100644 index 0d38fcb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_image-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_image-expected.png deleted file mode 100644 index c362ac5..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_position-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_position-expected.png deleted file mode 100644 index 81130c79a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_type-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_type-expected.png deleted file mode 100644 index e4a958e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/list_style_type-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/white_space-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/white_space-expected.png deleted file mode 100644 index 537fa16..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/classification/white_space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background-expected.png deleted file mode 100644 index f0a7048d..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_color-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_color-expected.png deleted file mode 100644 index dff0515..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_image-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_image-expected.png deleted file mode 100644 index a16a9c41..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png deleted file mode 100644 index 26e2550..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/color-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/color-expected.png deleted file mode 100644 index 1ad1a880..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/color_and_background/color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png deleted file mode 100644 index 9bbc7ca..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_family-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_family-expected.png deleted file mode 100644 index e5a719c..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_family-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_size-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_size-expected.png deleted file mode 100644 index bcd4949..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_size-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_style-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_style-expected.png deleted file mode 100644 index aa7abec..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_variant-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_variant-expected.png deleted file mode 100644 index 778bc93..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_variant-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_weight-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_weight-expected.png deleted file mode 100644 index 2903922..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/font_properties/font_weight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png deleted file mode 100644 index d8e43160..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png deleted file mode 100644 index a8c58bb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png deleted file mode 100644 index 81df0a3e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png deleted file mode 100644 index cdd236d..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png deleted file mode 100644 index d2915a12..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/anchor-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/anchor-expected.png deleted file mode 100644 index 1d27ef9..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/anchor-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/firstletter-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/firstletter-expected.png deleted file mode 100644 index 9e93849..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/firstletter-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/firstline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/firstline-expected.png deleted file mode 100644 index 3f71d27..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/firstline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png deleted file mode 100644 index ade7475d..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png deleted file mode 100644 index c5adb610..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png deleted file mode 100644 index c8f9e6f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/line_height-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/line_height-expected.png deleted file mode 100644 index 4fce89f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/line_height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_align-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_align-expected.png deleted file mode 100644 index 0445289..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png deleted file mode 100644 index 4acdd32..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_indent-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_indent-expected.png deleted file mode 100644 index 1107330..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_indent-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_transform-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_transform-expected.png deleted file mode 100644 index 94b8c15..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/text_transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png deleted file mode 100644 index 720ee85..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png deleted file mode 100644 index 27f8304..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/color_units-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/color_units-expected.png deleted file mode 100644 index c8b12cb1..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/color_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/length_units-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/length_units-expected.png deleted file mode 100644 index eb7eb7d7..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/length_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/percentage_units-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/percentage_units-expected.png deleted file mode 100644 index e209082..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/css1/units/percentage_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/append-cells2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/append-cells2-expected.png deleted file mode 100644 index a4c70c6..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/append-cells2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png deleted file mode 100644 index 45f5412..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png deleted file mode 100644 index 2819e654..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png deleted file mode 100644 index f2b675fa..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png deleted file mode 100644 index bc6f804..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png deleted file mode 100644 index d026c6a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 74b9ac9..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png deleted file mode 100644 index 83d680fd..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-expected.png deleted file mode 100644 index c915a82..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png deleted file mode 100644 index 359367b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png deleted file mode 100644 index 220aae3..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png deleted file mode 100644 index 900f398..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png deleted file mode 100644 index 1d3c41b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png deleted file mode 100644 index ca92ef7..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png deleted file mode 100644 index 0c20598..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png deleted file mode 100644 index acc446e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png deleted file mode 100644 index b40eefd2..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png deleted file mode 100644 index b25acb94..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png deleted file mode 100644 index ff55c0f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png deleted file mode 100644 index f7f327d..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png deleted file mode 100644 index 620e750..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png deleted file mode 100644 index b0bac94..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png deleted file mode 100644 index d5a4ffb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png deleted file mode 100644 index 5108976..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-expected.png deleted file mode 100644 index b47f580a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png deleted file mode 100644 index 94be796..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png deleted file mode 100644 index 1b92951..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 22cd10e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png deleted file mode 100644 index 52d8a31..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png deleted file mode 100644 index 7087db0..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png deleted file mode 100644 index aaaa91b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png deleted file mode 100644 index dbca6e8..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png deleted file mode 100644 index b1a9094b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png deleted file mode 100644 index 43de34ec..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 8be5670..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png deleted file mode 100644 index 11cc531..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png deleted file mode 100644 index 069c808..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png deleted file mode 100644 index 9e05e0b..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png deleted file mode 100644 index 3492601..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 26b15e7..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png deleted file mode 100644 index 21f6f9f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png deleted file mode 100644 index 8f3b9fd..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png deleted file mode 100644 index 62948c4..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png deleted file mode 100644 index 0573026..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png deleted file mode 100644 index 6fa0310..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/text-field-baseline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/text-field-baseline-expected.png deleted file mode 100644 index 027b5ed..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/fast/table/text-field-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png deleted file mode 100644 index 32c6fe8..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt deleted file mode 100644 index b74c08a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x188 - LayoutBlockFlow {HTML} at (0,0) size 800x188 - LayoutBlockFlow {BODY} at (8,8) size 784x170 - LayoutBlockFlow {DIV} at (0,0) size 102x102 [border: (1px solid #000000)] - LayoutBlockFlow {FORM} at (0,152) size 784x18 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutFileUploadControl {INPUT} at (0,0) size 212x18 "hello.txt" - LayoutButton {INPUT} at (0,0) size 75.22x18 [bgcolor=#FFFFFF] - LayoutBlockFlow (anonymous) at (8,2) size 59.22x13 - LayoutText {#text} at (0,0) size 60x13 - text run at (0,0) width 60: "Choose File" - LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png b/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png deleted file mode 100644 index b212504..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.10/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/css1/box_properties/acid_test-expected.png deleted file mode 100644 index e5ca7bd..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/css1/box_properties/acid_test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/append-cells2-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/append-cells2-expected.png deleted file mode 100644 index e4dc8ed..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/append-cells2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png deleted file mode 100644 index 920feef..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png deleted file mode 100644 index 2911fde..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png deleted file mode 100644 index d4dbb3a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png deleted file mode 100644 index 447bab4..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png deleted file mode 100644 index 295e0edb..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png deleted file mode 100644 index ee32c15..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png deleted file mode 100644 index 4a9a9978..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-expected.png deleted file mode 100644 index 7db1eb7..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png deleted file mode 100644 index 70db2837..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png deleted file mode 100644 index 7751a071..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png deleted file mode 100644 index 8bd53e49..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png deleted file mode 100644 index 3295c15..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 958b58ac..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png deleted file mode 100644 index 8a06bda..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png deleted file mode 100644 index 582df7a2..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png deleted file mode 100644 index b8d69473..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png deleted file mode 100644 index aeac641c..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png deleted file mode 100644 index 16a6bea..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png deleted file mode 100644 index e2bdf84..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png deleted file mode 100644 index 8b707a359..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png deleted file mode 100644 index 87f8e12..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png deleted file mode 100644 index d2f64e0..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png deleted file mode 100644 index 851b1b2..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-expected.png deleted file mode 100644 index acde20d9..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png deleted file mode 100644 index 5a39875..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png deleted file mode 100644 index 77c1382f..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 9660d61..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png deleted file mode 100644 index fbfaef2..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png deleted file mode 100644 index f1039f17..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png deleted file mode 100644 index 4531a9e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png deleted file mode 100644 index 1056cadc..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png deleted file mode 100644 index 3a10483..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png deleted file mode 100644 index bb2f726c..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 5bfec7a..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png deleted file mode 100644 index e49382c9..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png deleted file mode 100644 index c920e63..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png deleted file mode 100644 index 6b941d4..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png deleted file mode 100644 index 9ef2467..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 5228186..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png deleted file mode 100644 index 304b2a5e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png deleted file mode 100644 index 3a976f7..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png deleted file mode 100644 index 1f54639..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/text-field-baseline-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/text-field-baseline-expected.png deleted file mode 100644 index cfb0e34..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/fast/table/text-field-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png deleted file mode 100644 index b6069d3..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt deleted file mode 100644 index 7f3a501..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x188 - LayoutBlockFlow {HTML} at (0,0) size 800x188 - LayoutBlockFlow {BODY} at (8,8) size 784x170 - LayoutBlockFlow {DIV} at (0,0) size 102x102 [border: (1px solid #000000)] - LayoutBlockFlow {FORM} at (0,152) size 784x18 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutFileUploadControl {INPUT} at (0,0) size 236x18 "hello.txt" - LayoutButton {INPUT} at (0,0) size 76.61x18 [bgcolor=#FFFFFF] - LayoutBlockFlow (anonymous) at (8,2) size 60.61x13 - LayoutText {#text} at (0,0) size 61x13 - text run at (0,0) width 61: "Choose File" - LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png deleted file mode 100644 index 20c1f44..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt deleted file mode 100644 index 9dc59f4e..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x170 - LayoutBlockFlow {HTML} at (0,0) size 800x170 - LayoutBlockFlow {BODY} at (8,8) size 784x154 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,8) size 300x150 - LayoutVideo {VIDEO} at (0,0) size 300x150 -layer at (8,8) size 300x150 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150 - LayoutBlockFlow {DIV} at (0,118) size 300x32 -layer at (8,8) size 300x108 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108 -layer at (8,126) size 300x32 scrollHeight 40 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA] - LayoutButton {INPUT} at (0,0) size 32x32 - LayoutFlexibleBox {DIV} at (32,0) size 23.36x32 [color=#5A5A5A] - LayoutBlockFlow (anonymous) at (0,0) size 23.36x32 - LayoutText {#text} at (0,9) size 24x14 - text run at (0,9) width 24: "0:07" - LayoutFlexibleBox {DIV} at (55.36,0) size 34.69x32 [color=#5A5A5A] - LayoutBlockFlow (anonymous) at (4,0) size 30.69x32 - LayoutText {#text} at (0,9) size 31x14 - text run at (0,9) width 31: "/ 0:07" - LayoutSlider {INPUT} at (108.05,15) size 80.95x2 - LayoutFlexibleBox {DIV} at (0,0) size 80.95x2 - LayoutBlockFlow {DIV} at (-18,-23) size 116.95x48 - LayoutBlockFlow {DIV} at (80.95,0) size 36x48 - LayoutButton {INPUT} at (207,0) size 32x32 - LayoutSlider {INPUT} at (257,15) size 25x2 - LayoutFlexibleBox {DIV} at (0,0) size 25x2 - LayoutBlockFlow {DIV} at (-18,-23) size 61x48 - LayoutBlockFlow {DIV} at (25,0) size 36x48
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/misc/bad-charset-alias-expected.txt b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/misc/bad-charset-alias-expected.txt deleted file mode 100644 index 88c213f6..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/misc/bad-charset-alias-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -Test that iso-8859-1 aliases that aren't known to Firefox and IE aren't supported (we should fall back to parent frame charset). - -SUCCESS - -
diff --git a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png b/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png deleted file mode 100644 index 78a716d..0000000 --- a/third_party/blink/web_tests/platform/mac-mac10.11/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/css1/box_properties/acid_test-expected.png deleted file mode 100644 index 8b88651..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/css1/box_properties/acid_test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png deleted file mode 100644 index 920feef..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png deleted file mode 100644 index 2911fde..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png deleted file mode 100644 index d4dbb3a..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png deleted file mode 100644 index 447bab4..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png deleted file mode 100644 index ee32c15..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png deleted file mode 100644 index 4a9a9978..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-expected.png deleted file mode 100644 index 7db1eb7..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png deleted file mode 100644 index 70db2837..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png deleted file mode 100644 index 7751a071..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png deleted file mode 100644 index 8bd53e49..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png deleted file mode 100644 index 3295c15..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 958b58ac..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png deleted file mode 100644 index 8a06bda..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png deleted file mode 100644 index 582df7a2..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png deleted file mode 100644 index b8d69473..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png deleted file mode 100644 index aeac641c..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png deleted file mode 100644 index 16a6bea..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png deleted file mode 100644 index e2bdf84..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png deleted file mode 100644 index 8b707a359..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png deleted file mode 100644 index 87f8e12..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png deleted file mode 100644 index d2f64e0..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png deleted file mode 100644 index 851b1b2..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-expected.png deleted file mode 100644 index acde20d9..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png deleted file mode 100644 index 5a39875..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png deleted file mode 100644 index 77c1382f..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 9660d61..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png deleted file mode 100644 index fbfaef2..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png deleted file mode 100644 index f1039f17..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png deleted file mode 100644 index 4531a9e..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png deleted file mode 100644 index 1056cadc..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png deleted file mode 100644 index 3a10483..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png deleted file mode 100644 index bb2f726c..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 5bfec7a..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png deleted file mode 100644 index e49382c9..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png deleted file mode 100644 index c920e63..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png deleted file mode 100644 index 6b941d4..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png deleted file mode 100644 index 9ef2467..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 5228186..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png deleted file mode 100644 index 304b2a5e..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/text-field-baseline-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/text-field-baseline-expected.png deleted file mode 100644 index cfb0e34..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/fast/table/text-field-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png deleted file mode 100644 index 20c1f44..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt deleted file mode 100644 index 9dc59f4e..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x170 - LayoutBlockFlow {HTML} at (0,0) size 800x170 - LayoutBlockFlow {BODY} at (8,8) size 784x154 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,8) size 300x150 - LayoutVideo {VIDEO} at (0,0) size 300x150 -layer at (8,8) size 300x150 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150 - LayoutBlockFlow {DIV} at (0,118) size 300x32 -layer at (8,8) size 300x108 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108 -layer at (8,126) size 300x32 scrollHeight 40 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA] - LayoutButton {INPUT} at (0,0) size 32x32 - LayoutFlexibleBox {DIV} at (32,0) size 23.36x32 [color=#5A5A5A] - LayoutBlockFlow (anonymous) at (0,0) size 23.36x32 - LayoutText {#text} at (0,9) size 24x14 - text run at (0,9) width 24: "0:07" - LayoutFlexibleBox {DIV} at (55.36,0) size 34.69x32 [color=#5A5A5A] - LayoutBlockFlow (anonymous) at (4,0) size 30.69x32 - LayoutText {#text} at (0,9) size 31x14 - text run at (0,9) width 31: "/ 0:07" - LayoutSlider {INPUT} at (108.05,15) size 80.95x2 - LayoutFlexibleBox {DIV} at (0,0) size 80.95x2 - LayoutBlockFlow {DIV} at (-18,-23) size 116.95x48 - LayoutBlockFlow {DIV} at (80.95,0) size 36x48 - LayoutButton {INPUT} at (207,0) size 32x32 - LayoutSlider {INPUT} at (257,15) size 25x2 - LayoutFlexibleBox {DIV} at (0,0) size 25x2 - LayoutBlockFlow {DIV} at (-18,-23) size 61x48 - LayoutBlockFlow {DIV} at (25,0) size 36x48
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/misc/bad-charset-alias-expected.txt b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/misc/bad-charset-alias-expected.txt deleted file mode 100644 index 88c213f6..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/misc/bad-charset-alias-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -Test that iso-8859-1 aliases that aren't known to Firefox and IE aren't supported (we should fall back to parent frame charset). - -SUCCESS - -
diff --git a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png b/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png deleted file mode 100644 index 78a716d..0000000 --- a/third_party/blink/web_tests/platform/mac-retina/virtual/mojo-loading/http/tests/webfont/popup-menu-load-webfont-after-open-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/comments-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/comments-expected.png deleted file mode 100644 index 405ae64..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/comments-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/comments-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/comments-expected.txt deleted file mode 100644 index 77fa6843..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/comments-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 870 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x870 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x870 - LayoutBlockFlow {BODY} at (8,8) size 769x854 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x225 - LayoutText {#text} at (0,0) size 328x225 - text run at (0,0) width 227: "/* This is a CSS1 comment. */" - text run at (226,0) width 1: " " - text run at (0,15) width 328: ".one {color: green;} /* Another comment */" - text run at (327,15) width 1: " " - text run at (0,30) width 281: "/* The following should not be used:" - text run at (280,30) width 1: " " - text run at (0,45) width 164: ".two {color: red;} */" - text run at (163,45) width 1: " " - text run at (0,60) width 313: ".three {color: green; /* color: red; */}" - text run at (312,60) width 1: " " - text run at (0,75) width 24: "/**" - text run at (23,75) width 1: " " - text run at (0,90) width 172: ".four {color: red;} */" - text run at (171,90) width 1: " " - text run at (0,105) width 164: ".five {color: green;}" - text run at (163,105) width 1: " " - text run at (0,120) width 32: "/**/" - text run at (31,120) width 1: " " - text run at (0,135) width 157: ".six {color: green;}" - text run at (156,135) width 1: " " - text run at (0,150) width 86: "/*********/" - text run at (85,150) width 1: " " - text run at (0,165) width 172: ".seven {color: green;}" - text run at (171,165) width 1: " " - text run at (0,180) width 125: "/* a comment **/" - text run at (124,180) width 1: " " - text run at (0,195) width 172: ".eight {color: green;}" - text run at (171,195) width 1: " " - text run at (0,210) width 0: " " - LayoutBlockFlow {P} at (0,290) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,324) size 769x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (0,358) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,392) size 769x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (0,426) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,460) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,494) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,528) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutTable {TABLE} at (0,562) size 219x292 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 217x290 - LayoutTableRow {TR} at (0,0) size 217x26 - LayoutTableCell {TD} at (0,0) size 217x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 217x264 - LayoutTableCell {TD} at (0,145) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 205x264 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,38) size 197x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (4,72) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,106) size 197x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (4,140) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,174) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,208) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,242) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." -layer at (8,280) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,272) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/containment-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/containment-expected.png deleted file mode 100644 index 814a1024..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/containment-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/containment-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/containment-expected.txt deleted file mode 100644 index 50be7ab..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/containment-expected.txt +++ /dev/null
@@ -1,211 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 961 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x961 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x961 - LayoutBlockFlow {BODY} at (8,8) size 769x945 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x150 - LayoutText {#text} at (0,0) size 710x150 - text run at (0,0) width 609: "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"linktest.css\" title=\"Default SS\">" - text run at (608,0) width 1: " " - text run at (0,15) width 710: "<LINK rel=\"alternate stylesheet\" type=\"text/css\" href=\"linktest2.css\" title=\"Alternate SS\">" - text run at (709,15) width 1: " " - text run at (0,30) width 203: "@import url(imptest1.css);" - text run at (202,30) width 1: " " - text run at (0,45) width 188: "@import \"imptest1a.css\";" - text run at (187,45) width 1: " " - text run at (0,60) width 125: "UL {color: red;}" - text run at (124,60) width 1: " " - text run at (0,75) width 172: ".four {color: purple;}" - text run at (171,75) width 1: " " - text run at (0,90) width 203: "@import url(imptest2.css);" - text run at (202,90) width 1: " " - text run at (0,105) width 32: "<!--" - text run at (31,105) width 1: " " - text run at (0,120) width 164: "P.six {color: green;}" - text run at (163,120) width 1: " " - text run at (0,135) width 24: "-->" - text run at (23,135) width 1: " " - LayoutBlockFlow {P} at (0,215) size 769x18 - LayoutText {#text} at (0,0) size 412x18 - text run at (0,0) width 412: "This sentence should be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (411,2) size 95x15 - text run at (411,2) width 95: "linktest.css" - LayoutText {#text} at (505,0) size 258x18 - text run at (505,0) width 258: ", the reference to which is shown above." - LayoutBlockFlow {P} at (0,249) size 769x36 - LayoutText {#text} at (0,0) size 449x18 - text run at (0,0) width 449: "This sentence should NOT be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 103x15 - LayoutText {#text} at (448,2) size 103x15 - text run at (448,2) width 103: "linktest2.css" - LayoutText {#text} at (550,0) size 9x18 - text run at (550,0) width 9: ", " - LayoutInline {STRONG} at (0,0) size 42x18 - LayoutText {#text} at (558,0) size 42x18 - text run at (558,0) width 42: "unless" - LayoutText {#text} at (599,0) size 751x36 - text run at (599,0) width 152: " the external style sheet" - text run at (0,18) width 330: "\"Alternate SS\" has been selected via the user agent." - LayoutBlockFlow {UL} at (0,301) size 769x54 [color=#FF0000] - LayoutListItem {LI} at (40,0) size 729x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 398x18 - text run at (0,0) width 398: "This sentence should be green due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 204x15 - LayoutText {#text} at (397,2) size 204x15 - text run at (397,2) width 204: "@import url(imptest1.css);" - LayoutText {#text} at (600,0) size 10x18 - text run at (600,0) width 10: "]." - LayoutListItem {LI} at (40,18) size 729x18 [color=#800080] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 403x18 - text run at (0,0) width 403: "This sentence should be purple due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 180x15 - LayoutText {#text} at (403,2) size 180x15 - text run at (403,2) width 180: "@import \"imptest1a.css\"" - LayoutText {#text} at (582,0) size 10x18 - text run at (582,0) width 10: "]." - LayoutListItem {LI} at (40,36) size 729x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 399x18 - text run at (0,0) width 399: "This sentence should be green thanks to the STYLE attribute [" - LayoutInline {CODE} at (0,0) size 164x15 - LayoutText {#text} at (399,2) size 164x15 - text run at (399,2) width 164: "STYLE=\"color: green;\"" - LayoutText {#text} at (562,0) size 11x18 - text run at (562,0) width 11: "]." - LayoutBlockFlow {P} at (0,371) size 769x18 [color=#800080] - LayoutText {#text} at (0,0) size 510x18 - text run at (0,0) width 510: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - LayoutBlockFlow {OL} at (0,405) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "1" - LayoutText {#text} at (0,0) size 204x18 - text run at (0,0) width 204: "This list should NOT be purple." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "2" - LayoutText {#text} at (0,0) size 176x18 - text run at (0,0) width 176: "It should, instead, be black." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "3" - LayoutText {#text} at (0,0) size 512x18 - text run at (0,0) width 512: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - LayoutBlockFlow {P} at (0,475) size 769x36 - LayoutText {#text} at (0,0) size 714x18 - text run at (0,0) width 200: "This sentence should be black. " - text run at (199,0) width 515: "If it is red, then the browser has inappropriately imported the styles from the file" - LayoutInline {TT} at (0,0) size 94x15 - LayoutText {#text} at (0,20) size 94x15 - text run at (0,20) width 94: "imptest2.css" - LayoutText {#text} at (93,18) size 35x18 - text run at (93,18) width 35: " (see " - LayoutInline {A} at (0,0) size 70x18 [color=#0000FF] - LayoutText {#text} at (127,18) size 70x18 - text run at (127,18) width 70: "section 3.0" - LayoutText {#text} at (196,18) size 282x18 - text run at (196,18) width 282: " of the CSS1 specification for more details)." - LayoutBlockFlow {P} at (0,527) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 206x18 - text run at (0,0) width 206: "This paragraph should be green." - LayoutTable {TABLE} at (0,561) size 769x384 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x382 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x356 - LayoutTableCell {TD} at (0,191) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x356 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x36 - LayoutText {#text} at (0,0) size 412x18 - text run at (0,0) width 412: "This sentence should be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (411,2) size 95x15 - text run at (411,2) width 95: "linktest.css" - LayoutText {#text} at (505,0) size 717x36 - text run at (505,0) width 212: ", the reference to which is shown" - text run at (0,18) width 43: "above." - LayoutBlockFlow {P} at (4,56) size 747x36 - LayoutText {#text} at (0,0) size 449x18 - text run at (0,0) width 449: "This sentence should NOT be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 103x15 - LayoutText {#text} at (448,2) size 103x15 - text run at (448,2) width 103: "linktest2.css" - LayoutText {#text} at (550,0) size 9x18 - text run at (550,0) width 9: ", " - LayoutInline {STRONG} at (0,0) size 42x18 - LayoutText {#text} at (558,0) size 42x18 - text run at (558,0) width 42: "unless" - LayoutText {#text} at (599,0) size 714x36 - text run at (599,0) width 115: " the external style" - text run at (0,18) width 367: "sheet \"Alternate SS\" has been selected via the user agent." - LayoutBlockFlow {UL} at (4,108) size 747x54 [color=#FF0000] - LayoutListItem {LI} at (40,0) size 707x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 398x18 - text run at (0,0) width 398: "This sentence should be green due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 204x15 - LayoutText {#text} at (397,2) size 204x15 - text run at (397,2) width 204: "@import url(imptest1.css);" - LayoutText {#text} at (600,0) size 10x18 - text run at (600,0) width 10: "]." - LayoutListItem {LI} at (40,18) size 707x18 [color=#800080] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 403x18 - text run at (0,0) width 403: "This sentence should be purple due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 180x15 - LayoutText {#text} at (403,2) size 180x15 - text run at (403,2) width 180: "@import \"imptest1a.css\"" - LayoutText {#text} at (582,0) size 10x18 - text run at (582,0) width 10: "]." - LayoutListItem {LI} at (40,36) size 707x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 399x18 - text run at (0,0) width 399: "This sentence should be green thanks to the STYLE attribute [" - LayoutInline {CODE} at (0,0) size 164x15 - LayoutText {#text} at (399,2) size 164x15 - text run at (399,2) width 164: "STYLE=\"color: green;\"" - LayoutText {#text} at (562,0) size 11x18 - text run at (562,0) width 11: "]." - LayoutBlockFlow {P} at (4,178) size 747x18 [color=#800080] - LayoutText {#text} at (0,0) size 510x18 - text run at (0,0) width 510: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - LayoutBlockFlow {OL} at (4,212) size 747x54 - LayoutListItem {LI} at (40,0) size 707x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "1" - LayoutText {#text} at (0,0) size 204x18 - text run at (0,0) width 204: "This list should NOT be purple." - LayoutListItem {LI} at (40,18) size 707x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "2" - LayoutText {#text} at (0,0) size 176x18 - text run at (0,0) width 176: "It should, instead, be black." - LayoutListItem {LI} at (40,36) size 707x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "3" - LayoutText {#text} at (0,0) size 512x18 - text run at (0,0) width 512: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - LayoutBlockFlow {P} at (4,282) size 747x36 - LayoutText {#text} at (0,0) size 714x18 - text run at (0,0) width 200: "This sentence should be black. " - text run at (199,0) width 515: "If it is red, then the browser has inappropriately imported the styles from the file" - LayoutInline {TT} at (0,0) size 94x15 - LayoutText {#text} at (0,20) size 94x15 - text run at (0,20) width 94: "imptest2.css" - LayoutText {#text} at (93,18) size 35x18 - text run at (93,18) width 35: " (see " - LayoutInline {A} at (0,0) size 70x18 [color=#0000FF] - LayoutText {#text} at (127,18) size 70x18 - text run at (127,18) width 70: "section 3.0" - LayoutText {#text} at (196,18) size 282x18 - text run at (196,18) width 282: " of the CSS1 specification for more details)." - LayoutBlockFlow {P} at (4,334) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 206x18 - text run at (0,0) width 206: "This paragraph should be green." -layer at (8,205) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,197) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png deleted file mode 100644 index 296b86f1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt deleted file mode 100644 index 7382d41..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt +++ /dev/null
@@ -1,83 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 [color=#000080] - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 461x60 - text run at (0,0) width 281: "P {color: navy; font-family: serif;}" - text run at (280,0) width 1: " " - text run at (0,15) width 461: "HTML BODY TABLE P {color: purple; font-family: sans-serif;}" - text run at (460,15) width 1: " " - text run at (0,30) width 219: "EM, UL LI LI {color: green;}" - text run at (218,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x18 [color=#000080] - LayoutText {#text} at (0,0) size 639x18 - text run at (0,0) width 639: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - LayoutBlockFlow {P} at (0,159) size 784x18 [color=#000080] - LayoutText {#text} at (0,0) size 570x18 - text run at (0,0) width 570: "This sentence should be normal for its section, except for the last word, which should be " - LayoutInline {EM} at (0,0) size 37x18 [color=#008000] - LayoutText {#text} at (569,0) size 37x18 - text run at (569,0) width 37: "green" - LayoutText {#text} at (605,0) size 5x18 - text run at (605,0) width 5: "." - LayoutBlockFlow {UL} at (0,193) size 784x36 - LayoutListItem {LI} at (40,0) size 744x36 - LayoutBlockFlow (anonymous) at (0,0) size 744x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutInline {EM} at (0,0) size 40x18 [color=#008000] - LayoutText {#text} at (0,0) size 40x18 - text run at (0,0) width 40: "Hello." - LayoutText {#text} at (39,0) size 406x18 - text run at (39,0) width 5: " " - text run at (43,0) width 402: "The first \"hello\" should be green, but this part should be black." - LayoutBlockFlow {UL} at (0,18) size 744x18 - LayoutListItem {LI} at (40,0) size 704x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 138x18 - text run at (0,0) width 138: "This should be green." - LayoutTable {TABLE} at (0,245) size 730x156 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 728x154 - LayoutTableRow {TR} at (0,0) size 728x26 - LayoutTableCell {TD} at (0,0) size 728x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 728x128 - LayoutTableCell {TD} at (0,77) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 716x128 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 708x18 [color=#800080] - LayoutText {#text} at (0,0) size 708x18 - text run at (0,0) width 708: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - LayoutBlockFlow {P} at (4,38) size 708x18 [color=#800080] - LayoutText {#text} at (0,0) size 628x18 - text run at (0,0) width 628: "This sentence should be normal for its section, except for the last word, which should be " - LayoutInline {EM} at (0,0) size 42x18 [color=#008000] - LayoutText {#text} at (627,0) size 42x18 - text run at (627,0) width 42: "green" - LayoutText {#text} at (668,0) size 6x18 - text run at (668,0) width 6: "." - LayoutBlockFlow {UL} at (4,72) size 708x36 - LayoutListItem {LI} at (40,0) size 668x36 - LayoutBlockFlow (anonymous) at (0,0) size 668x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutInline {EM} at (0,0) size 40x18 [color=#008000] - LayoutText {#text} at (0,0) size 40x18 - text run at (0,0) width 40: "Hello." - LayoutText {#text} at (39,0) size 406x18 - text run at (39,0) width 5: " " - text run at (43,0) width 402: "The first \"hello\" should be green, but this part should be black." - LayoutBlockFlow {UL} at (0,18) size 668x18 - LayoutListItem {LI} at (40,0) size 628x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 138x18 - text run at (0,0) width 138: "This should be green." -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/grouping-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/grouping-expected.png deleted file mode 100644 index 815ca1b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/grouping-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/grouping-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/grouping-expected.txt deleted file mode 100644 index 5762d680..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/grouping-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x30 - LayoutText {#text} at (0,0) size 266x30 - text run at (0,0) width 266: ".one, .two, .three {color: green;}" - text run at (265,0) width 1: " " - text run at (0,15) width 0: " " - LayoutBlockFlow {P} at (0,95) size 784x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,129) size 784x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,163) size 784x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutTable {TABLE} at (0,197) size 219x122 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 217x120 - LayoutTableRow {TR} at (0,0) size 217x26 - LayoutTableCell {TD} at (0,0) size 217x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 217x94 - LayoutTableCell {TD} at (0,60) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 205x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,38) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,72) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." -layer at (8,85) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/id_as_selector-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/id_as_selector-expected.png deleted file mode 100644 index fb05b5d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/id_as_selector-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt deleted file mode 100644 index 8f0dc25..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt +++ /dev/null
@@ -1,93 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 627 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x627 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x627 - LayoutBlockFlow {BODY} at (8,8) size 769x611 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x120 - LayoutText {#text} at (0,0) size 266x120 - text run at (0,0) width 157: "#one {color: green;}" - text run at (156,0) width 1: " " - text run at (0,15) width 149: "#a1 {color: green;}" - text run at (148,15) width 1: " " - text run at (0,30) width 219: "P#two, P#two2 {color: blue;}" - text run at (218,30) width 1: " " - text run at (0,45) width 266: "P#three, P#three2 {color: purple;}" - text run at (265,45) width 1: " " - text run at (0,60) width 164: "#four {color: green;}" - text run at (163,60) width 1: " " - text run at (0,75) width 149: "#a2 {color: green;}" - text run at (148,75) width 1: " " - text run at (0,90) width 235: "P#five, P#five2 {color: blue;}" - text run at (234,90) width 1: " " - text run at (0,105) width 235: "P#six, P#six2 {color: purple;}" - LayoutBlockFlow {P} at (0,185) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,219) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,253) size 769x18 [color=#0000FF] - LayoutText {#text} at (0,0) size 204x18 - text run at (0,0) width 204: "This paragraph should be blue [" - LayoutInline {TT} at (0,0) size 63x15 - LayoutText {#text} at (203,2) size 63x15 - text run at (203,2) width 63: "ID=\"two\"" - LayoutText {#text} at (265,0) size 10x18 - text run at (265,0) width 10: "]." - LayoutBlockFlow {PRE} at (0,287) size 769x15 - LayoutText {#text} at (0,0) size 383x15 - text run at (0,0) width 383: "This sentence should NOT be blue [PRE ID=\"two2\"]." - text run at (382,0) width 1: " " - LayoutBlockFlow {PRE} at (0,315) size 769x15 - LayoutText {#text} at (0,0) size 461x15 - text run at (0,0) width 461: "This sentence should be black, not purple [PRE ID=\"three\"]." - text run at (460,0) width 1: " " - LayoutBlockFlow {UL} at (0,346) size 769x18 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 240x18 - text run at (0,0) width 240: "This sentence should NOT be purple." - LayoutTable {TABLE} at (0,380) size 413x231 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 411x229 - LayoutTableRow {TR} at (0,0) size 411x26 - LayoutTableCell {TD} at (0,0) size 411x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 411x203 - LayoutTableCell {TD} at (0,114) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 399x203 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 391x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,38) size 391x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,72) size 391x18 [color=#0000FF] - LayoutText {#text} at (0,0) size 204x18 - text run at (0,0) width 204: "This paragraph should be blue [" - LayoutInline {TT} at (0,0) size 71x15 - LayoutText {#text} at (203,2) size 71x15 - text run at (203,2) width 71: "ID=\"five\"" - LayoutText {#text} at (273,0) size 10x18 - text run at (273,0) width 10: "]." - LayoutBlockFlow {PRE} at (4,106) size 391x15 - LayoutText {#text} at (0,0) size 391x15 - text run at (0,0) width 391: "This sentence should NOT be blue [PRE ID=\"five2\"]." - text run at (390,0) width 1: " " - LayoutBlockFlow {PRE} at (4,134) size 391x15 - LayoutText {#text} at (0,0) size 352x15 - text run at (0,0) width 352: "This sentence should be black [PRE ID=\"six\"]." - text run at (351,0) width 1: " " - LayoutBlockFlow {UL} at (4,165) size 391x18 - LayoutListItem {LI} at (40,0) size 351x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 240x18 - text run at (0,0) width 240: "This sentence should NOT be purple." -layer at (8,175) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,167) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/inheritance-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/inheritance-expected.png deleted file mode 100644 index 2367fdbb..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/inheritance-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/inheritance-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/inheritance-expected.txt deleted file mode 100644 index 34b00e7c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/basic/inheritance-expected.txt +++ /dev/null
@@ -1,190 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 731 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x731 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x730.59 - LayoutBlockFlow {BODY} at (8,8) size 784x714.59 [color=#008000] [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x105 - LayoutText {#text} at (0,0) size 266x105 - text run at (0,0) width 157: "BODY {color: green;}" - text run at (156,0) width 1: " " - text run at (0,15) width 133: "H3 {color: blue;}" - text run at (132,15) width 1: " " - text run at (0,30) width 149: "EM {color: purple;}" - text run at (148,30) width 1: " " - text run at (0,45) width 203: ".one {font-style: italic;}" - text run at (202,45) width 1: " " - text run at (0,60) width 266: ".two {text-decoration: underline;}" - text run at (265,60) width 1: " " - text run at (0,75) width 149: "#two {color: navy;}" - text run at (148,75) width 1: " " - text run at (0,90) width 180: ".three {color: purple;}" - text run at (179,90) width 1: " " - LayoutBlockFlow {H3} at (0,172.72) size 784x22 [color=#0000FF] - LayoutText {#text} at (0,0) size 216x22 - text run at (0,0) width 216: "This sentence should show " - LayoutInline {STRONG} at (0,0) size 35x22 - LayoutText {#text} at (215,0) size 35x22 - text run at (215,0) width 35: "blue" - LayoutText {#text} at (249,0) size 41x22 - text run at (249,0) width 41: " and " - LayoutInline {EM} at (0,0) size 50x22 [color=#800080] - LayoutText {#text} at (289,0) size 50x22 - text run at (289,0) width 50: "purple" - LayoutText {#text} at (338,0) size 6x22 - text run at (338,0) width 6: "." - LayoutBlockFlow {H3} at (0,213.44) size 784x22 [color=#0000FF] - LayoutText {#text} at (0,0) size 194x22 - text run at (0,0) width 194: "This sentence should be " - LayoutInline {SPAN} at (0,0) size 34x22 - LayoutText {#text} at (193,0) size 34x22 - text run at (193,0) width 34: "blue" - LayoutText {#text} at (226,0) size 101x22 - text run at (226,0) width 101: " throughout." - LayoutBlockFlow {P} at (0,254.16) size 784x18 - LayoutText {#text} at (0,0) size 230x18 - text run at (0,0) width 230: "This should be green except for the " - LayoutInline {EM} at (0,0) size 118x18 [color=#800080] - LayoutText {#text} at (229,0) size 118x18 - text run at (229,0) width 118: "emphasized words" - LayoutText {#text} at (346,0) size 163x18 - text run at (346,0) width 163: ", which should be purple." - LayoutBlockFlow {H3} at (0,290.88) size 784x22 [color=#0000FF] - LayoutText {#text} at (0,0) size 287x22 - text run at (0,0) width 287: "This should be blue and underlined." - LayoutBlockFlow {P} at (0,331.59) size 784x18 - LayoutText {#text} at (0,0) size 299x18 - text run at (0,0) width 299: "This sentence should be underlined, including " - LayoutInline {TT} at (0,0) size 71x15 - LayoutText {#text} at (298,2) size 71x15 - text run at (298,2) width 71: "this part" - LayoutText {#text} at (368,0) size 9x18 - text run at (368,0) width 9: ", " - LayoutInline {I} at (0,0) size 55x18 - LayoutText {#text} at (376,0) size 55x18 - text run at (376,0) width 55: "this part" - LayoutText {#text} at (430,0) size 9x18 - text run at (430,0) width 9: ", " - LayoutInline {EM} at (0,0) size 54x18 [color=#800080] - LayoutText {#text} at (438,0) size 54x18 - text run at (438,0) width 54: "this part" - LayoutText {#text} at (491,0) size 37x18 - text run at (491,0) width 37: ", and " - LayoutInline {STRONG} at (0,0) size 59x18 - LayoutText {#text} at (527,0) size 59x18 - text run at (527,0) width 59: "this part" - LayoutText {#text} at (585,0) size 5x18 - text run at (585,0) width 5: "." - LayoutBlockFlow {P} at (0,365.59) size 784x18 [color=#000080] - LayoutText {#text} at (0,0) size 444x18 - text run at (0,0) width 444: "This sentence should also be underlined, as well as dark blue (navy), " - LayoutInline {TT} at (0,0) size 149x15 - LayoutText {#text} at (443,2) size 149x15 - text run at (443,2) width 149: "including this part" - LayoutText {#text} at (591,0) size 5x18 - text run at (591,0) width 5: "." - LayoutBlockFlow {P} at (0,399.59) size 784x18 [color=#800080] - LayoutText {#text} at (0,0) size 271x18 - text run at (0,0) width 271: "This sentence should be purple, including " - LayoutInline {STRONG} at (0,0) size 59x18 - LayoutText {#text} at (270,0) size 59x18 - text run at (270,0) width 59: "this part" - LayoutText {#text} at (328,0) size 32x18 - text run at (328,0) width 32: " and " - LayoutInline {SPAN} at (0,0) size 178x18 - LayoutText {#text} at (359,0) size 178x18 - text run at (359,0) width 178: "this part (which is spanned)" - LayoutText {#text} at (536,0) size 5x18 - text run at (536,0) width 5: "." - LayoutTable {TABLE} at (0,433.59) size 618x281 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 616x279 - LayoutTableRow {TR} at (0,0) size 616x26 - LayoutTableCell {TD} at (0,0) size 616x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 616x253 - LayoutTableCell {TD} at (0,139) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 604x252.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {H3} at (4,4) size 596x22 [color=#0000FF] - LayoutText {#text} at (0,0) size 216x22 - text run at (0,0) width 216: "This sentence should show " - LayoutInline {STRONG} at (0,0) size 35x22 - LayoutText {#text} at (215,0) size 35x22 - text run at (215,0) width 35: "blue" - LayoutText {#text} at (249,0) size 41x22 - text run at (249,0) width 41: " and " - LayoutInline {EM} at (0,0) size 50x22 [color=#800080] - LayoutText {#text} at (289,0) size 50x22 - text run at (289,0) width 50: "purple" - LayoutText {#text} at (338,0) size 6x22 - text run at (338,0) width 6: "." - LayoutBlockFlow {H3} at (4,44.72) size 596x22 [color=#0000FF] - LayoutText {#text} at (0,0) size 194x22 - text run at (0,0) width 194: "This sentence should be " - LayoutInline {SPAN} at (0,0) size 34x22 - LayoutText {#text} at (193,0) size 34x22 - text run at (193,0) width 34: "blue" - LayoutText {#text} at (226,0) size 101x22 - text run at (226,0) width 101: " throughout." - LayoutBlockFlow {P} at (4,85.44) size 596x18 - LayoutText {#text} at (0,0) size 230x18 - text run at (0,0) width 230: "This should be green except for the " - LayoutInline {EM} at (0,0) size 118x18 [color=#800080] - LayoutText {#text} at (229,0) size 118x18 - text run at (229,0) width 118: "emphasized words" - LayoutText {#text} at (346,0) size 163x18 - text run at (346,0) width 163: ", which should be purple." - LayoutBlockFlow {H3} at (4,122.16) size 596x22 [color=#0000FF] - LayoutText {#text} at (0,0) size 287x22 - text run at (0,0) width 287: "This should be blue and underlined." - LayoutBlockFlow {P} at (4,162.88) size 596x18 - LayoutText {#text} at (0,0) size 299x18 - text run at (0,0) width 299: "This sentence should be underlined, including " - LayoutInline {TT} at (0,0) size 71x15 - LayoutText {#text} at (298,2) size 71x15 - text run at (298,2) width 71: "this part" - LayoutText {#text} at (368,0) size 9x18 - text run at (368,0) width 9: ", " - LayoutInline {I} at (0,0) size 55x18 - LayoutText {#text} at (376,0) size 55x18 - text run at (376,0) width 55: "this part" - LayoutText {#text} at (430,0) size 9x18 - text run at (430,0) width 9: ", " - LayoutInline {EM} at (0,0) size 54x18 [color=#800080] - LayoutText {#text} at (438,0) size 54x18 - text run at (438,0) width 54: "this part" - LayoutText {#text} at (491,0) size 37x18 - text run at (491,0) width 37: ", and " - LayoutInline {STRONG} at (0,0) size 59x18 - LayoutText {#text} at (527,0) size 59x18 - text run at (527,0) width 59: "this part" - LayoutText {#text} at (585,0) size 5x18 - text run at (585,0) width 5: "." - LayoutBlockFlow {P} at (4,196.88) size 596x18 [color=#000080] - LayoutText {#text} at (0,0) size 444x18 - text run at (0,0) width 444: "This sentence should also be underlined, as well as dark blue (navy), " - LayoutInline {TT} at (0,0) size 149x15 - LayoutText {#text} at (443,2) size 149x15 - text run at (443,2) width 149: "including this part" - LayoutText {#text} at (591,0) size 5x18 - text run at (591,0) width 5: "." - LayoutBlockFlow {P} at (4,230.88) size 596x18 [color=#800080] - LayoutText {#text} at (0,0) size 271x18 - text run at (0,0) width 271: "This sentence should be purple, including " - LayoutInline {STRONG} at (0,0) size 59x18 - LayoutText {#text} at (270,0) size 59x18 - text run at (270,0) width 59: "this part" - LayoutText {#text} at (328,0) size 32x18 - text run at (328,0) width 32: " and " - LayoutInline {SPAN} at (0,0) size 178x18 - LayoutText {#text} at (359,0) size 178x18 - text run at (359,0) width 178: "this part (which is spanned)" - LayoutText {#text} at (536,0) size 5x18 - text run at (536,0) width 5: "." -layer at (8,160) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,152) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/acid_test-expected.png deleted file mode 100644 index a4f8723..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/acid_test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border-expected.png deleted file mode 100644 index 5d3c32d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border-expected.txt deleted file mode 100644 index 6cd3a3e7..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border-expected.txt +++ /dev/null
@@ -1,189 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1432 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1432 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1432 - LayoutBlockFlow {BODY} at (8,8) size 769x1416 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x135 - LayoutText {#text} at (0,0) size 266x135 - text run at (0,0) width 266: ".one {border: medium black solid;}" - text run at (265,0) width 1: " " - text run at (0,15) width 258: ".two {border: thin maroon ridge;}" - text run at (257,15) width 1: " " - text run at (0,30) width 266: ".three {border: 10px teal outset;}" - text run at (265,30) width 1: " " - text run at (0,45) width 258: ".four {border: 10px olive inset;}" - text run at (257,45) width 1: " " - text run at (0,60) width 219: ".five {border: 10px maroon;}" - text run at (218,60) width 1: " " - text run at (0,75) width 227: ".six {border: maroon double;}" - text run at (226,75) width 1: " " - text run at (0,90) width 250: ".seven {border: left red solid;}" - text run at (249,90) width 1: " " - text run at (0,105) width 164: ".eight {border: 0px;}" - text run at (163,105) width 1: " " - text run at (0,120) width 227: "TD {border: 2px solid green;}" - text run at (226,120) width 1: " " - LayoutBlockFlow {P} at (0,200) size 769x36 - LayoutText {#text} at (0,0) size 765x36 - text run at (0,0) width 641: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (640,0) width 125: "This border applies" - text run at (0,18) width 324: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,252) size 769x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 491x18 - text run at (3,3) width 491: "This paragraph should have a medium black solid border all the way around." - LayoutBlockFlow {P} at (0,292) size 769x20 [border: (1px ridge #800000)] - LayoutText {#text} at (1,1) size 488x18 - text run at (1,1) width 488: "This paragraph should have a thin maroon ridged border all the way around." - LayoutBlockFlow {P} at (0,328) size 769x38 [border: (10px outset #008080)] - LayoutText {#text} at (10,10) size 528x18 - text run at (10,10) width 528: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - LayoutBlockFlow {P} at (0,382) size 769x38 [border: (10px inset #808000)] - LayoutText {#text} at (10,10) size 529x18 - text run at (10,10) width 529: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - LayoutBlockFlow {P} at (0,436) size 769x36 - LayoutText {#text} at (0,0) size 354x18 - text run at (0,0) width 354: "This paragraph should have no border around it, as the " - LayoutInline {TT} at (0,0) size 94x15 - LayoutText {#text} at (353,2) size 94x15 - text run at (353,2) width 94: "border-style" - LayoutText {#text} at (446,0) size 740x36 - text run at (446,0) width 294: " was not set, and it should not be offset in any" - text run at (0,18) width 30: "way." - LayoutBlockFlow {P} at (0,488) size 769x42 [border: (3px double #800000)] - LayoutText {#text} at (3,3) size 543x18 - text run at (3,3) width 543: "This paragraph should have a medium maroon double border around it, even though " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (545,5) size 95x15 - text run at (545,5) width 95: "border-width" - LayoutText {#text} at (639,3) size 755x36 - text run at (639,3) width 119: " was not explicitly" - text run at (3,21) width 22: "set." - LayoutBlockFlow {P} at (0,546) size 769x18 - LayoutText {#text} at (0,0) size 633x18 - text run at (0,0) width 633: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - LayoutBlockFlow {P} at (0,580) size 769x37 - LayoutInline {A} at (0,0) size 25x18 - LayoutText {#text} at (0,1) size 25x18 - text run at (0,1) width 25: "The" - LayoutText {#text} at (24,1) size 730x18 - text run at (24,1) width 730: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " - LayoutInline {A} at (0,0) size 16x18 [color=#0000FF] - LayoutImage {IMG} at (753.77,0) size 15x15 - LayoutText {#text} at (0,19) size 4x18 - text run at (0,19) width 4: "." - LayoutTable {TABLE} at (0,633) size 769x113 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x111 - LayoutTableRow {TR} at (0,5) size 767x42 - LayoutTableCell {TD} at (5,5) size 757x42 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,3) size 728x36 - text run at (3,3) width 413: "Every cell in this table should have a 2-pixel solid green border. " - text run at (415,3) width 316: "This is also true of the table-testing section in the" - text run at (3,21) width 179: "second half of the test page." - LayoutTableRow {TR} at (0,52) size 767x54 - LayoutTableCell {TD} at (5,67) size 192x24 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 54x18 - text run at (3,3) width 54: "Cell one" - LayoutTableCell {TD} at (202,52) size 560x54 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,3) size 554x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (3,21) size 168x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 166x28 - LayoutTableRow {TR} at (0,2) size 166x24 - LayoutTableCell {TD} at (2,2) size 162x24 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 156x18 - text run at (3,3) width 156: "Nested single-cell table!" - LayoutBlockFlow {P} at (0,762) size 769x18 - LayoutText {#text} at (0,0) size 180x18 - text run at (0,0) width 180: "This is an unstyled element." - LayoutTable {TABLE} at (0,796) size 769x620 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x618 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (5,5) size 161x18 - text run at (5,5) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x590 - LayoutTableCell {TD} at (0,309) size 14x28 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (5,5) size 4x18 - text run at (5,5) width 4: " " - LayoutTableCell {TD} at (14,28) size 753x590 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (5,5) size 743x36 - LayoutText {#text} at (0,0) size 715x36 - text run at (0,0) width 641: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (640,0) width 75: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (5,57) size 743x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 491x18 - text run at (3,3) width 491: "This paragraph should have a medium black solid border all the way around." - LayoutBlockFlow {P} at (5,97) size 743x20 [border: (1px ridge #800000)] - LayoutText {#text} at (1,1) size 488x18 - text run at (1,1) width 488: "This paragraph should have a thin maroon ridged border all the way around." - LayoutBlockFlow {P} at (5,133) size 743x38 [border: (10px outset #008080)] - LayoutText {#text} at (10,10) size 528x18 - text run at (10,10) width 528: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - LayoutBlockFlow {P} at (5,187) size 743x38 [border: (10px inset #808000)] - LayoutText {#text} at (10,10) size 529x18 - text run at (10,10) width 529: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - LayoutBlockFlow {P} at (5,241) size 743x36 - LayoutText {#text} at (0,0) size 354x18 - text run at (0,0) width 354: "This paragraph should have no border around it, as the " - LayoutInline {TT} at (0,0) size 94x15 - LayoutText {#text} at (353,2) size 94x15 - text run at (353,2) width 94: "border-style" - LayoutText {#text} at (446,0) size 740x36 - text run at (446,0) width 294: " was not set, and it should not be offset in any" - text run at (0,18) width 30: "way." - LayoutBlockFlow {P} at (5,293) size 743x42 [border: (3px double #800000)] - LayoutText {#text} at (3,3) size 543x18 - text run at (3,3) width 543: "This paragraph should have a medium maroon double border around it, even though " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (545,5) size 95x15 - text run at (545,5) width 95: "border-width" - LayoutText {#text} at (639,3) size 690x36 - text run at (639,3) width 54: " was not" - text run at (3,21) width 87: "explicitly set." - LayoutBlockFlow {P} at (5,351) size 743x18 - LayoutText {#text} at (0,0) size 633x18 - text run at (0,0) width 633: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - LayoutBlockFlow {P} at (5,385) size 743x37 - LayoutInline {A} at (0,0) size 25x18 - LayoutText {#text} at (0,0) size 25x18 - text run at (0,0) width 25: "The" - LayoutText {#text} at (24,0) size 733x37 - text run at (24,0) width 709: " following image is also an anchor which points to a target on this page, but it should not have a border around" - text run at (0,19) width 18: "it: " - LayoutInline {A} at (0,0) size 16x18 [color=#0000FF] - LayoutImage {IMG} at (17.33,18) size 15x15 - LayoutText {#text} at (32,19) size 5x18 - text run at (32,19) width 5: "." - LayoutTable {TABLE} at (5,438) size 743x113 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 741x111 - LayoutTableRow {TR} at (0,5) size 741x42 - LayoutTableCell {TD} at (5,5) size 731x42 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,3) size 705x36 - text run at (3,3) width 413: "Every cell in this table should have a 2-pixel solid green border. " - text run at (415,3) width 293: "This is also true of the table-testing section in" - text run at (3,21) width 203: "the second half of the test page." - LayoutTableRow {TR} at (0,52) size 741x54 - LayoutTableCell {TD} at (5,67) size 185x24 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 54x18 - text run at (3,3) width 54: "Cell one" - LayoutTableCell {TD} at (195,52) size 541x54 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,3) size 535x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (3,21) size 168x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 166x28 - LayoutTableRow {TR} at (0,2) size 166x24 - LayoutTableCell {TD} at (2,2) size 162x24 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 156x18 - text run at (3,3) width 156: "Nested single-cell table!" - LayoutBlockFlow {P} at (5,567) size 743x18 - LayoutText {#text} at (0,0) size 180x18 - text run at (0,0) width 180: "This is an unstyled element." -layer at (8,190) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,182) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png deleted file mode 100644 index 84f9191..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt deleted file mode 100644 index 0b8adbbf..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt +++ /dev/null
@@ -1,164 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 995 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x995 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x995 - LayoutBlockFlow {BODY} at (8,8) size 769x979 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x60 - LayoutText {#text} at (0,0) size 336x60 - text run at (0,0) width 320: ".one {border-bottom: purple double 10px;}" - text run at (319,0) width 1: " " - text run at (0,15) width 313: ".two {border-bottom: purple thin solid;}" - text run at (312,15) width 1: " " - text run at (0,30) width 336: ".three {border-bottom: black medium solid;}" - text run at (335,30) width 1: " " - text run at (0,45) width 281: "TD {border-bottom: green 2px solid;}" - text run at (280,45) width 1: " " - LayoutBlockFlow {P} at (0,125) size 769x36 - LayoutText {#text} at (0,0) size 747x36 - text run at (0,0) width 673: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (672,0) width 75: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,177) size 769x28 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 445x18 - text run at (0,0) width 445: "This paragraph should have a purple, double, 10-pixel bottom border." - LayoutBlockFlow {P} at (0,221) size 769x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 361x18 - text run at (0,0) width 361: "This paragraph should have a thin purple bottom border." - LayoutTable {TABLE} at (0,256) size 769x110 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x108 - LayoutTableRow {TR} at (0,5) size 767x41 - LayoutTableCell {TD} at (5,5) size 757x41 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 738x36 - text run at (2,2) width 463: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (464,2) width 276: "This is also true of the table-testing section" - text run at (2,20) width 219: "in the second half of the test page." - LayoutTableRow {TR} at (0,51) size 767x52 - LayoutTableCell {TD} at (5,65) size 190x23 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 54x18 - text run at (2,2) width 54: "Cell one" - LayoutTableCell {TD} at (200,51) size 562x52 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 558x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (2,20) size 166x29 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 164x27 - LayoutTableRow {TR} at (0,2) size 164x23 - LayoutTableCell {TD} at (2,2) size 160x23 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 156x18 - text run at (2,2) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,382) size 769x135 - LayoutListItem {LI} at (40,0) size 729x75 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (0,18) size 729x54 - LayoutListItem {LI} at (40,0) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,75) size 729x21 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 163x18 - text run at (0,0) width 163: "This is a second list item." - LayoutListItem {LI} at (40,96) size 729x39 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 714x36 - text run at (0,0) width 714: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means" - text run at (0,18) width 135: "that it should appear " - LayoutInline {EM} at (0,0) size 51x18 - LayoutText {#text} at (134,18) size 51x18 - text run at (134,18) width 51: "beneath" - LayoutText {#text} at (184,18) size 401x18 - text run at (184,18) width 401: " the nested list (below the line \"...nested within the list item.\")." - LayoutTable {TABLE} at (0,533) size 769x446 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x444 - LayoutTableRow {TR} at (0,0) size 767x27 - LayoutTableCell {TD} at (0,0) size 767x27 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,27) size 767x417 - LayoutTableCell {TD} at (0,222) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,27) size 755x417 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x36 - LayoutText {#text} at (0,0) size 747x36 - text run at (0,0) width 673: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (672,0) width 75: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,56) size 747x28 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 445x18 - text run at (0,0) width 445: "This paragraph should have a purple, double, 10-pixel bottom border." - LayoutBlockFlow {P} at (4,100) size 747x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 361x18 - text run at (0,0) width 361: "This paragraph should have a thin purple bottom border." - LayoutTable {TABLE} at (4,135) size 747x110 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 745x108 - LayoutTableRow {TR} at (0,5) size 745x41 - LayoutTableCell {TD} at (5,5) size 735x41 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 688x36 - text run at (2,2) width 463: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (464,2) width 226: "This is also true of the table-testing" - text run at (2,20) width 268: "section in the second half of the test page." - LayoutTableRow {TR} at (0,51) size 745x52 - LayoutTableCell {TD} at (5,65) size 184x23 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 54x18 - text run at (2,2) width 54: "Cell one" - LayoutTableCell {TD} at (194,51) size 546x52 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 542x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (2,20) size 166x29 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 164x27 - LayoutTableRow {TR} at (0,2) size 164x23 - LayoutTableCell {TD} at (2,2) size 160x23 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 156x18 - text run at (2,2) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,261) size 747x135 - LayoutListItem {LI} at (40,0) size 707x75 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (0,18) size 707x54 - LayoutListItem {LI} at (40,0) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,75) size 707x21 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 163x18 - text run at (0,0) width 163: "This is a second list item." - LayoutListItem {LI} at (40,96) size 707x39 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 669x36 - text run at (0,0) width 669: "Each list item in this list should have a medium-width black border at its bottom, which for the first item" - text run at (0,18) width 180: "means that it should appear " - LayoutInline {EM} at (0,0) size 51x18 - LayoutText {#text} at (179,18) size 51x18 - text run at (179,18) width 51: "beneath" - LayoutText {#text} at (229,18) size 401x18 - text run at (229,18) width 401: " the nested list (below the line \"...nested within the list item.\")." -layer at (8,115) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png deleted file mode 100644 index dd0b7c03..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt deleted file mode 100644 index 130f107..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 320x45 - text run at (0,0) width 320: ".one {border-bottom: purple double 10px;}" - text run at (319,0) width 1: " " - text run at (0,15) width 313: ".two {border-bottom: purple thin solid;}" - text run at (312,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 680x18 - text run at (0,0) width 680: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 59x28 [border: none (10px double #800080) none] - LayoutText {#text} at (679,0) size 59x18 - text run at (679,0) width 59: "class one" - LayoutText {#text} at (737,0) size 742x36 - text run at (737,0) width 5: "," - text run at (0,18) width 412: "which should have a 10-pixel purple double bottom border; and " - LayoutInline {SPAN} at (0,0) size 60x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (411,18) size 60x18 - text run at (411,18) width 60: "class two" - LayoutText {#text} at (470,18) size 768x36 - text run at (470,18) width 298: ", which should have a thin solid purple bottom" - text run at (0,36) width 49: "border. " - text run at (48,36) width 439: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,180) size 784x90 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x88 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x62 - LayoutTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 680x18 - text run at (0,0) width 680: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 59x28 [border: none (10px double #800080) none] - LayoutText {#text} at (679,0) size 59x18 - text run at (679,0) width 59: "class one" - LayoutText {#text} at (737,0) size 742x36 - text run at (737,0) width 5: "," - text run at (0,18) width 412: "which should have a 10-pixel purple double bottom border; and " - LayoutInline {SPAN} at (0,0) size 60x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (411,18) size 60x18 - text run at (411,18) width 60: "class two" - LayoutText {#text} at (470,18) size 719x36 - text run at (470,18) width 249: ", which should have a thin solid purple" - text run at (0,36) width 99: "bottom border. " - text run at (98,36) width 438: "The line-height of the parent element should not change on any line." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png deleted file mode 100644 index 0458d0d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt deleted file mode 100644 index a110fa0..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt +++ /dev/null
@@ -1,104 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 877 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x877 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x877 - LayoutBlockFlow {BODY} at (8,8) size 769x861 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 453x90 - text run at (0,0) width 445: ".zero {background-color: silver; border-bottom-width: 0;}" - text run at (444,0) width 1: " " - text run at (0,15) width 422: ".one {border-bottom-width: 50px; border-style: solid;}" - text run at (421,15) width 1: " " - text run at (0,30) width 430: ".two {border-bottom-width: thick; border-style: solid;}" - text run at (429,30) width 1: " " - text run at (0,45) width 453: ".three {border-bottom-width: medium; border-style: solid;}" - text run at (452,45) width 1: " " - text run at (0,60) width 430: ".four {border-bottom-width: thin; border-style: solid;}" - text run at (429,60) width 1: " " - text run at (0,75) width 266: ".five {border-bottom-width: 25px;}" - text run at (265,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,223) size 769x71 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 395x18 - text run at (3,3) width 395: "This element should have a bottom border width of 50 pixels." - LayoutBlockFlow {P} at (0,310) size 769x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 351x18 - text run at (3,3) width 351: "This element should have a thick bottom border width." - LayoutBlockFlow {P} at (0,352) size 769x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 372x18 - text run at (3,3) width 372: "This element should have a medium bottom border width." - LayoutBlockFlow {P} at (0,392) size 769x22 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 344x18 - text run at (3,3) width 344: "This element should have a thin bottom border width." - LayoutBlockFlow {P} at (0,430) size 769x18 - LayoutText {#text} at (0,0) size 545x18 - text run at (0,0) width 545: "This element should have no border and no extra \"padding\" on its bottom side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (544,2) size 95x15 - text run at (544,2) width 95: "border-style" - LayoutText {#text} at (638,0) size 56x18 - text run at (638,0) width 56: " was set." - LayoutBlockFlow {P} at (0,464) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutTable {TABLE} at (0,498) size 716x363 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 714x361 - LayoutTableRow {TR} at (0,0) size 714x26 - LayoutTableCell {TD} at (0,0) size 714x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 714x335 - LayoutTableCell {TD} at (0,180) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 702x335 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 694x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (4,38) size 694x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,72) size 694x71 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 395x18 - text run at (3,3) width 395: "This element should have a bottom border width of 50 pixels." - LayoutBlockFlow {P} at (4,159) size 694x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 351x18 - text run at (3,3) width 351: "This element should have a thick bottom border width." - LayoutBlockFlow {P} at (4,201) size 694x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 372x18 - text run at (3,3) width 372: "This element should have a medium bottom border width." - LayoutBlockFlow {P} at (4,241) size 694x22 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 344x18 - text run at (3,3) width 344: "This element should have a thin bottom border width." - LayoutBlockFlow {P} at (4,279) size 694x18 - LayoutText {#text} at (0,0) size 545x18 - text run at (0,0) width 545: "This element should have no border and no extra \"padding\" on its bottom side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (544,2) size 95x15 - text run at (544,2) width 95: "border-style" - LayoutText {#text} at (638,0) size 56x18 - text run at (638,0) width 56: " was set." - LayoutBlockFlow {P} at (4,313) size 694x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png deleted file mode 100644 index 45748e41..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt deleted file mode 100644 index c5a511505..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt +++ /dev/null
@@ -1,88 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 422x45 - text run at (0,0) width 422: ".one {border-bottom-width: 25px; border-style: solid;}" - text run at (421,0) width 1: " " - text run at (0,15) width 422: ".two {border-bottom-width: thin; border-style: solid;}" - text run at (421,15) width 1: " " - text run at (0,30) width 274: ".three {border-bottom-width: 25px;}" - text run at (273,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x100 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 176x18 - text run at (3,3) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (178,5) size 25x15 - text run at (178,5) width 25: "one" - LayoutText {#text} at (202,3) size 164x18 - text run at (202,3) width 9: ". " - text run at (210,3) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 178x22 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (368,3) size 149x18 - text run at (368,3) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (516,5) size 24x15 - text run at (516,5) width 24: "two" - LayoutText {#text} at (542,3) size 768x54 - text run at (542,3) width 226: ", which should result in a thin solid" - text run at (3,21) width 731: "border on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (733,21) width 38: "There" - text run at (3,39) width 64: "is also an " - LayoutInline {SPAN} at (0,0) size 188x18 - LayoutText {#text} at (66,39) size 149x18 - text run at (66,39) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (214,41) size 40x15 - text run at (214,41) width 40: "three" - LayoutText {#text} at (253,39) size 764x36 - text run at (253,39) width 514: ", which should have no bottom border width or visible border because no border" - text run at (3,57) width 85: "style was set." - LayoutTable {TABLE} at (0,226) size 784x136 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x134 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x108 - LayoutTableCell {TD} at (0,67) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x108 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x100 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 176x18 - text run at (3,3) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (178,5) size 25x15 - text run at (178,5) width 25: "one" - LayoutText {#text} at (202,3) size 164x18 - text run at (202,3) width 9: ". " - text run at (210,3) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 178x22 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (368,3) size 149x18 - text run at (368,3) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (516,5) size 24x15 - text run at (516,5) width 24: "two" - LayoutText {#text} at (542,3) size 730x54 - text run at (542,3) width 191: ", which should result in a thin" - text run at (3,21) width 716: "solid border on the bottom side of each box in the inline element (and the UA's default border on the other three" - text run at (3,39) width 46: "sides). " - text run at (48,39) width 106: "There is also an " - LayoutInline {SPAN} at (0,0) size 187x18 - LayoutText {#text} at (153,39) size 148x18 - text run at (153,39) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (300,41) size 40x15 - text run at (300,41) width 40: "three" - LayoutText {#text} at (339,39) size 730x36 - text run at (339,39) width 394: ", which should have no bottom border width or visible border" - text run at (3,57) width 206: "because no border style was set." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color-expected.png deleted file mode 100644 index ea70e5e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color-expected.txt deleted file mode 100644 index 21373ea..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 710x45 - text run at (0,0) width 383: ".one {border-color: purple; border-style: solid;}" - text run at (382,0) width 1: " " - text run at (0,15) width 554: ".two {border-color: purple; border-width: medium; border-style: solid;}" - text run at (553,15) width 1: " " - text run at (0,30) width 710: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - text run at (709,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x24 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 364x18 - text run at (3,3) width 364: "This element should have a purple border surrounding it." - LayoutBlockFlow {P} at (0,150) size 784x24 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 463x18 - text run at (3,3) width 463: "This element should have a medium-width purple border surrounding it." - LayoutBlockFlow {P} at (0,190) size 784x42 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (3,3) size 776x36 - text run at (3,3) width 776: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the" - text run at (3,21) width 227: "bottom, and yellow on the left side." - LayoutTable {TABLE} at (0,248) size 784x158 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x156 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x130 - LayoutTableCell {TD} at (0,78) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x130 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x24 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 364x18 - text run at (3,3) width 364: "This element should have a purple border surrounding it." - LayoutBlockFlow {P} at (4,44) size 762x24 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 463x18 - text run at (3,3) width 463: "This element should have a medium-width purple border surrounding it." - LayoutBlockFlow {P} at (4,84) size 762x42 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (3,3) size 753x36 - text run at (3,3) width 753: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on" - text run at (3,21) width 251: "the bottom, and yellow on the left side." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png deleted file mode 100644 index 84ea7cd1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt deleted file mode 100644 index dd06c68a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt +++ /dev/null
@@ -1,74 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 710x45 - text run at (0,0) width 383: ".one {border-color: purple; border-style: solid;}" - text run at (382,0) width 1: " " - text run at (0,15) width 554: ".two {border-color: purple; border-width: medium; border-style: solid;}" - text run at (553,15) width 1: " " - text run at (0,30) width 710: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - text run at (709,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x72 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 691x18 - text run at (0,0) width 691: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 65x24 [border: (3px solid #800080)] - LayoutText {#text} at (693,0) size 59x18 - text run at (693,0) width 59: "class one" - LayoutText {#text} at (754,0) size 5x18 - text run at (754,0) width 5: "," - LayoutInline {SPAN} at (0,0) size 66x24 [border: (3px solid #800080)] - LayoutText {#text} at (3,18) size 60x18 - text run at (3,18) width 60: "class two" - LayoutText {#text} at (65,18) size 36x18 - text run at (65,18) width 36: ", and " - LayoutInline {SPAN} at (0,0) size 74x24 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (103,18) size 68x18 - text run at (103,18) width 68: "class three" - LayoutText {#text} at (173,18) size 772x54 - text run at (173,18) width 9: ". " - text run at (181,18) width 585: "The effect for each inline element should be to have a purple medium-width solid border in" - text run at (0,36) width 633: "the first and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (632,36) width 140: "The line-height of the" - text run at (0,54) width 334: "parent element should not change at all, on any line." - LayoutTable {TABLE} at (0,198) size 784x108 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x106 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x80 - LayoutTableCell {TD} at (0,53) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x80 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x72 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 691x18 - text run at (0,0) width 691: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 65x24 [border: (3px solid #800080)] - LayoutText {#text} at (693,0) size 59x18 - text run at (693,0) width 59: "class one" - LayoutText {#text} at (754,0) size 5x18 - text run at (754,0) width 5: "," - LayoutInline {SPAN} at (0,0) size 66x24 [border: (3px solid #800080)] - LayoutText {#text} at (3,18) size 60x18 - text run at (3,18) width 60: "class two" - LayoutText {#text} at (65,18) size 36x18 - text run at (65,18) width 36: ", and " - LayoutInline {SPAN} at (0,0) size 74x24 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (103,18) size 68x18 - text run at (103,18) width 68: "class three" - LayoutText {#text} at (173,18) size 749x54 - text run at (173,18) width 9: ". " - text run at (181,18) width 568: "The effect for each inline element should be to have a purple medium-width solid border" - text run at (0,36) width 650: "in the first and second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (649,36) width 99: "The line-height" - text run at (0,54) width 375: "of the parent element should not change at all, on any line." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_inline-expected.png deleted file mode 100644 index 9c30b54..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt deleted file mode 100644 index ffab5080..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 250x45 - text run at (0,0) width 250: ".one {border: 10px teal outset;}" - text run at (249,0) width 1: " " - text run at (0,15) width 250: ".two {border: 10px olive inset;}" - text run at (249,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 691x18 - text run at (0,0) width 691: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 79x38 [border: (10px outset #008080)] - LayoutText {#text} at (700,0) size 59x18 - text run at (700,0) width 59: "class one" - LayoutText {#text} at (768,0) size 773x36 - text run at (768,0) width 5: "," - text run at (0,18) width 361: "which should result in a 10-pixel outset teal border; and " - LayoutInline {SPAN} at (0,0) size 80x38 [border: (10px inset #808000)] - LayoutText {#text} at (370,18) size 60x18 - text run at (370,18) width 60: "class two" - LayoutText {#text} at (439,18) size 778x36 - text run at (439,18) width 339: ", which should result in a 10-pixel inset olive border." - text run at (0,36) width 438: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,180) size 784x90 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x88 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x62 - LayoutTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 691x18 - text run at (0,0) width 691: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 732x56 [border: (10px outset #008080)] - LayoutText {#text} at (700,0) size 732x36 - text run at (700,0) width 32: "class" - text run at (0,18) width 24: "one" - LayoutText {#text} at (33,18) size 369x18 - text run at (33,18) width 369: ", which should result in a 10-pixel outset teal border; and " - LayoutInline {SPAN} at (0,0) size 80x38 [border: (10px inset #808000)] - LayoutText {#text} at (411,18) size 60x18 - text run at (411,18) width 60: "class two" - LayoutText {#text} at (480,18) size 734x36 - text run at (480,18) width 254: ", which should result in a 10-pixel inset" - text run at (0,36) width 85: "olive border. " - text run at (84,36) width 439: "The line-height of the parent element should not change on any line." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left-expected.png deleted file mode 100644 index 1d3f6462..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left-expected.txt deleted file mode 100644 index 27a2001a1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1028 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1028 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1028 - LayoutBlockFlow {BODY} at (8,8) size 769x1012 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (20,0) size 749x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x105 - LayoutText {#text} at (0,0) size 336x105 - text run at (0,0) width 172: "P {margin-left: 20px;}" - text run at (171,0) width 1: " " - text run at (0,15) width 305: ".one {border-left: purple double 10px;}" - text run at (304,15) width 1: " " - text run at (0,30) width 297: ".two {border-left: purple thin solid;}" - text run at (296,30) width 1: " " - text run at (0,45) width 328: ".threea {border-left: black medium solid;}" - text run at (327,45) width 1: " " - text run at (0,60) width 336: ".threeb {border-left: purple medium solid;}" - text run at (335,60) width 1: " " - text run at (0,75) width 320: ".threec {border-left: blue medium solid;}" - text run at (319,75) width 1: " " - text run at (0,90) width 266: "TD {border-left: green 2px solid;}" - text run at (265,90) width 1: " " - LayoutBlockFlow {P} at (20,170) size 749x36 - LayoutText {#text} at (0,0) size 723x36 - text run at (0,0) width 649: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (648,0) width 75: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (20,222) size 749x18 [border: none (10px double #800080)] - LayoutText {#text} at (10,0) size 421x18 - text run at (10,0) width 421: "This paragraph should have a purple, double, 10-pixel left border." - LayoutBlockFlow {P} at (20,256) size 749x18 [border: none (1px solid #800080)] - LayoutText {#text} at (1,0) size 337x18 - text run at (1,0) width 337: "This paragraph should have a thin purple left border." - LayoutTable {TABLE} at (0,290) size 769x107 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x105 - LayoutTableRow {TR} at (0,5) size 767x40 - LayoutTableCell {TD} at (5,5) size 757x40 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,2) size 730x36 - text run at (3,2) width 439: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (441,2) width 292: "This is also true of the table-testing section in" - text run at (3,20) width 203: "the second half of the test page." - LayoutTableRow {TR} at (0,50) size 767x50 - LayoutTableCell {TD} at (5,64) size 192x22 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 54x18 - text run at (3,2) width 54: "Cell one" - LayoutTableCell {TD} at (202,50) size 560x50 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,2) size 555x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (3,20) size 167x28 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 165x26 - LayoutTableRow {TR} at (0,2) size 165x22 - LayoutTableCell {TD} at (2,2) size 161x22 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 156x18 - text run at (3,2) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,413) size 769x144 - LayoutListItem {LI} at (40,0) size 729x72 [border: none (3px solid #000000)] - LayoutBlockFlow (anonymous) at (3,0) size 726x18 - LayoutListMarker (anonymous) at (-20,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (3,18) size 726x54 - LayoutListItem {LI} at (40,0) size 686x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 686x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 686x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,72) size 729x18 [border: none (3px solid #800080)] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (3,0) size 163x18 - text run at (3,0) width 163: "This is a second list item." - LayoutListItem {LI} at (40,90) size 729x54 [border: none (3px solid #0000FF)] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (3,0) size 721x54 - text run at (3,0) width 709: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors." - text run at (3,18) width 721: "The first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested" - text run at (3,36) width 546: "within the list item.\"), even though the nested list does not have any border styles set." - LayoutTable {TABLE} at (0,573) size 769x439 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x437 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (5,4) size 161x18 - text run at (5,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x411 - LayoutTableCell {TD} at (0,218) size 13x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (5,4) size 4x18 - text run at (5,4) width 4: " " - LayoutTableCell {TD} at (13,26) size 754x411 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (25,4) size 725x36 - LayoutText {#text} at (0,0) size 723x36 - text run at (0,0) width 649: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (648,0) width 75: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (25,56) size 725x18 [border: none (10px double #800080)] - LayoutText {#text} at (10,0) size 421x18 - text run at (10,0) width 421: "This paragraph should have a purple, double, 10-pixel left border." - LayoutBlockFlow {P} at (25,90) size 725x18 [border: none (1px solid #800080)] - LayoutText {#text} at (1,0) size 337x18 - text run at (1,0) width 337: "This paragraph should have a thin purple left border." - LayoutTable {TABLE} at (5,124) size 745x107 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 743x105 - LayoutTableRow {TR} at (0,5) size 743x40 - LayoutTableCell {TD} at (5,5) size 733x40 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,2) size 714x36 - text run at (3,2) width 439: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (441,2) width 276: "This is also true of the table-testing section" - text run at (3,20) width 219: "in the second half of the test page." - LayoutTableRow {TR} at (0,50) size 743x50 - LayoutTableCell {TD} at (5,64) size 185x22 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 54x18 - text run at (3,2) width 54: "Cell one" - LayoutTableCell {TD} at (195,50) size 543x50 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,2) size 538x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (3,20) size 167x28 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 165x26 - LayoutTableRow {TR} at (0,2) size 165x22 - LayoutTableCell {TD} at (2,2) size 161x22 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 156x18 - text run at (3,2) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (5,247) size 745x144 - LayoutListItem {LI} at (40,0) size 705x72 [border: none (3px solid #000000)] - LayoutBlockFlow (anonymous) at (3,0) size 702x18 - LayoutListMarker (anonymous) at (-20,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (3,18) size 702x54 - LayoutListItem {LI} at (40,0) size 662x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 662x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 662x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,72) size 705x18 [border: none (3px solid #800080)] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (3,0) size 163x18 - text run at (3,0) width 163: "This is a second list item." - LayoutListItem {LI} at (40,90) size 705x54 [border: none (3px solid #0000FF)] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (3,0) size 677x54 - text run at (3,0) width 662: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three" - text run at (3,18) width 48: "colors. " - text run at (50,18) width 630: "The first item's border should travel the entire height the nested list (to end near the baseline of the" - text run at (3,36) width 638: "line \"...nested within the list item.\"), even though the nested list does not have any border styles set." -layer at (8,160) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,152) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png deleted file mode 100644 index 7e06c53..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt deleted file mode 100644 index f0df8f6..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (20,0) size 764x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 305x60 - text run at (0,0) width 172: "P {margin-left: 20px;}" - text run at (171,0) width 1: " " - text run at (0,15) width 305: ".one {border-left: purple double 10px;}" - text run at (304,15) width 1: " " - text run at (0,30) width 297: ".two {border-left: purple thin solid;}" - text run at (296,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (20,125) size 764x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 760x36 - text run at (0,0) width 760: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes" - text run at (0,18) width 18: "of " - LayoutInline {SPAN} at (0,0) size 69x18 [border: none (10px double #800080)] - LayoutText {#text} at (27,18) size 59x18 - text run at (27,18) width 59: "class one" - LayoutText {#text} at (85,18) size 396x18 - text run at (85,18) width 396: ", which should have a 10-pixel purple double left border; and " - LayoutInline {SPAN} at (0,0) size 62x18 [border: none (1px solid #800080)] - LayoutText {#text} at (481,18) size 61x18 - text run at (481,18) width 61: "class two" - LayoutText {#text} at (541,18) size 745x36 - text run at (541,18) width 204: ", which should have a thin solid" - text run at (0,36) width 120: "purple left border. " - text run at (119,36) width 438: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,195) size 784x90 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x88 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x62 - LayoutTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (24,4) size 742x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 712x36 - text run at (0,0) width 712: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with" - text run at (0,18) width 66: "classes of " - LayoutInline {SPAN} at (0,0) size 69x18 [border: none (10px double #800080)] - LayoutText {#text} at (75,18) size 59x18 - text run at (75,18) width 59: "class one" - LayoutText {#text} at (133,18) size 397x18 - text run at (133,18) width 397: ", which should have a 10-pixel purple double left border; and " - LayoutInline {SPAN} at (0,0) size 61x18 [border: none (1px solid #800080)] - LayoutText {#text} at (530,18) size 60x18 - text run at (530,18) width 60: "class two" - LayoutText {#text} at (589,18) size 729x36 - text run at (589,18) width 140: ", which should have a" - text run at (0,36) width 184: "thin solid purple left border. " - text run at (183,36) width 438: "The line-height of the parent element should not change on any line." -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png deleted file mode 100644 index d1faf50..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt deleted file mode 100644 index f01a391..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt +++ /dev/null
@@ -1,106 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 859 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x859 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x859 - LayoutBlockFlow {BODY} at (8,8) size 769x843 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 437x90 - text run at (0,0) width 430: ".zero {background-color: silver; border-left-width: 0;}" - text run at (429,0) width 1: " " - text run at (0,15) width 406: ".one {border-left-width: 50px; border-style: solid;}" - text run at (405,15) width 1: " " - text run at (0,30) width 414: ".two {border-left-width: thick; border-style: solid;}" - text run at (413,30) width 1: " " - text run at (0,45) width 437: ".three {border-left-width: medium; border-style: solid;}" - text run at (436,45) width 1: " " - text run at (0,60) width 414: ".four {border-left-width: thin; border-style: solid;}" - text run at (413,60) width 1: " " - text run at (0,75) width 250: ".five {border-left-width: 25px;}" - text run at (249,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,223) size 769x42 [border: (3px solid #000000) (50px solid #000000)] - LayoutText {#text} at (50,3) size 697x36 - text run at (50,3) width 697: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more" - text run at (50,21) width 120: "than one line long." - LayoutBlockFlow {P} at (0,281) size 769x42 [border: (3px solid #000000) (5px solid #000000)] - LayoutText {#text} at (5,3) size 740x36 - text run at (5,3) width 740: "This element should have a thick left border width, which will be more obvious if the element is more than one line" - text run at (5,21) width 33: "long." - LayoutBlockFlow {P} at (0,339) size 769x42 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 760x36 - text run at (3,3) width 760: "This element should have a medium left border width, which will be more obvious if the element is more than one line" - text run at (3,21) width 33: "long." - LayoutBlockFlow {P} at (0,397) size 769x42 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (1,3) size 733x36 - text run at (1,3) width 733: "This element should have a thin left border width, which will be more obvious if the element is more than one line" - text run at (1,21) width 33: "long." - LayoutBlockFlow {P} at (0,455) size 769x18 - LayoutText {#text} at (0,0) size 521x18 - text run at (0,0) width 521: "This element should have no border and no extra \"padding\" on its left side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (520,2) size 95x15 - text run at (520,2) width 95: "border-style" - LayoutText {#text} at (614,0) size 56x18 - text run at (614,0) width 56: " was set." - LayoutTable {TABLE} at (0,489) size 769x354 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x352 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x326 - LayoutTableCell {TD} at (0,176) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x326 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (4,38) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,72) size 747x42 [border: (3px solid #000000) (50px solid #000000)] - LayoutText {#text} at (50,3) size 660x36 - text run at (50,3) width 660: "This element should have a left border width of 50 pixels, which will be more obvious if the element is" - text run at (50,21) width 156: "more than one line long." - LayoutBlockFlow {P} at (4,130) size 747x42 [border: (3px solid #000000) (5px solid #000000)] - LayoutText {#text} at (5,3) size 712x36 - text run at (5,3) width 712: "This element should have a thick left border width, which will be more obvious if the element is more than one" - text run at (5,21) width 61: "line long." - LayoutBlockFlow {P} at (4,188) size 747x42 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 732x36 - text run at (3,3) width 732: "This element should have a medium left border width, which will be more obvious if the element is more than one" - text run at (3,21) width 61: "line long." - LayoutBlockFlow {P} at (4,246) size 747x42 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (1,3) size 733x36 - text run at (1,3) width 733: "This element should have a thin left border width, which will be more obvious if the element is more than one line" - text run at (1,21) width 33: "long." - LayoutBlockFlow {P} at (4,304) size 747x18 - LayoutText {#text} at (0,0) size 521x18 - text run at (0,0) width 521: "This element should have no border and no extra \"padding\" on its left side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (520,2) size 95x15 - text run at (520,2) width 95: "border-style" - LayoutText {#text} at (614,0) size 56x18 - text run at (614,0) width 56: " was set." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png deleted file mode 100644 index 3dfcb8c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt deleted file mode 100644 index ee06bc9..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 406x45 - text run at (0,0) width 406: ".one {border-left-width: 25px; border-style: solid;}" - text run at (405,0) width 1: " " - text run at (0,15) width 406: ".two {border-left-width: thin; border-style: solid;}" - text run at (405,15) width 1: " " - text run at (0,30) width 258: ".three {border-left-width: 25px;}" - text run at (257,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x78 [border: (3px solid #000000) (25px solid #000000)] - LayoutText {#text} at (25,3) size 176x18 - text run at (25,3) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (200,5) size 25x15 - text run at (200,5) width 25: "one" - LayoutText {#text} at (224,3) size 164x18 - text run at (224,3) width 9: ". " - text run at (232,3) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 176x24 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (388,3) size 149x18 - text run at (388,3) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (536,5) size 24x15 - text run at (536,5) width 24: "two" - LayoutText {#text} at (562,3) size 728x36 - text run at (562,3) width 191: ", which should result in a thin" - text run at (25,21) width 221: "solid border on the left side of the " - LayoutInline {STRONG} at (0,0) size 28x18 - LayoutText {#text} at (245,21) size 28x18 - text run at (245,21) width 28: "first" - LayoutText {#text} at (272,21) size 714x36 - text run at (272,21) width 467: " box in the inline element (and the UA's default border on the other three" - text run at (25,39) width 46: "sides). " - text run at (70,39) width 106: "There is also an " - LayoutInline {SPAN} at (0,0) size 187x18 - LayoutText {#text} at (175,39) size 148x18 - text run at (175,39) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (322,41) size 40x15 - text run at (322,41) width 40: "three" - LayoutText {#text} at (361,39) size 706x36 - text run at (361,39) width 370: ", which should have no left border width or visible border" - text run at (25,57) width 206: "because no border style was set." - LayoutTable {TABLE} at (0,204) size 784x114 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x112 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x86 - LayoutTableCell {TD} at (0,56) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x86 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x78 [border: (3px solid #000000) (25px solid #000000)] - LayoutText {#text} at (25,3) size 176x18 - text run at (25,3) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (200,5) size 25x15 - text run at (200,5) width 25: "one" - LayoutText {#text} at (224,3) size 164x18 - text run at (224,3) width 9: ". " - text run at (232,3) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 176x24 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (388,3) size 149x18 - text run at (388,3) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (536,5) size 24x15 - text run at (536,5) width 24: "two" - LayoutText {#text} at (562,3) size 728x36 - text run at (562,3) width 191: ", which should result in a thin" - text run at (25,21) width 221: "solid border on the left side of the " - LayoutInline {STRONG} at (0,0) size 28x18 - LayoutText {#text} at (245,21) size 28x18 - text run at (245,21) width 28: "first" - LayoutText {#text} at (272,21) size 714x36 - text run at (272,21) width 467: " box in the inline element (and the UA's default border on the other three" - text run at (25,39) width 46: "sides). " - text run at (70,39) width 106: "There is also an " - LayoutInline {SPAN} at (0,0) size 187x18 - LayoutText {#text} at (175,39) size 148x18 - text run at (175,39) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (322,41) size 40x15 - text run at (322,41) width 40: "three" - LayoutText {#text} at (361,39) size 706x36 - text run at (361,39) width 370: ", which should have no left border width or visible border" - text run at (25,57) width 206: "because no border style was set." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right-expected.png deleted file mode 100644 index a6fedfcc..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right-expected.txt deleted file mode 100644 index fa0bc7a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 764x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 313x60 - text run at (0,0) width 180: "P {margin-right: 20px;}" - text run at (179,0) width 1: " " - text run at (0,15) width 313: ".one {border-right: purple double 10px;}" - text run at (312,15) width 1: " " - text run at (0,30) width 305: ".two {border-right: purple thin solid;}" - text run at (304,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 764x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 720x36 - text run at (0,0) width 720: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with" - text run at (0,18) width 66: "classes of " - LayoutInline {SPAN} at (0,0) size 69x18 [border: none (10px double #800080) none] - LayoutText {#text} at (65,18) size 59x18 - text run at (65,18) width 59: "class one" - LayoutText {#text} at (133,18) size 406x18 - text run at (133,18) width 406: ", which should have a 10-pixel purple double right border; and " - LayoutInline {SPAN} at (0,0) size 61x18 [border: none (1px solid #800080) none] - LayoutText {#text} at (538,18) size 60x18 - text run at (538,18) width 60: "class two" - LayoutText {#text} at (598,18) size 738x36 - text run at (598,18) width 140: ", which should have a" - text run at (0,36) width 192: "thin solid purple right border. " - text run at (191,36) width 439: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,195) size 784x90 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x88 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x62 - LayoutTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 742x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 720x36 - text run at (0,0) width 720: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with" - text run at (0,18) width 66: "classes of " - LayoutInline {SPAN} at (0,0) size 69x18 [border: none (10px double #800080) none] - LayoutText {#text} at (65,18) size 59x18 - text run at (65,18) width 59: "class one" - LayoutText {#text} at (133,18) size 406x18 - text run at (133,18) width 406: ", which should have a 10-pixel purple double right border; and " - LayoutInline {SPAN} at (0,0) size 61x18 [border: none (1px solid #800080) none] - LayoutText {#text} at (538,18) size 60x18 - text run at (538,18) width 60: "class two" - LayoutText {#text} at (598,18) size 738x36 - text run at (598,18) width 140: ", which should have a" - text run at (0,36) width 192: "thin solid purple right border. " - text run at (191,36) width 439: "The line-height of the parent element should not change on any line." -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png deleted file mode 100644 index bf1ce3ed..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt deleted file mode 100644 index 2ab1b41a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt +++ /dev/null
@@ -1,168 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1082 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1082 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1082 - LayoutBlockFlow {BODY} at (8,8) size 769x1066 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 749x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x105 - LayoutText {#text} at (0,0) size 344x105 - text run at (0,0) width 180: "P {margin-right: 20px;}" - text run at (179,0) width 1: " " - text run at (0,15) width 313: ".one {border-right: purple double 10px;}" - text run at (312,15) width 1: " " - text run at (0,30) width 305: ".two {border-right: purple thin solid;}" - text run at (304,30) width 1: " " - text run at (0,45) width 336: ".threea {border-right: black medium solid;}" - text run at (335,45) width 1: " " - text run at (0,60) width 344: ".threeb {border-right: purple medium solid;}" - text run at (343,60) width 1: " " - text run at (0,75) width 328: ".threec {border-right: blue medium solid;}" - text run at (327,75) width 1: " " - text run at (0,90) width 274: "TD {border-right: green 2px solid;}" - text run at (273,90) width 1: " " - LayoutBlockFlow {P} at (0,170) size 749x36 - LayoutText {#text} at (0,0) size 732x36 - text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (657,0) width 75: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,222) size 749x18 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 430x18 - text run at (0,0) width 430: "This paragraph should have a purple, double, 10-pixel right border." - LayoutBlockFlow {P} at (0,256) size 749x18 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 346x18 - text run at (0,0) width 346: "This paragraph should have a thin purple right border." - LayoutTable {TABLE} at (0,290) size 769x107 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x105 - LayoutTableRow {TR} at (0,5) size 767x40 - LayoutTableCell {TD} at (5,5) size 757x40 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 739x36 - text run at (2,2) width 447: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (449,2) width 292: "This is also true of the table-testing section in" - text run at (2,20) width 203: "the second half of the test page." - LayoutTableRow {TR} at (0,50) size 767x50 - LayoutTableCell {TD} at (5,64) size 191x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 54x18 - text run at (2,2) width 54: "Cell one" - LayoutTableCell {TD} at (201,50) size 561x50 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 556x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (2,20) size 167x28 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 165x26 - LayoutTableRow {TR} at (0,2) size 165x22 - LayoutTableCell {TD} at (2,2) size 161x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 156x18 - text run at (2,2) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,413) size 769x162 - LayoutListItem {LI} at (40,0) size 729x72 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 726x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (0,18) size 726x54 - LayoutListItem {LI} at (40,0) size 686x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 686x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 686x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,72) size 729x18 [border: none (3px solid #800080) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 163x18 - text run at (0,0) width 163: "This is a second list item." - LayoutListItem {LI} at (40,90) size 729x72 [border: none (3px solid #0000FF) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 722x72 - text run at (0,0) width 718: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors." - text run at (0,18) width 721: "The first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested" - text run at (0,36) width 550: "within the list item.\"), even though the nested list does not have any border styles set. " - text run at (549,36) width 173: "The borders should line up" - text run at (0,54) width 633: "together at the right edge of the document's body, as each list element has a default width of 100%." - LayoutTable {TABLE} at (0,591) size 769x475 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x473 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x447 - LayoutTableCell {TD} at (0,236) size 13x26 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (13,26) size 754x447 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 725x36 - LayoutText {#text} at (0,0) size 687x36 - text run at (0,0) width 658: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (657,0) width 30: "This" - text run at (0,18) width 419: "border applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,56) size 725x18 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 430x18 - text run at (0,0) width 430: "This paragraph should have a purple, double, 10-pixel right border." - LayoutBlockFlow {P} at (4,90) size 725x18 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 346x18 - text run at (0,0) width 346: "This paragraph should have a thin purple right border." - LayoutTable {TABLE} at (4,124) size 745x107 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 743x105 - LayoutTableRow {TR} at (0,5) size 743x40 - LayoutTableCell {TD} at (5,5) size 733x40 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 723x36 - text run at (2,2) width 447: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (449,2) width 276: "This is also true of the table-testing section" - text run at (2,20) width 219: "in the second half of the test page." - LayoutTableRow {TR} at (0,50) size 743x50 - LayoutTableCell {TD} at (5,64) size 185x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 54x18 - text run at (2,2) width 54: "Cell one" - LayoutTableCell {TD} at (195,50) size 543x50 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 538x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (2,20) size 167x28 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 165x26 - LayoutTableRow {TR} at (0,2) size 165x22 - LayoutTableCell {TD} at (2,2) size 161x22 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 156x18 - text run at (2,2) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,247) size 745x180 - LayoutListItem {LI} at (40,0) size 705x72 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 702x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (0,18) size 702x54 - LayoutListItem {LI} at (40,0) size 662x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 662x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 662x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,72) size 705x18 [border: none (3px solid #800080) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 163x18 - text run at (0,0) width 163: "This is a second list item." - LayoutListItem {LI} at (40,90) size 705x90 [border: none (3px solid #0000FF) none] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 677x90 - text run at (0,0) width 671: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three" - text run at (0,18) width 48: "colors. " - text run at (47,18) width 630: "The first item's border should travel the entire height the nested list (to end near the baseline of the" - text run at (0,36) width 642: "line \"...nested within the list item.\"), even though the nested list does not have any border styles set. " - text run at (641,36) width 26: "The" - text run at (0,54) width 677: "borders should line up together at the right edge of the document's body, as each list element has a default" - text run at (0,72) width 100: "width of 100%." -layer at (8,160) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,152) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png deleted file mode 100644 index 3560deb..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt deleted file mode 100644 index 9bd7aac..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt +++ /dev/null
@@ -1,106 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 859 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x859 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x859 - LayoutBlockFlow {BODY} at (8,8) size 769x843 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 445x90 - text run at (0,0) width 437: ".zero {background-color: silver; border-right-width: 0;}" - text run at (436,0) width 1: " " - text run at (0,15) width 414: ".one {border-right-width: 25px; border-style: solid;}" - text run at (413,15) width 1: " " - text run at (0,30) width 422: ".two {border-right-width: thick; border-style: solid;}" - text run at (421,30) width 1: " " - text run at (0,45) width 445: ".three {border-right-width: medium; border-style: solid;}" - text run at (444,45) width 1: " " - text run at (0,60) width 422: ".four {border-right-width: thin; border-style: solid;}" - text run at (421,60) width 1: " " - text run at (0,75) width 266: ".five {border-right-width: 100px;}" - text run at (265,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,223) size 769x42 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 737x36 - text run at (3,3) width 737: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than" - text run at (3,21) width 88: "one line long." - LayoutBlockFlow {P} at (0,281) size 769x42 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 749x36 - text run at (3,3) width 749: "This element should have a thick right border width, which will be more obvious if the element is more than one line" - text run at (3,21) width 33: "long." - LayoutBlockFlow {P} at (0,339) size 769x42 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 741x36 - text run at (3,3) width 741: "This element should have a medium right border width, which will be more obvious if the element is more than one" - text run at (3,21) width 61: "line long." - LayoutBlockFlow {P} at (0,397) size 769x42 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 742x36 - text run at (3,3) width 742: "This element should have a thin right border width, which will be more obvious if the element is more than one line" - text run at (3,21) width 33: "long." - LayoutBlockFlow {P} at (0,455) size 769x18 - LayoutText {#text} at (0,0) size 530x18 - text run at (0,0) width 530: "This element should have no border and no extra \"padding\" on its right side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (529,2) size 95x15 - text run at (529,2) width 95: "border-style" - LayoutText {#text} at (623,0) size 56x18 - text run at (623,0) width 56: " was set." - LayoutTable {TABLE} at (0,489) size 769x354 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x352 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x326 - LayoutTableCell {TD} at (0,176) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x326 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (4,38) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,72) size 747x42 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 706x36 - text run at (3,3) width 706: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more" - text run at (3,21) width 120: "than one line long." - LayoutBlockFlow {P} at (4,130) size 747x42 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 721x36 - text run at (3,3) width 721: "This element should have a thick right border width, which will be more obvious if the element is more than one" - text run at (3,21) width 61: "line long." - LayoutBlockFlow {P} at (4,188) size 747x42 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 741x36 - text run at (3,3) width 741: "This element should have a medium right border width, which will be more obvious if the element is more than one" - text run at (3,21) width 61: "line long." - LayoutBlockFlow {P} at (4,246) size 747x42 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 742x36 - text run at (3,3) width 742: "This element should have a thin right border width, which will be more obvious if the element is more than one line" - text run at (3,21) width 33: "long." - LayoutBlockFlow {P} at (4,304) size 747x18 - LayoutText {#text} at (0,0) size 530x18 - text run at (0,0) width 530: "This element should have no border and no extra \"padding\" on its right side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (529,2) size 95x15 - text run at (529,2) width 95: "border-style" - LayoutText {#text} at (623,0) size 56x18 - text run at (623,0) width 56: " was set." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png deleted file mode 100644 index 74e3c31..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt deleted file mode 100644 index 8457a89..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 414x45 - text run at (0,0) width 414: ".one {border-right-width: 25px; border-style: solid;}" - text run at (413,0) width 1: " " - text run at (0,15) width 414: ".two {border-right-width: thin; border-style: solid;}" - text run at (413,15) width 1: " " - text run at (0,30) width 266: ".three {border-right-width: 25px;}" - text run at (265,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x78 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 176x18 - text run at (3,3) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (178,5) size 25x15 - text run at (178,5) width 25: "one" - LayoutText {#text} at (202,3) size 164x18 - text run at (202,3) width 9: ". " - text run at (210,3) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 176x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (368,3) size 149x18 - text run at (368,3) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (516,5) size 24x15 - text run at (516,5) width 24: "two" - LayoutText {#text} at (540,3) size 728x36 - text run at (540,3) width 191: ", which should result in a thin" - text run at (3,21) width 230: "solid border on the right side of the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (232,21) size 25x18 - text run at (232,21) width 25: "last" - LayoutText {#text} at (256,21) size 720x36 - text run at (256,21) width 467: " box of the inline element (and the UA's default border on the other three" - text run at (3,39) width 46: "sides). " - text run at (48,39) width 106: "There is also an " - LayoutInline {SPAN} at (0,0) size 187x18 - LayoutText {#text} at (153,39) size 148x18 - text run at (153,39) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (300,41) size 40x15 - text run at (300,41) width 40: "three" - LayoutText {#text} at (339,39) size 715x36 - text run at (339,39) width 379: ", which should have no right border width or visible border" - text run at (3,57) width 206: "because no border style was set." - LayoutTable {TABLE} at (0,204) size 784x114 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x112 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x86 - LayoutTableCell {TD} at (0,56) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x86 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x78 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 176x18 - text run at (3,3) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (178,5) size 25x15 - text run at (178,5) width 25: "one" - LayoutText {#text} at (202,3) size 164x18 - text run at (202,3) width 9: ". " - text run at (210,3) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 176x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (368,3) size 149x18 - text run at (368,3) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (516,5) size 24x15 - text run at (516,5) width 24: "two" - LayoutText {#text} at (540,3) size 728x36 - text run at (540,3) width 191: ", which should result in a thin" - text run at (3,21) width 230: "solid border on the right side of the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (232,21) size 25x18 - text run at (232,21) width 25: "last" - LayoutText {#text} at (256,21) size 720x36 - text run at (256,21) width 467: " box of the inline element (and the UA's default border on the other three" - text run at (3,39) width 46: "sides). " - text run at (48,39) width 106: "There is also an " - LayoutInline {SPAN} at (0,0) size 187x18 - LayoutText {#text} at (153,39) size 148x18 - text run at (153,39) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (300,41) size 40x15 - text run at (300,41) width 40: "three" - LayoutText {#text} at (339,39) size 715x36 - text run at (339,39) width 379: ", which should have no right border width or visible border" - text run at (3,57) width 206: "because no border style was set." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style-expected.png deleted file mode 100644 index af90f7e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style-expected.txt deleted file mode 100644 index 8085a4a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style-expected.txt +++ /dev/null
@@ -1,121 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1301 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1301 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1301 - LayoutBlockFlow {BODY} at (8,8) size 769x1285 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x180 - LayoutText {#text} at (0,0) size 617x180 - text run at (0,0) width 547: ".one {border-style: dotted; border-color: black; border-width: thick;}" - text run at (546,0) width 1: " " - text run at (0,15) width 547: ".two {border-style: dashed; border-color: black; border-width: thick;}" - text run at (546,15) width 1: " " - text run at (0,30) width 554: ".three {border-style: solid; border-color: black; border-width: thick;}" - text run at (553,30) width 1: " " - text run at (0,45) width 554: ".four {border-style: double; border-color: black; border-width: thick;}" - text run at (553,45) width 1: " " - text run at (0,60) width 554: ".five {border-style: groove; border-color: olive; border-width: thick;}" - text run at (553,60) width 1: " " - text run at (0,75) width 539: ".six {border-style: ridge; border-color: olive; border-width: thick;}" - text run at (538,75) width 1: " " - text run at (0,90) width 554: ".seven {border-style: inset; border-color: olive; border-width: thick;}" - text run at (553,90) width 1: " " - text run at (0,105) width 562: ".eight {border-style: outset; border-color: olive; border-width: thick;}" - text run at (561,105) width 1: " " - text run at (0,120) width 617: ".nine {border-style: double groove; border-color: purple; border-width: thick;}" - text run at (616,120) width 1: " " - text run at (0,135) width 359: ".ten {border-style: double groove ridge inset;" - text run at (358,135) width 1: " " - text run at (0,150) width 359: " border-color: purple; border-width: thick;}" - text run at (358,150) width 1: " " - text run at (0,165) width 539: ".eleven {border-style: none; border-color: red; border-width: thick;}" - text run at (538,165) width 1: " " - LayoutBlockFlow {P} at (0,245) size 769x28 [border: (5px dotted #000000)] - LayoutText {#text} at (5,5) size 480x18 - text run at (5,5) width 480: "This paragraph should have a thick black dotted border all the way around." - LayoutBlockFlow {P} at (0,289) size 769x28 [border: (5px dashed #000000)] - LayoutText {#text} at (5,5) size 484x18 - text run at (5,5) width 484: "This paragraph should have a thick black dashed border all the way around." - LayoutBlockFlow {P} at (0,333) size 769x28 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 471x18 - text run at (5,5) width 471: "This paragraph should have a thick black solid border all the way around." - LayoutBlockFlow {P} at (0,377) size 769x28 [border: (5px double #000000)] - LayoutText {#text} at (5,5) size 483x18 - text run at (5,5) width 483: "This paragraph should have a thick black double border all the way around." - LayoutBlockFlow {P} at (0,421) size 769x28 [border: (5px groove #808000)] - LayoutText {#text} at (5,5) size 482x18 - text run at (5,5) width 482: "This paragraph should have a thick olive groove border all the way around." - LayoutBlockFlow {P} at (0,465) size 769x28 [border: (5px ridge #808000)] - LayoutText {#text} at (5,5) size 470x18 - text run at (5,5) width 470: "This paragraph should have a thick olive ridge border all the way around." - LayoutBlockFlow {P} at (0,509) size 769x28 [border: (5px inset #808000)] - LayoutText {#text} at (5,5) size 467x18 - text run at (5,5) width 467: "This paragraph should have a thick olive inset border all the way around." - LayoutBlockFlow {P} at (0,553) size 769x28 [border: (5px outset #808000)] - LayoutText {#text} at (5,5) size 475x18 - text run at (5,5) width 475: "This paragraph should have a thick olive outset border all the way around." - LayoutBlockFlow {P} at (0,597) size 769x46 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - LayoutText {#text} at (5,5) size 757x36 - text run at (5,5) width 627: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (631,5) width 131: "The color of all four" - text run at (5,23) width 208: "sides should be based on purple." - LayoutBlockFlow {P} at (0,659) size 769x46 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - LayoutText {#text} at (5,5) size 738x36 - text run at (5,5) width 713: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " - text run at (717,5) width 26: "The" - text run at (5,23) width 312: "color of all four sides should be based on purple." - LayoutBlockFlow {P} at (0,721) size 769x18 - LayoutText {#text} at (0,0) size 283x18 - text run at (0,0) width 283: "This paragraph should have no border at all." - LayoutTable {TABLE} at (0,755) size 769x530 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x528 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x502 - LayoutTableCell {TD} at (0,264) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x502 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x28 [border: (5px dotted #000000)] - LayoutText {#text} at (5,5) size 480x18 - text run at (5,5) width 480: "This paragraph should have a thick black dotted border all the way around." - LayoutBlockFlow {P} at (4,48) size 747x28 [border: (5px dashed #000000)] - LayoutText {#text} at (5,5) size 484x18 - text run at (5,5) width 484: "This paragraph should have a thick black dashed border all the way around." - LayoutBlockFlow {P} at (4,92) size 747x28 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 471x18 - text run at (5,5) width 471: "This paragraph should have a thick black solid border all the way around." - LayoutBlockFlow {P} at (4,136) size 747x28 [border: (5px double #000000)] - LayoutText {#text} at (5,5) size 483x18 - text run at (5,5) width 483: "This paragraph should have a thick black double border all the way around." - LayoutBlockFlow {P} at (4,180) size 747x28 [border: (5px groove #808000)] - LayoutText {#text} at (5,5) size 482x18 - text run at (5,5) width 482: "This paragraph should have a thick olive groove border all the way around." - LayoutBlockFlow {P} at (4,224) size 747x28 [border: (5px ridge #808000)] - LayoutText {#text} at (5,5) size 470x18 - text run at (5,5) width 470: "This paragraph should have a thick olive ridge border all the way around." - LayoutBlockFlow {P} at (4,268) size 747x28 [border: (5px inset #808000)] - LayoutText {#text} at (5,5) size 467x18 - text run at (5,5) width 467: "This paragraph should have a thick olive inset border all the way around." - LayoutBlockFlow {P} at (4,312) size 747x28 [border: (5px outset #808000)] - LayoutText {#text} at (5,5) size 475x18 - text run at (5,5) width 475: "This paragraph should have a thick olive outset border all the way around." - LayoutBlockFlow {P} at (4,356) size 747x46 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - LayoutText {#text} at (5,5) size 727x36 - text run at (5,5) width 627: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (631,5) width 101: "The color of all" - text run at (5,23) width 238: "four sides should be based on purple." - LayoutBlockFlow {P} at (4,418) size 747x46 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - LayoutText {#text} at (5,5) size 709x36 - text run at (5,5) width 709: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border." - text run at (5,23) width 341: "The color of all four sides should be based on purple." - LayoutBlockFlow {P} at (4,480) size 747x18 - LayoutText {#text} at (0,0) size 283x18 - text run at (0,0) width 283: "This paragraph should have no border at all." -layer at (8,235) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,227) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png deleted file mode 100644 index 8d6d04b0..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt deleted file mode 100644 index afd0c10..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt +++ /dev/null
@@ -1,71 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 554x45 - text run at (0,0) width 547: ".one {border-style: dashed; border-color: black; border-width: thick;}" - text run at (546,0) width 1: " " - text run at (0,15) width 531: ".two {border-style: groove; border-color: red; border-width: thick;}" - text run at (530,15) width 1: " " - text run at (0,30) width 554: ".three {border-style: none; border-color: purple; border-width: thick;}" - text run at (553,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 679x18 - text run at (0,0) width 679: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 69x28 [border: (5px dashed #000000)] - LayoutText {#text} at (683,0) size 59x18 - text run at (683,0) width 59: "class one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 313: "which will result in a dashed thick black border; " - LayoutInline {SPAN} at (0,0) size 70x28 [border: (5px groove #FF0000)] - LayoutText {#text} at (317,18) size 60x18 - text run at (317,18) width 60: "class two" - LayoutText {#text} at (381,18) size 375x18 - text run at (381,18) width 375: ", which should result in a grooved thick purple border, and" - LayoutInline {SPAN} at (0,0) size 68x18 - LayoutText {#text} at (0,36) size 68x18 - text run at (0,36) width 68: "class three" - LayoutText {#text} at (67,36) size 701x18 - text run at (67,36) width 260: ", which should result in no border at all. " - text run at (326,36) width 442: "The line-height of the parent element should not change, on any line." - LayoutTable {TABLE} at (0,180) size 784x108 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x106 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x80 - LayoutTableCell {TD} at (0,53) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x80 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x72 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 679x18 - text run at (0,0) width 679: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 69x28 [border: (5px dashed #000000)] - LayoutText {#text} at (683,0) size 59x18 - text run at (683,0) width 59: "class one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 313: "which will result in a dashed thick black border; " - LayoutInline {SPAN} at (0,0) size 70x28 [border: (5px groove #FF0000)] - LayoutText {#text} at (317,18) size 60x18 - text run at (317,18) width 60: "class two" - LayoutText {#text} at (381,18) size 375x18 - text run at (381,18) width 375: ", which should result in a grooved thick purple border, and" - LayoutInline {SPAN} at (0,0) size 68x18 - LayoutText {#text} at (0,36) size 68x18 - text run at (0,36) width 68: "class three" - LayoutText {#text} at (67,36) size 736x36 - text run at (67,36) width 260: ", which should result in no border at all. " - text run at (326,36) width 410: "The line-height of the parent element should not change, on any" - text run at (0,54) width 28: "line." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top-expected.png deleted file mode 100644 index 71a6cb9..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top-expected.txt deleted file mode 100644 index e05fb2f..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top-expected.txt +++ /dev/null
@@ -1,152 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 959 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x959 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x959 - LayoutBlockFlow {BODY} at (8,8) size 769x943 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x60 - LayoutText {#text} at (0,0) size 313x60 - text run at (0,0) width 297: ".one {border-top: purple double 10px;}" - text run at (296,0) width 1: " " - text run at (0,15) width 289: ".two {border-top: purple thin solid;}" - text run at (288,15) width 1: " " - text run at (0,30) width 313: ".three {border-top: black medium solid;}" - text run at (312,30) width 1: " " - text run at (0,45) width 258: "TD {border-top: green 2px solid;}" - text run at (257,45) width 1: " " - LayoutBlockFlow {P} at (0,125) size 769x36 - LayoutText {#text} at (0,0) size 723x36 - text run at (0,0) width 648: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (647,0) width 76: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,177) size 769x28 [border: (10px double #800080) none] - LayoutText {#text} at (0,10) size 420x18 - text run at (0,10) width 420: "This paragraph should have a purple, double, 10-pixel top border." - LayoutBlockFlow {P} at (0,221) size 769x19 [border: (1px solid #800080) none] - LayoutText {#text} at (0,1) size 336x18 - text run at (0,1) width 336: "This paragraph should have a thin purple top border." - LayoutTable {TABLE} at (0,256) size 769x110 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x108 - LayoutTableRow {TR} at (0,5) size 767x41 - LayoutTableCell {TD} at (5,5) size 757x41 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,3) size 753x36 - text run at (2,3) width 438: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (439,3) width 316: "This is also true of the table-testing section in the" - text run at (2,21) width 179: "second half of the test page." - LayoutTableRow {TR} at (0,51) size 767x52 - LayoutTableCell {TD} at (5,65) size 190x23 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 54x18 - text run at (2,3) width 54: "Cell one" - LayoutTableCell {TD} at (200,51) size 562x52 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,3) size 558x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (2,21) size 166x29 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 164x27 - LayoutTableRow {TR} at (0,2) size 164x23 - LayoutTableCell {TD} at (2,2) size 160x23 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 156x18 - text run at (2,3) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,382) size 769x117 - LayoutListItem {LI} at (40,0) size 729x75 [border: (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,3) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (0,21) size 729x54 - LayoutListItem {LI} at (40,0) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,75) size 729x21 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,3) size 7x18: bullet - LayoutText {#text} at (0,3) size 163x18 - text run at (0,3) width 163: "This is a second list item." - LayoutListItem {LI} at (40,96) size 729x21 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,3) size 7x18: bullet - LayoutText {#text} at (0,3) size 493x18 - text run at (0,3) width 493: "Each list item in this list should have a medium-width black border at its top." - LayoutTable {TABLE} at (0,515) size 769x428 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x426 - LayoutTableRow {TR} at (0,0) size 767x27 - LayoutTableCell {TD} at (0,0) size 767x27 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,5) size 161x18 - text run at (4,5) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,27) size 767x399 - LayoutTableCell {TD} at (0,213) size 12x27 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,5) size 4x18 - text run at (4,5) width 4: " " - LayoutTableCell {TD} at (12,27) size 755x399 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,5) size 747x36 - LayoutText {#text} at (0,0) size 723x36 - text run at (0,0) width 648: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (647,0) width 76: "This border" - text run at (0,18) width 373: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,57) size 747x28 [border: (10px double #800080) none] - LayoutText {#text} at (0,10) size 420x18 - text run at (0,10) width 420: "This paragraph should have a purple, double, 10-pixel top border." - LayoutBlockFlow {P} at (4,101) size 747x19 [border: (1px solid #800080) none] - LayoutText {#text} at (0,1) size 336x18 - text run at (0,1) width 336: "This paragraph should have a thin purple top border." - LayoutTable {TABLE} at (4,136) size 747x110 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 745x108 - LayoutTableRow {TR} at (0,5) size 745x41 - LayoutTableCell {TD} at (5,5) size 735x41 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,3) size 729x36 - text run at (2,3) width 438: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (439,3) width 292: "This is also true of the table-testing section in" - text run at (2,21) width 203: "the second half of the test page." - LayoutTableRow {TR} at (0,51) size 745x52 - LayoutTableCell {TD} at (5,65) size 185x23 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 54x18 - text run at (2,3) width 54: "Cell one" - LayoutTableCell {TD} at (195,51) size 545x52 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,3) size 541x18 - LayoutText {#text} at (0,0) size 55x18 - text run at (0,0) width 55: "Cell two" - LayoutTable {TABLE} at (2,21) size 166x29 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 164x27 - LayoutTableRow {TR} at (0,2) size 164x23 - LayoutTableCell {TD} at (2,2) size 160x23 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 156x18 - text run at (2,3) width 156: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,262) size 747x117 - LayoutListItem {LI} at (40,0) size 707x75 [border: (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,3) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 123x18 - text run at (0,0) width 123: "This is a list item..." - LayoutBlockFlow {UL} at (0,21) size 707x54 - LayoutListItem {LI} at (40,0) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 75x18 - text run at (0,0) width 75: "...and this..." - LayoutListItem {LI} at (40,18) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 118x18 - text run at (0,0) width 118: "...is a second list..." - LayoutListItem {LI} at (40,36) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 182x18 - text run at (0,0) width 182: "...nested within the list item." - LayoutListItem {LI} at (40,75) size 707x21 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,3) size 7x18: bullet - LayoutText {#text} at (0,3) size 163x18 - text run at (0,3) width 163: "This is a second list item." - LayoutListItem {LI} at (40,96) size 707x21 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-17,3) size 7x18: bullet - LayoutText {#text} at (0,3) size 493x18 - text run at (0,3) width 493: "Each list item in this list should have a medium-width black border at its top." -layer at (8,115) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png deleted file mode 100644 index f5a56fc..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt deleted file mode 100644 index 897191d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 297x45 - text run at (0,0) width 297: ".one {border-top: purple double 10px;}" - text run at (296,0) width 1: " " - text run at (0,15) width 289: ".two {border-top: purple thin solid;}" - text run at (288,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 680x18 - text run at (0,0) width 680: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 59x28 [border: (10px double #800080) none] - LayoutText {#text} at (679,0) size 59x18 - text run at (679,0) width 59: "class one" - LayoutText {#text} at (737,0) size 742x36 - text run at (737,0) width 5: "," - text run at (0,18) width 387: "which should have a 10-pixel purple double top border; and " - LayoutInline {SPAN} at (0,0) size 60x19 [border: (1px solid #800080) none] - LayoutText {#text} at (386,18) size 60x18 - text run at (386,18) width 60: "class two" - LayoutText {#text} at (445,18) size 767x36 - text run at (445,18) width 322: ", which should have a thin solid purple top border." - text run at (0,36) width 438: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,180) size 784x90 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x88 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x62 - LayoutTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 680x18 - text run at (0,0) width 680: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 59x28 [border: (10px double #800080) none] - LayoutText {#text} at (679,0) size 59x18 - text run at (679,0) width 59: "class one" - LayoutText {#text} at (737,0) size 742x36 - text run at (737,0) width 5: "," - text run at (0,18) width 387: "which should have a 10-pixel purple double top border; and " - LayoutInline {SPAN} at (0,0) size 60x19 [border: (1px solid #800080) none] - LayoutText {#text} at (386,18) size 60x18 - text run at (386,18) width 60: "class two" - LayoutText {#text} at (445,18) size 719x36 - text run at (445,18) width 274: ", which should have a thin solid purple top" - text run at (0,36) width 49: "border. " - text run at (48,36) width 439: "The line-height of the parent element should not change on any line." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png deleted file mode 100644 index 73d7c6e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt deleted file mode 100644 index b1016c6..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 759 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x759 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x759 - LayoutBlockFlow {BODY} at (8,8) size 769x743 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 430x90 - text run at (0,0) width 422: ".zero {background-color: silver; border-top-width: 0;}" - text run at (421,0) width 1: " " - text run at (0,15) width 398: ".one {border-top-width: 25px; border-style: solid;}" - text run at (397,15) width 1: " " - text run at (0,30) width 406: ".two {border-top-width: thick; border-style: solid;}" - text run at (405,30) width 1: " " - text run at (0,45) width 430: ".three {border-top-width: medium; border-style: solid;}" - text run at (429,45) width 1: " " - text run at (0,60) width 406: ".four {border-top-width: thin; border-style: solid;}" - text run at (405,60) width 1: " " - text run at (0,75) width 242: ".five {border-top-width: 25px;}" - text run at (241,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,223) size 769x46 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 383x18 - text run at (3,25) width 383: "This paragraph should have a top border width of 25 pixels." - LayoutBlockFlow {P} at (0,285) size 769x26 [border: (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,5) size 340x18 - text run at (3,5) width 340: "This paragraph should have a thick top border width." - LayoutBlockFlow {P} at (0,327) size 769x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 360x18 - text run at (3,3) width 360: "This paragraph should have a medium top border width." - LayoutBlockFlow {P} at (0,367) size 769x22 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,1) size 332x18 - text run at (3,1) width 332: "This paragraph should have a thin top border width." - LayoutBlockFlow {P} at (0,405) size 769x18 - LayoutText {#text} at (0,0) size 534x18 - text run at (0,0) width 534: "This paragraph should have no border and no extra \"padding\" on its top side, as no " - LayoutInline {CODE} at (0,0) size 94x15 - LayoutText {#text} at (533,2) size 94x15 - text run at (533,2) width 94: "border-style" - LayoutText {#text} at (627,0) size 55x18 - text run at (627,0) width 55: " was set." - LayoutTable {TABLE} at (0,439) size 704x304 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 702x302 - LayoutTableRow {TR} at (0,0) size 702x26 - LayoutTableCell {TD} at (0,0) size 702x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 702x276 - LayoutTableCell {TD} at (0,151) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 690x276 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 682x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (4,38) size 682x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,72) size 682x46 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 383x18 - text run at (3,25) width 383: "This paragraph should have a top border width of 25 pixels." - LayoutBlockFlow {P} at (4,134) size 682x26 [border: (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,5) size 340x18 - text run at (3,5) width 340: "This paragraph should have a thick top border width." - LayoutBlockFlow {P} at (4,176) size 682x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 360x18 - text run at (3,3) width 360: "This paragraph should have a medium top border width." - LayoutBlockFlow {P} at (4,216) size 682x22 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,1) size 332x18 - text run at (3,1) width 332: "This paragraph should have a thin top border width." - LayoutBlockFlow {P} at (4,254) size 682x18 - LayoutText {#text} at (0,0) size 534x18 - text run at (0,0) width 534: "This paragraph should have no border and no extra \"padding\" on its top side, as no " - LayoutInline {CODE} at (0,0) size 94x15 - LayoutText {#text} at (533,2) size 94x15 - text run at (533,2) width 94: "border-style" - LayoutText {#text} at (627,0) size 55x18 - text run at (627,0) width 55: " was set." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png deleted file mode 100644 index 90ecb520..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt deleted file mode 100644 index 92cc9dbd..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt +++ /dev/null
@@ -1,87 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 398x45 - text run at (0,0) width 398: ".one {border-top-width: 25px; border-style: solid;}" - text run at (397,0) width 1: " " - text run at (0,15) width 398: ".two {border-top-width: thin; border-style: solid;}" - text run at (397,15) width 1: " " - text run at (0,30) width 250: ".three {border-top-width: 25px;}" - text run at (249,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x100 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 176x18 - text run at (3,25) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (178,27) size 25x15 - text run at (178,27) width 25: "one" - LayoutText {#text} at (202,25) size 164x18 - text run at (202,25) width 9: ". " - text run at (210,25) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 178x22 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (368,25) size 149x18 - text run at (368,25) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (516,27) size 24x15 - text run at (516,27) width 24: "two" - LayoutText {#text} at (542,25) size 765x54 - text run at (542,25) width 226: ", which should result in a thin solid" - text run at (3,43) width 706: "border on the top side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (708,43) width 53: "There is" - text run at (3,61) width 49: "also an " - LayoutInline {SPAN} at (0,0) size 188x18 - LayoutText {#text} at (51,61) size 149x18 - text run at (51,61) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (199,63) size 40x15 - text run at (199,63) width 40: "three" - LayoutText {#text} at (238,61) size 759x36 - text run at (238,61) width 524: ", which should have no top border width or visible border because no border style" - text run at (3,79) width 51: "was set." - LayoutTable {TABLE} at (0,226) size 784x136 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x134 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x108 - LayoutTableCell {TD} at (0,67) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x108 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x100 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 176x18 - text run at (3,25) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (178,27) size 25x15 - text run at (178,27) width 25: "one" - LayoutText {#text} at (202,25) size 164x18 - text run at (202,25) width 9: ". " - text run at (210,25) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 178x22 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (368,25) size 149x18 - text run at (368,25) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (516,27) size 24x15 - text run at (516,27) width 24: "two" - LayoutText {#text} at (542,25) size 737x54 - text run at (542,25) width 191: ", which should result in a thin" - text run at (3,43) width 737: "solid border on the top side of each box in the inline element (and the UA's default border on the other three sides)." - text run at (3,61) width 105: "There is also an " - LayoutInline {SPAN} at (0,0) size 188x18 - LayoutText {#text} at (107,61) size 149x18 - text run at (107,61) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (255,63) size 40x15 - text run at (255,63) width 40: "three" - LayoutText {#text} at (294,61) size 735x36 - text run at (294,61) width 444: ", which should have no top border width or visible border because no" - text run at (3,79) width 131: "border style was set." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width-expected.png deleted file mode 100644 index e6f1f18..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width-expected.txt deleted file mode 100644 index 0345d55..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 903 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x903 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x903 - LayoutBlockFlow {BODY} at (8,8) size 769x887 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 398x90 - text run at (0,0) width 391: ".zero {background-color: silver; border-width: 0;}" - text run at (390,0) width 1: " " - text run at (0,15) width 367: ".one {border-width: 50px; border-style: solid;}" - text run at (366,15) width 1: " " - text run at (0,30) width 375: ".two {border-width: thick; border-style: solid;}" - text run at (374,30) width 1: " " - text run at (0,45) width 398: ".three {border-width: medium; border-style: solid;}" - text run at (397,45) width 1: " " - text run at (0,60) width 375: ".four {border-width: thin; border-style: solid;}" - text run at (374,60) width 1: " " - text run at (0,75) width 211: ".five {border-width: 25px;}" - text run at (210,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (0,189) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,223) size 769x118 [border: (50px solid #000000)] - LayoutText {#text} at (50,50) size 402x18 - text run at (50,50) width 402: "This element should have an overall border width of 50 pixels." - LayoutBlockFlow {P} at (0,357) size 769x28 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 350x18 - text run at (5,5) width 350: "This element should have a thick overall border width." - LayoutBlockFlow {P} at (0,401) size 769x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 371x18 - text run at (3,3) width 371: "This element should have a medium overall border width." - LayoutBlockFlow {P} at (0,441) size 769x20 [border: (1px solid #000000)] - LayoutText {#text} at (1,1) size 343x18 - text run at (1,1) width 343: "This element should have a thin overall border width." - LayoutBlockFlow {P} at (0,477) size 769x18 - LayoutText {#text} at (0,0) size 504x18 - text run at (0,0) width 504: "This element should have no border and no extra \"padding\" on any side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (503,2) size 95x15 - text run at (503,2) width 95: "border-style" - LayoutText {#text} at (597,0) size 55x18 - text run at (597,0) width 55: " was set." - LayoutTable {TABLE} at (0,511) size 674x376 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 672x374 - LayoutTableRow {TR} at (0,0) size 672x26 - LayoutTableCell {TD} at (0,0) size 672x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 672x348 - LayoutTableCell {TD} at (0,187) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 660x348 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 652x18 - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "(These will only work if " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (159,2) size 95x15 - text run at (159,2) width 95: "border-style" - LayoutText {#text} at (253,0) size 92x18 - text run at (253,0) width 92: " is supported.)" - LayoutBlockFlow {P} at (4,38) size 652x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,72) size 652x118 [border: (50px solid #000000)] - LayoutText {#text} at (50,50) size 402x18 - text run at (50,50) width 402: "This element should have an overall border width of 50 pixels." - LayoutBlockFlow {P} at (4,206) size 652x28 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 350x18 - text run at (5,5) width 350: "This element should have a thick overall border width." - LayoutBlockFlow {P} at (4,250) size 652x24 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 371x18 - text run at (3,3) width 371: "This element should have a medium overall border width." - LayoutBlockFlow {P} at (4,290) size 652x20 [border: (1px solid #000000)] - LayoutText {#text} at (1,1) size 343x18 - text run at (1,1) width 343: "This element should have a thin overall border width." - LayoutBlockFlow {P} at (4,326) size 652x18 - LayoutText {#text} at (0,0) size 504x18 - text run at (0,0) width 504: "This element should have no border and no extra \"padding\" on any side, as no " - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (503,2) size 95x15 - text run at (503,2) width 95: "border-style" - LayoutText {#text} at (597,0) size 55x18 - text run at (597,0) width 55: " was set." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png deleted file mode 100644 index 563a0f8..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt deleted file mode 100644 index 95b4c91e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt +++ /dev/null
@@ -1,86 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 367x45 - text run at (0,0) width 367: ".one {border-width: 25px; border-style: solid;}" - text run at (366,0) width 1: " " - text run at (0,15) width 367: ".two {border-width: thin; border-style: solid;}" - text run at (366,15) width 1: " " - text run at (0,30) width 219: ".three {border-width: 25px;}" - text run at (218,30) width 1: " " - LayoutBlockFlow {P} at (0,110) size 784x104 [border: (25px solid #000000)] - LayoutText {#text} at (25,25) size 176x18 - text run at (25,25) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (200,27) size 25x15 - text run at (200,27) width 25: "one" - LayoutText {#text} at (224,25) size 164x18 - text run at (224,25) width 9: ". " - text run at (232,25) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 174x20 [border: (1px solid #000000)] - LayoutText {#text} at (388,25) size 149x18 - text run at (388,25) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (536,27) size 24x15 - text run at (536,27) width 24: "two" - LayoutText {#text} at (560,25) size 726x36 - text run at (560,25) width 191: ", which should result in a thin" - text run at (25,43) width 382: "solid border on each side of each box in the inline element. " - text run at (406,43) width 106: "There is also an " - LayoutInline {SPAN} at (0,0) size 187x18 - LayoutText {#text} at (511,43) size 148x18 - text run at (511,43) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 39x15 - LayoutText {#text} at (659,45) size 39x15 - text run at (659,45) width 39: "three" - LayoutText {#text} at (698,43) size 721x36 - text run at (698,43) width 48: ", which" - text run at (25,61) width 393: "should have no border width because no border style was set." - LayoutTable {TABLE} at (0,230) size 784x140 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x138 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x112 - LayoutTableCell {TD} at (0,69) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x112 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x104 [border: (25px solid #000000)] - LayoutText {#text} at (25,25) size 176x18 - text run at (25,25) width 176: "This element has a class of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (200,27) size 25x15 - text run at (200,27) width 25: "one" - LayoutText {#text} at (224,25) size 164x18 - text run at (224,25) width 9: ". " - text run at (232,25) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 174x20 [border: (1px solid #000000)] - LayoutText {#text} at (388,25) size 149x18 - text run at (388,25) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (536,27) size 24x15 - text run at (536,27) width 24: "two" - LayoutText {#text} at (560,25) size 697x36 - text run at (560,25) width 162: ", which should result in a" - text run at (25,43) width 411: "thin solid border on each side of each box in the inline element. " - text run at (435,43) width 106: "There is also an " - LayoutInline {SPAN} at (0,0) size 187x18 - LayoutText {#text} at (540,43) size 148x18 - text run at (540,43) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (687,45) size 40x15 - text run at (687,45) width 40: "three" - LayoutText {#text} at (726,43) size 706x36 - text run at (726,43) width 5: "," - text run at (25,61) width 436: "which should have no border width because no border style was set." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear-expected.png deleted file mode 100644 index ad95799..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear-expected.txt deleted file mode 100644 index f7e3c00d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear-expected.txt +++ /dev/null
@@ -1,92 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 961 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x961 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x961 - LayoutBlockFlow {BODY} at (8,8) size 769x945 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x60 - LayoutText {#text} at (0,0) size 164x60 - text run at (0,0) width 149: ".one {clear: left;}" - text run at (148,0) width 1: " " - text run at (0,15) width 157: ".two {clear: right;}" - text run at (156,15) width 1: " " - text run at (0,30) width 164: ".three {clear: both;}" - text run at (163,30) width 1: " " - text run at (0,45) width 157: ".four {clear: none;}" - text run at (156,45) width 1: " " - LayoutImage (floating) {IMG} at (0,117) size 15x50 - LayoutBlockFlow {P} at (0,125) size 769x18 - LayoutText {#text} at (18,0) size 605x18 - text run at (18,0) width 605: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - LayoutBlockFlow (anonymous) at (0,159) size 769x18 - LayoutBR {BR} at (18,0) size 0x18 - LayoutImage (floating) {IMG} at (0,18) size 15x50 - LayoutBlockFlow {P} at (0,227) size 769x18 - LayoutText {#text} at (0,0) size 661x18 - text run at (0,0) width 661: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - LayoutBlockFlow (anonymous) at (0,261) size 769x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutImage (floating) {IMG} at (754,18) size 15x50 - LayoutBlockFlow {P} at (0,329) size 769x18 - LayoutText {#text} at (0,0) size 670x18 - text run at (0,0) width 670: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - LayoutBlockFlow (anonymous) at (0,363) size 769x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutImage (floating) {IMG} at (0,18) size 15x50 - LayoutImage (floating) {IMG} at (754,18) size 15x50 - LayoutBlockFlow {P} at (0,431) size 769x18 - LayoutText {#text} at (0,0) size 611x18 - text run at (0,0) width 611: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - LayoutImage (floating) {IMG} at (0,465) size 15x50 - LayoutImage (floating) {IMG} at (754,465) size 15x50 - LayoutBlockFlow {P} at (0,465) size 769x18 - LayoutText {#text} at (18,0) size 397x18 - text run at (18,0) width 397: "This paragraph should be between both tall orange rectangles." - LayoutBlockFlow (anonymous) at (0,499) size 769x18 - LayoutBR {BR} at (18,0) size 0x18 - LayoutTable {TABLE} at (0,517) size 692x428 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 690x426 - LayoutTableRow {TR} at (0,0) size 690x26 - LayoutTableCell {TD} at (0,0) size 690x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 690x400 - LayoutTableCell {TD} at (0,213) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 678x400 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutImage (floating) {IMG} at (4,4) size 15x50 - LayoutBlockFlow {P} at (4,4) size 670x18 - LayoutText {#text} at (18,0) size 605x18 - text run at (18,0) width 605: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - LayoutBlockFlow (anonymous) at (4,38) size 670x18 - LayoutBR {BR} at (18,0) size 0x18 - LayoutImage (floating) {IMG} at (0,18) size 15x50 - LayoutBlockFlow {P} at (4,106) size 670x18 - LayoutText {#text} at (0,0) size 661x18 - text run at (0,0) width 661: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - LayoutBlockFlow (anonymous) at (4,140) size 670x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutImage (floating) {IMG} at (655,18) size 15x50 - LayoutBlockFlow {P} at (4,208) size 670x18 - LayoutText {#text} at (0,0) size 670x18 - text run at (0,0) width 670: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - LayoutBlockFlow (anonymous) at (4,242) size 670x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutImage (floating) {IMG} at (0,18) size 15x50 - LayoutImage (floating) {IMG} at (655,18) size 15x50 - LayoutBlockFlow {P} at (4,310) size 670x18 - LayoutText {#text} at (0,0) size 611x18 - text run at (0,0) width 611: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - LayoutImage (floating) {IMG} at (4,344) size 15x50 - LayoutImage (floating) {IMG} at (659,344) size 15x50 - LayoutBlockFlow {P} at (4,344) size 670x18 - LayoutText {#text} at (18,0) size 397x18 - text run at (18,0) width 397: "This paragraph should be between both tall orange rectangles." - LayoutBlockFlow (anonymous) at (4,378) size 670x18 - LayoutBR {BR} at (18,0) size 0x18 -layer at (8,115) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear_float-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear_float-expected.png deleted file mode 100644 index c457405b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear_float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt deleted file mode 100644 index d06aaba..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt +++ /dev/null
@@ -1,161 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 775 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x775 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x774.88 - LayoutBlockFlow {BODY} at (8,8) size 784x758.88 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,31) size 784x135 - LayoutText {#text} at (0,0) size 601x135 - text run at (0,0) width 383: "P { margin: 0; padding: 0; text-align: justify;}" - text run at (382,0) width 1: " " - text run at (0,15) width 0: " " - text run at (0,30) width 375: "DIV.menu {float: left; clear: left; width: 11em;" - text run at (374,30) width 1: " " - text run at (0,45) width 453: " margin: 0; margin-bottom: 10px; padding: 0.5em;}" - text run at (452,45) width 1: " " - text run at (0,60) width 422: "DIV.menu H1 {font-size: 1.2em; margin: 0; padding: 0;}" - text run at (421,60) width 1: " " - text run at (0,75) width 437: "DIV.menu UL {margin: 0.2em 0.3em 0.2em 1em; padding: 0;}" - text run at (436,75) width 1: " " - text run at (0,90) width 601: "DIV.article {padding: 0.5em; margin: 0; margin-left: 14em; margin-right: 2em;" - text run at (600,90) width 1: " " - text run at (0,105) width 469: " color: black; background: yellow; clear: none;}" - text run at (468,105) width 1: " " - text run at (0,120) width 0: " " - LayoutBlockFlow (floating) {DIV} at (0,189) size 192x116.38 [color=#FFFFFF] [bgcolor=#008000] - LayoutBlockFlow {H1} at (8,8) size 176x22 - LayoutText {#text} at (0,0) size 82x22 - text run at (0,0) width 82: "Top menu" - LayoutBlockFlow {UL} at (24,33.19) size 155.20x72 - LayoutListItem {LI} at (0,0) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 36x18 - text run at (0,0) width 36: "green" - LayoutListItem {LI} at (0,18) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "white text" - LayoutListItem {LI} at (0,36) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 96x18 - text run at (0,0) width 96: "0.5em padding" - LayoutListItem {LI} at (0,54) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 89x18 - text run at (0,0) width 89: "0.5em margin" - LayoutBlockFlow (floating) {DIV} at (0,315.38) size 192x116.38 [color=#FFFFFF] [bgcolor=#0000FF] - LayoutBlockFlow {H1} at (8,8) size 176x22 - LayoutText {#text} at (0,0) size 112x22 - text run at (0,0) width 112: "Bottom menu" - LayoutBlockFlow {UL} at (24,33.19) size 155.20x72 - LayoutListItem {LI} at (0,0) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 108x18 - text run at (0,0) width 108: "blue background" - LayoutListItem {LI} at (0,18) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "white text" - LayoutListItem {LI} at (0,36) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 96x18 - text run at (0,0) width 96: "0.5em padding" - LayoutListItem {LI} at (0,54) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 89x18 - text run at (0,0) width 89: "0.5em margin" - LayoutBlockFlow {DIV} at (224,189) size 528x221.88 [bgcolor=#FFFF00] - LayoutBlockFlow {H1} at (8,29.44) size 512x37 - LayoutText {#text} at (0,0) size 275x37 - text run at (0,0) width 275: "The 'clear' property" - LayoutBlockFlow {P} at (8,87.88) size 512x90 - LayoutText {#text} at (0,0) size 512x90 - text run at (0,0) width 512: "This page has two floating \"menus\" on the side; one has a green background," - text run at (0,18) width 238: "and the other a blue background. " - text run at (237,18) width 275: "Due to settings on the 'float' and 'clear'" - text run at (0,36) width 512: "properties, the two menus should appear on the left side of the page, the blue" - text run at (0,54) width 512: "below the green. There should be a 10px gap between the two menus. There" - text run at (0,72) width 465: "should also be a 10px gap between the top menu and the top of the page." - LayoutBlockFlow {P} at (8,177.88) size 512x36 - LayoutText {#text} at (0,0) size 512x36 - text run at (0,0) width 512: "The top of the yellow rectangle (to which this paragraph belongs) should be" - text run at (0,18) width 339: "vertically aligned with the top of the green rectangle." - LayoutTable {TABLE} at (192,410.88) size 592x348 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 590x346 - LayoutTableRow {TR} at (0,0) size 590x26 - LayoutTableCell {TD} at (0,0) size 590x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 590x320 - LayoutTableCell {TD} at (0,173) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 578x319.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (floating) {DIV} at (4,4) size 192x116.38 [color=#FFFFFF] [bgcolor=#008000] - LayoutBlockFlow {H1} at (8,8) size 176x22 - LayoutText {#text} at (0,0) size 82x22 - text run at (0,0) width 82: "Top menu" - LayoutBlockFlow {UL} at (24,33.19) size 155.20x72 - LayoutListItem {LI} at (0,0) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 36x18 - text run at (0,0) width 36: "green" - LayoutListItem {LI} at (0,18) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "white text" - LayoutListItem {LI} at (0,36) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 96x18 - text run at (0,0) width 96: "0.5em padding" - LayoutListItem {LI} at (0,54) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 89x18 - text run at (0,0) width 89: "0.5em margin" - LayoutBlockFlow (floating) {DIV} at (4,130.38) size 192x116.38 [color=#FFFFFF] [bgcolor=#0000FF] - LayoutBlockFlow {H1} at (8,8) size 176x22 - LayoutText {#text} at (0,0) size 112x22 - text run at (0,0) width 112: "Bottom menu" - LayoutBlockFlow {UL} at (24,33.19) size 155.20x72 - LayoutListItem {LI} at (0,0) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 108x18 - text run at (0,0) width 108: "blue background" - LayoutListItem {LI} at (0,18) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "white text" - LayoutListItem {LI} at (0,36) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 96x18 - text run at (0,0) width 96: "0.5em padding" - LayoutListItem {LI} at (0,54) size 155.20x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 89x18 - text run at (0,0) width 89: "0.5em margin" - LayoutBlockFlow {DIV} at (228,4) size 314x311.88 [bgcolor=#FFFF00] - LayoutBlockFlow {H1} at (8,29.44) size 298x37 - LayoutText {#text} at (0,0) size 275x37 - text run at (0,0) width 275: "The 'clear' property" - LayoutBlockFlow {P} at (8,87.88) size 298x162 - LayoutText {#text} at (0,0) size 298x162 - text run at (0,0) width 298: "This page has two floating \"menus\" on the" - text run at (0,18) width 298: "side; one has a green background, and the" - text run at (0,36) width 174: "other a blue background. " - text run at (173,36) width 125: "Due to settings on" - text run at (0,54) width 298: "the 'float' and 'clear' properties, the two menus" - text run at (0,72) width 298: "should appear on the left side of the page, the" - text run at (0,90) width 298: "blue below the green. There should be a 10px" - text run at (0,108) width 298: "gap between the two menus. There should" - text run at (0,126) width 298: "also be a 10px gap between the top menu and" - text run at (0,144) width 124: "the top of the page." - LayoutBlockFlow {P} at (8,249.88) size 298x54 - LayoutText {#text} at (0,0) size 298x54 - text run at (0,0) width 298: "The top of the yellow rectangle (to which this" - text run at (0,18) width 298: "paragraph belongs) should be vertically" - text run at (0,36) width 275: "aligned with the top of the green rectangle." -layer at (8,187) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,179) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float-expected.png deleted file mode 100644 index 25038d5..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float-expected.txt deleted file mode 100644 index 20b2779..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 157x45 - text run at (0,0) width 149: ".one {float: left;}" - text run at (148,0) width 1: " " - text run at (0,15) width 157: ".two {float: right;}" - text run at (156,15) width 1: " " - text run at (0,30) width 0: " " - LayoutImage (floating) {IMG} at (0,102) size 15x50 - LayoutBlockFlow {P} at (0,110) size 784x36 - LayoutText {#text} at (15,0) size 736x36 - text run at (15,0) width 609: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (623,0) width 128: "In this case, it is the" - text run at (15,18) width 259: "image which has been floated to the left." - LayoutBlockFlow (anonymous) at (0,162) size 784x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutImage (floating) {IMG} at (769,198) size 15x50 - LayoutBlockFlow {P} at (0,206) size 784x36 - LayoutText {#text} at (0,0) size 745x36 - text run at (0,0) width 618: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (617,0) width 128: "In this case, it is the" - text run at (0,18) width 268: "image which has been floated to the right." - LayoutTable {TABLE} at (0,258) size 784x174 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x172 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x146 - LayoutTableCell {TD} at (0,86) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x146 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutImage (floating) {IMG} at (4,4) size 15x50 - LayoutBlockFlow {P} at (4,4) size 762x36 - LayoutText {#text} at (15,0) size 736x36 - text run at (15,0) width 609: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (623,0) width 128: "In this case, it is the" - text run at (15,18) width 259: "image which has been floated to the left." - LayoutBlockFlow (anonymous) at (4,56) size 762x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutImage (floating) {IMG} at (751,92) size 15x50 - LayoutBlockFlow {P} at (4,100) size 762x36 - LayoutText {#text} at (0,0) size 745x36 - text run at (0,0) width 618: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (617,0) width 128: "In this case, it is the" - text run at (0,18) width 268: "image which has been floated to the right." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,196) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,188) size 784x2 [border: (1px inset #EEEEEE)] -layer at (25,375) size 762x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,82) size 762x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png deleted file mode 100644 index ad49916e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt deleted file mode 100644 index 3f91390..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt +++ /dev/null
@@ -1,244 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 699 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x699 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x699 - LayoutBlockFlow {BODY} at (8,8) size 769x671 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,31) size 769x195 - LayoutText {#text} at (0,0) size 500x195 - text run at (0,0) width 383: "P { margin: 0; padding: 0; text-align: justify;}" - text run at (382,0) width 1: " " - text run at (0,15) width 0: " " - text run at (0,30) width 328: "DIV.yellow, DIV.blue, DIV.red, DIV.green {" - text run at (327,30) width 1: " " - text run at (0,45) width 328: " width: 60px; padding: 20px; margin: 10px;" - text run at (327,45) width 1: " " - text run at (0,60) width 461: " border: 20px solid black; float: left; text-align: center;" - text run at (460,60) width 1: " " - text run at (0,75) width 352: " font-family: \"Times New Roman\",Times,serif;}" - text run at (351,75) width 1: " " - text run at (0,90) width 500: "DIV.yellow {margin-left: 0px; background: yellow; color: black;}" - text run at (499,90) width 1: " " - text run at (0,105) width 328: "DIV.blue {background: blue; color: white;}" - text run at (327,105) width 1: " " - text run at (0,120) width 313: "DIV.red {background: red; color: black;}" - text run at (312,120) width 1: " " - text run at (0,135) width 344: "DIV.green {background: green; color: white;}" - text run at (343,135) width 1: " " - text run at (0,150) width 188: "DIV.below {clear: both;}" - text run at (187,150) width 1: " " - text run at (0,165) width 196: "TABLE {margin: 20px 0px;}" - text run at (195,165) width 1: " " - text run at (0,180) width 0: " " - LayoutBlockFlow {P} at (0,249) size 769x36 - LayoutText {#text} at (0,0) size 769x36 - text run at (0,0) width 769: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this" - text run at (0,18) width 446: "page indicates how the DIV elements should be laid out horizontally. " - text run at (445,18) width 223: "They should align with each other." - LayoutBlockFlow (floating) {DIV} at (0,295) size 140x98 [bgcolor=#FFFF00] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 46x17 - text run at (0,0) width 46: "Yellow" - LayoutBlockFlow (floating) {DIV} at (160,295) size 140x98 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 31x17 - text run at (0,0) width 31: "Blue" - LayoutBlockFlow (floating) {DIV} at (320,295) size 140x98 [bgcolor=#FF0000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 26x17 - text run at (0,0) width 26: "Red" - LayoutBlockFlow (floating) {DIV} at (480,295) size 140x98 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 40x17 - text run at (0,0) width 40: "Green" - LayoutBlockFlow {DIV} at (0,403) size 769x19 - LayoutTable {TABLE} at (0,0) size 620x19 - LayoutTableSection {TBODY} at (0,0) size 620x19 - LayoutTableRow {TR} at (0,0) size 620x19 - LayoutTableCell {TD} at (0,9) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (20,9) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (120,9) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - LayoutTableCell {TD} at (140,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (160,9) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (180,9) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (280,9) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (300,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (320,9) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (340,9) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (440,0) size 20x19 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutText {#text} at (0,1) size 5x18 - text run at (0,1) width 5: ";" - LayoutTableCell {TD} at (460,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (480,9) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (500,9) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (600,9) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTable {TABLE} at (0,442) size 769x229 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x227 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x201 - LayoutTableCell {TD} at (0,113) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x201 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x36 - LayoutText {#text} at (0,0) size 747x36 - text run at (0,0) width 747: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this" - text run at (0,18) width 446: "page indicates how the DIV elements should be laid out horizontally. " - text run at (445,18) width 223: "They should align with each other." - LayoutBlockFlow (floating) {DIV} at (4,50) size 140x98 [bgcolor=#FFFF00] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 46x17 - text run at (0,0) width 46: "Yellow" - LayoutBlockFlow (floating) {DIV} at (164,50) size 140x98 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 31x17 - text run at (0,0) width 31: "Blue" - LayoutBlockFlow (floating) {DIV} at (324,50) size 140x98 [bgcolor=#FF0000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 26x17 - text run at (0,0) width 26: "Red" - LayoutBlockFlow (floating) {DIV} at (484,50) size 140x98 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x18 - LayoutText {#text} at (0,0) size 40x17 - text run at (0,0) width 40: "Green" - LayoutBlockFlow {DIV} at (4,158) size 747x19 - LayoutTable {TABLE} at (0,0) size 620x19 - LayoutTableSection {TBODY} at (0,0) size 620x19 - LayoutTableRow {TR} at (0,0) size 620x19 - LayoutTableCell {TD} at (0,9) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (20,9) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (120,9) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - LayoutTableCell {TD} at (140,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (160,9) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (180,9) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (280,9) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (300,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (320,9) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (340,9) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (440,0) size 20x19 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutText {#text} at (0,1) size 5x18 - text run at (0,1) width 5: ";" - LayoutTableCell {TD} at (460,9) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (480,9) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (500,9) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (600,9) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 -layer at (8,247) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,239) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (28,420) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (148,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (168,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (188,420) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (288,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (308,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (328,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (348,420) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (448,411) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (468,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (488,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (508,420) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (608,420) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (25,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (45,644) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (165,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (185,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (205,644) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (305,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (325,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (345,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (365,644) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (465,635) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (485,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (505,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (525,644) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (625,644) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_margin-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_margin-expected.png deleted file mode 100644 index d4855ce..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt deleted file mode 100644 index a9d8823..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt +++ /dev/null
@@ -1,165 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1902 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1902 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1902 - LayoutBlockFlow {BODY} at (8,8) size 769x1886 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x135 - LayoutText {#text} at (0,0) size 547x135 - text run at (0,0) width 336: "P.test {background: white; font-size: 20px;" - text run at (335,0) width 1: " " - text run at (0,15) width 547: " margin-left: 30px; margin-right: 10px; padding: 0; border: 0;}" - text run at (546,15) width 1: " " - text run at (0,30) width 305: "IMG {padding: 0; border: 0; margin: 0;}" - text run at (304,30) width 1: " " - text run at (0,45) width 196: "P.test IMG {float: left;}" - text run at (195,45) width 1: " " - text run at (0,60) width 344: "#img2 {margin-top: 30px; margin-left: 30px;}" - text run at (343,60) width 1: " " - text run at (0,75) width 359: "#img3 {margin-top: -30px; margin-left: -30px;}" - text run at (358,75) width 1: " " - text run at (0,90) width 375: "#img4 {margin-right: 30px; margin-bottom: 30px;}" - text run at (374,90) width 1: " " - text run at (0,105) width 391: "#img5 {margin-right: -30px; margin-bottom: -30px;}" - text run at (390,105) width 1: " " - text run at (0,120) width 0: " " - LayoutBlockFlow {P} at (30,204) size 729x92 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 724x92 - text run at (0,0) width 656: "This paragraph should have a white background which extends to the edges of the" - text run at (0,23) width 120: "element's box. " - text run at (119,23) width 437: "There is no padding set on this paragraph whatsoever. " - text run at (555,23) width 164: "If the background of" - text run at (0,46) width 724: "the entire box is not white, this may cause problems with the following tests; at any rate, it" - text run at (0,69) width 220: "must be taken into account." - LayoutBlockFlow {P} at (30,316) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (60,0) size 712x115 - text run at (60,0) width 626: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 118: "nothing more. " - text run at (177,23) width 535: "The edges of the white background should line up with the top and" - text run at (60,46) width 193: "left edges of the image. " - text run at (252,46) width 448: "This paragraph should have a white background, first of" - text run at (0,69) width 422: "all, which extends to the edges of the element's box. " - text run at (421,69) width 246: "There is no padding set on this" - text run at (0,92) width 180: "paragraph whatsoever." - LayoutBlockFlow {P} at (30,451) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (30,30) size 60x60 - LayoutText {#text} at (90,0) size 723x115 - text run at (90,0) width 608: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,23) width 601: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,46) width 397: "box, and displace the paragraph text accordingly. " - text run at (486,46) width 237: "This paragraph should have a" - text run at (90,69) width 628: "white background, first of all, which extends to the edges of the element's box." - text run at (0,92) width 431: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,586) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (-30,-30) size 60x60 - LayoutText {#text} at (30,0) size 729x115 - text run at (30,0) width 699: "The image in the upper left corner of this paragraph should be pushed up and to the left" - text run at (30,23) width 698: "30 pixels each from the upper left corner of the paragraph's box, thus causing the edges" - text run at (0,46) width 573: "of the white background to align with the thick gray lines in the image. " - text run at (572,46) width 122: "This paragraph" - text run at (0,69) width 703: "should have a white background, first of all, which extends to the edges of the element's" - text run at (0,92) width 40: "box. " - text run at (40,92) width 431: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,721) size 729x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (90,0) size 722x138 - text run at (90,0) width 626: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (90,23) width 632: "the edges of the white background should line up with the top and left edges of" - text run at (90,46) width 89: "the image. " - text run at (178,46) width 532: "However, there should be 30 pixels of space between the right and" - text run at (90,69) width 483: "bottom edges of the image and the paragraph text around it. " - text run at (572,69) width 121: "This paragraph" - text run at (0,92) width 703: "should have a white background, first of all, which extends to the edges of the element's" - text run at (0,115) width 40: "box. " - text run at (40,115) width 431: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,879) size 729x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (30,0) size 722x138 - text run at (30,0) width 656: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,23) width 691: "edges of the white background should line up with the top and left edges of the image." - text run at (0,46) width 695: "However, the text should overlap the image's right and bottom sides, lining up with the" - text run at (0,69) width 238: "thick gray lines in the image. " - text run at (237,69) width 478: "This paragraph should have a white background, first of all," - text run at (0,92) width 392: "which extends to the edges of the element's box. " - text run at (391,92) width 331: "There is no padding set on this paragraph" - text run at (0,115) width 95: "whatsoever." - LayoutTable {TABLE} at (0,1037) size 769x849 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x847 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x821 - LayoutTableCell {TD} at (0,423) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x821 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (34,4) size 707x92 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 698x92 - text run at (0,0) width 656: "This paragraph should have a white background which extends to the edges of the" - text run at (0,23) width 120: "element's box. " - text run at (119,23) width 437: "There is no padding set on this paragraph whatsoever. " - text run at (555,23) width 143: "If the background" - text run at (0,46) width 690: "of the entire box is not white, this may cause problems with the following tests; at any" - text run at (0,69) width 276: "rate, it must be taken into account." - LayoutBlockFlow {P} at (34,116) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (60,0) size 691x115 - text run at (60,0) width 626: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 118: "nothing more. " - text run at (177,23) width 501: "The edges of the white background should line up with the top" - text run at (60,46) width 227: "and left edges of the image. " - text run at (286,46) width 390: "This paragraph should have a white background," - text run at (0,69) width 480: "first of all, which extends to the edges of the element's box. " - text run at (479,69) width 212: "There is no padding set on" - text run at (0,92) width 214: "this paragraph whatsoever." - LayoutBlockFlow {P} at (34,251) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (30,30) size 60x60 - LayoutText {#text} at (90,0) size 698x115 - text run at (90,0) width 608: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,23) width 601: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,46) width 397: "box, and displace the paragraph text accordingly. " - text run at (486,46) width 180: "This paragraph should" - text run at (90,69) width 565: "have a white background, first of all, which extends to the edges of the" - text run at (0,92) width 120: "element's box. " - text run at (119,92) width 432: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,386) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (-30,-30) size 60x60 - LayoutText {#text} at (30,0) size 697x115 - text run at (30,0) width 667: "The image in the upper left corner of this paragraph should be pushed up and to the" - text run at (30,23) width 650: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing" - text run at (0,46) width 653: "the edges of the white background to align with the thick gray lines in the image. " - text run at (652,46) width 37: "This" - text run at (0,69) width 679: "paragraph should have a white background, first of all, which extends to the edges of" - text run at (0,92) width 150: "the element's box. " - text run at (149,92) width 431: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,521) size 707x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (90,0) size 706x138 - text run at (90,0) width 593: "The image in the upper left corner of this paragraph should be floated left," - text run at (90,23) width 594: "and the edges of the white background should line up with the top and left" - text run at (90,46) width 161: "edges of the image. " - text run at (250,46) width 456: "However, there should be 30 pixels of space between the" - text run at (90,69) width 559: "right and bottom edges of the image and the paragraph text around it. " - text run at (648,69) width 37: "This" - text run at (0,92) width 679: "paragraph should have a white background, first of all, which extends to the edges of" - text run at (0,115) width 150: "the element's box. " - text run at (149,115) width 431: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,679) size 707x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (30,0) size 697x138 - text run at (30,0) width 656: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,23) width 632: "edges of the white background should line up with the top and left edges of the" - text run at (0,46) width 59: "image. " - text run at (58,46) width 626: "However, the text should overlap the image's right and bottom sides, lining up" - text run at (0,69) width 308: "with the thick gray lines in the image. " - text run at (307,69) width 390: "This paragraph should have a white background," - text run at (0,92) width 480: "first of all, which extends to the edges of the element's box. " - text run at (479,92) width 212: "There is no padding set on" - text run at (0,115) width 214: "this paragraph whatsoever." -layer at (8,190) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,182) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png deleted file mode 100644 index a2bbe7d6..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt deleted file mode 100644 index 0d664fd..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt +++ /dev/null
@@ -1,377 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2786 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2786 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2786 - LayoutBlockFlow {BODY} at (8,8) size 769x2770 [bgcolor=#CCCCCC] - LayoutBlockFlow (floating) {P} at (0,0) size 384.50x36 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 385x36 - text run at (0,0) width 385: "This paragraph is of class \"one\". It has a width of 50% and" - text run at (0,18) width 128: "is floated to the left." - LayoutBlockFlow {P} at (0,0) size 769x90 - LayoutText {#text} at (384,0) size 769x90 - text run at (384,0) width 385: "This paragraph should start on the right side of a yellow" - text run at (384,18) width 385: "box which contains the previous paragraph. Since the text" - text run at (0,36) width 769: "of this element is much longer than the text in the previous element, the text will wrap around the yellow box. There is" - text run at (0,54) width 769: "no padding, border or margins on this and the previous element, so the text of the two elements should be very close to" - text run at (0,72) width 70: "each other." - LayoutBlockFlow (anonymous) at (0,90) size 769x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow (anonymous) at (0,126) size 769x91 - LayoutBlockFlow (floating) {P} at (0,0) size 769x72 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 769x72 - text run at (0,0) width 769: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" - text run at (0,18) width 769: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides" - text run at (0,36) width 769: "and a orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added" - text run at (0,54) width 265: "to this paragraph for diagnostic purposes." - LayoutImage {IMG} at (0,72) size 15x15 - LayoutText {#text} at (15,73) size 4x18 - text run at (15,73) width 4: " " - LayoutBR {BR} at (19,87) size 0x0 - LayoutBlockFlow (anonymous) at (0,235) size 769x108 - LayoutBlockFlow (floating) {P} at (0,0) size 384.50x108 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 385x108 - text run at (0,0) width 384: "This paragraph is floated to the left and the orange square" - text run at (0,18) width 384: "image should appear to the right of the paragraph. This" - text run at (0,36) width 385: "paragraph has a yellow background and no padding, margin" - text run at (0,54) width 385: "or border. The right edge of this yellow box should be" - text run at (0,72) width 385: "horizontally aligned with the left edge of the yellow box" - text run at (0,90) width 81: "undernearth." - LayoutImage {IMG} at (384.50,0) size 15x15 - LayoutText {#text} at (399,1) size 5x18 - text run at (399,1) width 5: " " - LayoutBR {BR} at (403,15) size 1x0 - LayoutBlockFlow (anonymous) at (0,361) size 769x108 - LayoutBlockFlow (floating) {P} at (384.50,0) size 384.50x108 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 385x108 - text run at (0,0) width 384: "This paragraph is floated to the right (using a STYLE" - text run at (0,18) width 384: "attribute) and the orange square image should appear to the" - text run at (0,36) width 384: "left of the paragraph. This paragraph has a yellow" - text run at (0,54) width 384: "background and no padding, margin or border. The left" - text run at (0,72) width 385: "edge of this yellow box should be horizonally aligned with" - text run at (0,90) width 251: "the right edge of the yellow box above." - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,1) size 4x18 - text run at (15,1) width 4: " " - LayoutBR {BR} at (19,15) size 0x0 - LayoutBlockFlow {P} at (0,487) size 769x72 - LayoutBlockFlow (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 22x37 - text run at (0,0) width 22: "T" - LayoutText {#text} at (48,0) size 769x72 - text run at (48,0) width 721: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as" - text run at (48,18) width 529: "well as bold, with a content width of 1.5em and a background-color of silver. " - text run at (576,18) width 193: "The top of the big letter \"T\"" - text run at (48,36) width 721: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-" - text run at (0,54) width 33: "cap\"." - LayoutBlockFlow (anonymous) at (0,559) size 769x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow (floating) {P} at (423,605) size 336x214 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - LayoutText {#text} at (8,8) size 320x198 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort" - text run at (8,26) width 320: "of like a 'sidebar' in a magazine article. Its width" - text run at (8,44) width 320: "is 20em so the box should not be reformatted" - text run at (8,62) width 320: "when the size of the viewport is changed (e.g." - text run at (8,80) width 320: "when the window is resized). The background" - text run at (8,98) width 320: "color of the element is yellow, and there should" - text run at (8,116) width 320: "be a 3px solid red border outside a 5px wide" - text run at (8,134) width 320: "padding. Also, the element has a 10px wide" - text run at (8,152) width 320: "margin around it where the blue background of" - text run at (8,170) width 320: "the paragraph in the normal flow should shine" - text run at (8,188) width 54: "through." - LayoutBlockFlow {P} at (0,595) size 769x216 [bgcolor=#66CCFF] - LayoutText {#text} at (0,0) size 413x216 - text run at (0,0) width 413: "This paragraph is not floating. If there is enough room, the" - text run at (0,18) width 413: "textual content of the paragraph should appear on the left side of" - text run at (0,36) width 230: "the yellow \"sidebar\" on the right. " - text run at (229,36) width 184: "The content of this element" - text run at (0,54) width 274: "should flow around the floated element. " - text run at (273,54) width 140: "However, the floated" - text run at (0,72) width 413: "element may or may not be obscured by the blue background of" - text run at (0,90) width 413: "this element, as the specification does not say which is drawn" - text run at (0,108) width 64: "\"on top.\" " - text run at (63,108) width 350: "Even if the floated element is obscured, it still forces" - text run at (0,126) width 323: "the content of this element to flow around it. " - text run at (322,126) width 91: "If the floated" - text run at (0,144) width 413: "element is not obscured, then the blue rectangle of this" - text run at (0,162) width 413: "paragraph should extend 10px above and to the right of the" - text run at (0,180) width 413: "sidebar's red border, due to the margin styles set for the floated" - text run at (0,198) width 55: "element." - LayoutBlockFlow (anonymous) at (0,811) size 769x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow {DIV} at (0,847) size 769x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - LayoutBlockFlow (floating) {DIV} at (425,14) size 330x244 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (5,5) size 320x234 - LayoutText {#text} at (0,0) size 320x234 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element" - text run at (0,18) width 320: "which is floated to the right. The width of the" - text run at (0,36) width 320: "DIV element is 20em. The background is yellow" - text run at (0,54) width 320: "and there is a 5px padding, a 10px margin and no" - text run at (0,72) width 320: "border. Since it is floated, the yellow box should" - text run at (0,90) width 320: "be rendered on top of the background and borders" - text run at (0,108) width 320: "of adjacent non-floated elements. To the left of" - text run at (0,126) width 320: "this yellow box there should be a short paragraph" - text run at (0,144) width 320: "with a blue background and a red border. The" - text run at (0,162) width 320: "yellow box should be rendered on top of the" - text run at (0,180) width 320: "bottom red border. I.e., the bottom red border will" - text run at (0,198) width 320: "appear broken where it's overlaid by the yellow" - text run at (0,216) width 63: "rectangle." - LayoutBlockFlow {P} at (4,4) size 761x18 - LayoutText {#text} at (0,0) size 274x18 - text run at (0,0) width 274: "See description in the box on the right side" - LayoutBlockFlow (anonymous) at (0,873) size 769x242 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow (floating) {DIV} at (0,1133) size 192.25x72 [bgcolor=#66CCFF] - LayoutBlockFlow {P} at (0,0) size 192.25x72 - LayoutText {#text} at (0,0) size 193x72 - text run at (0,0) width 192: "This paragraph is inside a" - text run at (0,18) width 193: "DIV which is floated left. Its" - text run at (0,36) width 192: "background is blue and the" - text run at (0,54) width 89: "width is 25%." - LayoutBlockFlow (floating) {DIV} at (576.75,1133) size 192.25x72 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 192.25x72 - LayoutText {#text} at (0,0) size 192x72 - text run at (0,0) width 192: "This paragraph is inside a" - text run at (0,18) width 192: "DIV which is floated right. Its" - text run at (0,36) width 192: "background is yellow and the" - text run at (0,54) width 89: "width is 25%." - LayoutBlockFlow {P} at (0,1133) size 769x36 - LayoutText {#text} at (192,0) size 384x36 - text run at (192,0) width 384: "This paragraph should appear between a blue box (on the" - text run at (192,18) width 31: "left) " - text run at (222,18) width 204: "and a yellow box (on the right)." - LayoutBlockFlow (anonymous) at (0,1169) size 769x36 - LayoutBR {BR} at (192,0) size 1x18 - LayoutBlockFlow (anonymous) at (0,1223) size 769x126 - LayoutBlockFlow (floating) {DIV} at (0,0) size 576.75x126 [bgcolor=#66CCFF] - LayoutBlockFlow (floating) {DIV} at (422.56,0) size 144.19x36 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 144.19x36 - LayoutText {#text} at (0,0) size 145x36 - text run at (0,0) width 145: "See description in the" - text run at (0,18) width 127: "box on the left side." - LayoutBlockFlow {P} at (0,0) size 576.75x126 - LayoutText {#text} at (0,0) size 577x126 - text run at (0,0) width 423: "This paragraph is inside a DIV which is floated left. The" - text run at (0,18) width 422: "background of the DIV element is blue and its width is 75%. This" - text run at (0,36) width 407: "text should all be inside the blue rectangle. The blue DIV " - text run at (406,36) width 170: "element has another DIV" - text run at (0,54) width 224: "element as a child. It has a yellow " - text run at (223,54) width 353: "background color and is floated to the right. Since it is" - text run at (0,72) width 12: "a " - text run at (11,72) width 410: "child of the blue DIV, the yellow DIV should appear inside the " - text run at (420,72) width 157: "blue rectangle. Due to it" - text run at (0,90) width 236: "being floated to the right and having " - text run at (235,90) width 342: "a 10px right margin, the yellow rectange should have" - text run at (0,108) width 79: "a 10px blue " - text run at (78,108) width 144: "stripe on its right side." - LayoutBR {BR} at (576,0) size 1x18 - LayoutTable {TABLE} at (0,1367) size 769x1403 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1401 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x1375 - LayoutTableCell {TD} at (0,700) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x1375 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (floating) {P} at (4,4) size 373.50x36 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 373x36 - text run at (0,0) width 373: "This paragraph is of class \"one\". It has a width of 50%" - text run at (0,18) width 155: "and is floated to the left." - LayoutBlockFlow {P} at (4,4) size 747x90 - LayoutText {#text} at (373,0) size 747x90 - text run at (373,0) width 374: "This paragraph should start on the right side of a yellow" - text run at (373,18) width 374: "box which contains the previous paragraph. Since the text" - text run at (0,36) width 747: "of this element is much longer than the text in the previous element, the text will wrap around the yellow box. There" - text run at (0,54) width 747: "is no padding, border or margins on this and the previous element, so the text of the two elements should be very" - text run at (0,72) width 123: "close to each other." - LayoutBlockFlow (anonymous) at (4,94) size 747x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow (anonymous) at (4,130) size 747x91 - LayoutBlockFlow (floating) {P} at (0,0) size 747x72 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 747x72 - text run at (0,0) width 747: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its" - text run at (0,18) width 747: "parent element allows it to be. Therefore, even though the element is floated, there is no room for other content on" - text run at (0,36) width 747: "the sides and a orange square image should be seen AFTER the paragraph, not next to it. A yellow background has" - text run at (0,54) width 342: "been added to this paragraph for diagnostic purposes." - LayoutImage {IMG} at (0,72) size 15x15 - LayoutText {#text} at (15,73) size 4x18 - text run at (15,73) width 4: " " - LayoutBR {BR} at (19,87) size 0x0 - LayoutBlockFlow (anonymous) at (4,239) size 747x108 - LayoutBlockFlow (floating) {P} at (0,0) size 373.50x108 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 374x108 - text run at (0,0) width 373: "This paragraph is floated to the left and the orange square" - text run at (0,18) width 373: "image should appear to the right of the paragraph. This" - text run at (0,36) width 374: "paragraph has a yellow background and no padding," - text run at (0,54) width 373: "margin or border. The right edge of this yellow box" - text run at (0,72) width 373: "should be horizontally aligned with the left edge of the" - text run at (0,90) width 156: "yellow box undernearth." - LayoutImage {IMG} at (373.50,0) size 15x15 - LayoutText {#text} at (388,1) size 5x18 - text run at (388,1) width 5: " " - LayoutBR {BR} at (392,15) size 1x0 - LayoutBlockFlow (anonymous) at (4,365) size 747x108 - LayoutBlockFlow (floating) {P} at (373.50,0) size 373.50x108 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 374x108 - text run at (0,0) width 373: "This paragraph is floated to the right (using a STYLE" - text run at (0,18) width 374: "attribute) and the orange square image should appear to" - text run at (0,36) width 374: "the left of the paragraph. This paragraph has a yellow" - text run at (0,54) width 373: "background and no padding, margin or border. The left" - text run at (0,72) width 373: "edge of this yellow box should be horizonally aligned" - text run at (0,90) width 284: "with the right edge of the yellow box above." - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,1) size 4x18 - text run at (15,1) width 4: " " - LayoutBR {BR} at (19,15) size 0x0 - LayoutBlockFlow {P} at (4,491) size 747x72 - LayoutBlockFlow (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 22x37 - text run at (0,0) width 22: "T" - LayoutText {#text} at (48,0) size 747x72 - text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph," - text run at (48,18) width 519: "as well as bold, with a content width of 1.5em and a background-color of silver. " - text run at (566,18) width 181: "The top of the big letter \"T\"" - text run at (48,36) width 699: "should be vertically aligned with the top of the first line of this paragraph. This is commonly known as" - text run at (0,54) width 74: "\"drop-cap\"." - LayoutBlockFlow (anonymous) at (4,563) size 747x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow (floating) {P} at (405,609) size 336x214 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - LayoutText {#text} at (8,8) size 320x198 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort" - text run at (8,26) width 320: "of like a 'sidebar' in a magazine article. Its width" - text run at (8,44) width 320: "is 20em so the box should not be reformatted" - text run at (8,62) width 320: "when the size of the viewport is changed (e.g." - text run at (8,80) width 320: "when the window is resized). The background" - text run at (8,98) width 320: "color of the element is yellow, and there should" - text run at (8,116) width 320: "be a 3px solid red border outside a 5px wide" - text run at (8,134) width 320: "padding. Also, the element has a 10px wide" - text run at (8,152) width 320: "margin around it where the blue background of" - text run at (8,170) width 320: "the paragraph in the normal flow should shine" - text run at (8,188) width 54: "through." - LayoutBlockFlow {P} at (4,599) size 747x216 [bgcolor=#66CCFF] - LayoutText {#text} at (0,0) size 391x216 - text run at (0,0) width 391: "This paragraph is not floating. If there is enough room, the" - text run at (0,18) width 391: "textual content of the paragraph should appear on the left" - text run at (0,36) width 269: "side of the yellow \"sidebar\" on the right. " - text run at (268,36) width 123: "The content of this" - text run at (0,54) width 329: "element should flow around the floated element. " - text run at (328,54) width 63: "However," - text run at (0,72) width 391: "the floated element may or may not be obscured by the blue" - text run at (0,90) width 391: "background of this element, as the specification does not say" - text run at (0,108) width 184: "which is drawn \"on top.\" " - text run at (183,108) width 208: "Even if the floated element is" - text run at (0,126) width 391: "obscured, it still forces the content of this element to flow" - text run at (0,144) width 71: "around it. " - text run at (70,144) width 321: "If the floated element is not obscured, then the" - text run at (0,162) width 391: "blue rectangle of this paragraph should extend 10px above" - text run at (0,180) width 391: "and to the right of the sidebar's red border, due to the margin" - text run at (0,198) width 211: "styles set for the floated element." - LayoutBlockFlow (anonymous) at (4,815) size 747x18 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow {DIV} at (4,851) size 747x26 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - LayoutBlockFlow (floating) {DIV} at (403,14) size 330x244 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (5,5) size 320x234 - LayoutText {#text} at (0,0) size 320x234 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element" - text run at (0,18) width 320: "which is floated to the right. The width of the" - text run at (0,36) width 320: "DIV element is 20em. The background is yellow" - text run at (0,54) width 320: "and there is a 5px padding, a 10px margin and no" - text run at (0,72) width 320: "border. Since it is floated, the yellow box should" - text run at (0,90) width 320: "be rendered on top of the background and borders" - text run at (0,108) width 320: "of adjacent non-floated elements. To the left of" - text run at (0,126) width 320: "this yellow box there should be a short paragraph" - text run at (0,144) width 320: "with a blue background and a red border. The" - text run at (0,162) width 320: "yellow box should be rendered on top of the" - text run at (0,180) width 320: "bottom red border. I.e., the bottom red border will" - text run at (0,198) width 320: "appear broken where it's overlaid by the yellow" - text run at (0,216) width 63: "rectangle." - LayoutBlockFlow {P} at (4,4) size 739x18 - LayoutText {#text} at (0,0) size 274x18 - text run at (0,0) width 274: "See description in the box on the right side" - LayoutBlockFlow (anonymous) at (4,877) size 747x242 - LayoutBR {BR} at (0,0) size 0x18 - LayoutBlockFlow (floating) {DIV} at (4,1137) size 186.75x72 [bgcolor=#66CCFF] - LayoutBlockFlow {P} at (0,0) size 186.75x72 - LayoutText {#text} at (0,0) size 187x72 - text run at (0,0) width 187: "This paragraph is inside a" - text run at (0,18) width 187: "DIV which is floated left. Its" - text run at (0,36) width 187: "background is blue and the" - text run at (0,54) width 89: "width is 25%." - LayoutBlockFlow (floating) {DIV} at (564.25,1137) size 186.75x72 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 186.75x72 - LayoutText {#text} at (0,0) size 187x72 - text run at (0,0) width 187: "This paragraph is inside a" - text run at (0,18) width 186: "DIV which is floated right." - text run at (0,36) width 20: "Its " - text run at (20,36) width 166: "background is yellow and" - text run at (0,54) width 112: "the width is 25%." - LayoutBlockFlow {P} at (4,1137) size 747x36 - LayoutText {#text} at (186,0) size 374x36 - text run at (186,0) width 374: "This paragraph should appear between a blue box (on the" - text run at (186,18) width 32: "left) " - text run at (217,18) width 203: "and a yellow box (on the right)." - LayoutBlockFlow (anonymous) at (4,1173) size 747x36 - LayoutBR {BR} at (186,0) size 1x18 - LayoutBlockFlow (anonymous) at (4,1227) size 747x126 - LayoutBlockFlow (floating) {DIV} at (0,0) size 560.25x126 [bgcolor=#66CCFF] - LayoutBlockFlow (floating) {DIV} at (410.19,0) size 140.06x36 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 140.06x36 - LayoutText {#text} at (0,0) size 140x36 - text run at (0,0) width 140: "See description in the" - text run at (0,18) width 127: "box on the left side." - LayoutBlockFlow {P} at (0,0) size 560.25x126 - LayoutText {#text} at (0,0) size 561x126 - text run at (0,0) width 410: "This paragraph is inside a DIV which is floated left. The" - text run at (0,18) width 410: "background of the DIV element is blue and its width is 75%." - text run at (0,36) width 35: "This " - text run at (34,36) width 394: "text should all be inside the blue rectangle. The blue DIV " - text run at (427,36) width 133: "element has another" - text run at (0,54) width 269: "DIV element as a child. It has a yellow " - text run at (268,54) width 293: "background color and is floated to the right." - text run at (0,72) width 91: "Since it is a " - text run at (90,72) width 443: "child of the blue DIV, the yellow DIV should appear inside the " - text run at (532,72) width 29: "blue" - text run at (0,90) width 395: "rectangle. Due to it being floated to the right and having " - text run at (394,90) width 166: "a 10px right margin, the" - text run at (0,108) width 266: "yellow rectange should have a 10px blue " - text run at (265,108) width 143: "stripe on its right side." - LayoutBR {BR} at (560,0) size 1x18 -layer at (8,124) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,116) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,359) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,351) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,485) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,477) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,593) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,585) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,845) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,837) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1131) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1123) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1221) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1213) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1365) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1357) size 769x2 [border: (1px inset #EEEEEE)] -layer at (25,1522) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,120) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1631) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,229) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1757) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,355) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1883) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,481) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1991) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,589) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2243) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,841) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2529) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1127) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2619) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1217) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2763) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1361) size 747x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/height-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/height-expected.png deleted file mode 100644 index 45612ba9..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/height-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/height-expected.txt deleted file mode 100644 index ca57c1c5..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/height-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 974 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x974 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x974 - LayoutBlockFlow {BODY} at (8,8) size 769x958 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x45 - LayoutText {#text} at (0,0) size 164x45 - text run at (0,0) width 157: ".one {height: 50px;}" - text run at (156,0) width 1: " " - text run at (0,15) width 164: ".two {height: 100px;}" - text run at (163,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow (anonymous) at (0,102) size 769x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,168) size 769x18 - LayoutText {#text} at (0,0) size 280x18 - text run at (0,0) width 280: "The square above should be fifty pixels tall." - LayoutBlockFlow (anonymous) at (0,202) size 769x100 - LayoutImage {IMG} at (0,0) size 100x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,318) size 769x18 - LayoutText {#text} at (0,0) size 340x18 - text run at (0,0) width 340: "The square above should be 100 pixels tall and wide." - LayoutBlockFlow (anonymous) at (0,352) size 769x100 - LayoutImage {IMG} at (0,0) size 30x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,468) size 769x36 - LayoutText {#text} at (0,0) size 765x36 - text run at (0,0) width 765: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has" - text run at (0,18) width 152: "been doubled using the " - LayoutInline {CODE} at (0,0) size 48x15 - LayoutText {#text} at (151,20) size 48x15 - text run at (151,20) width 48: "height" - LayoutText {#text} at (198,18) size 69x18 - text run at (198,18) width 69: " property)." - LayoutTable {TABLE} at (0,520) size 769x438 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x436 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x410 - LayoutTableCell {TD} at (0,218) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x410 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (4,4) size 747x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,70) size 747x18 - LayoutText {#text} at (0,0) size 280x18 - text run at (0,0) width 280: "The square above should be fifty pixels tall." - LayoutBlockFlow (anonymous) at (4,104) size 747x100 - LayoutImage {IMG} at (0,0) size 100x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,220) size 747x18 - LayoutText {#text} at (0,0) size 340x18 - text run at (0,0) width 340: "The square above should be 100 pixels tall and wide." - LayoutBlockFlow (anonymous) at (4,254) size 747x100 - LayoutImage {IMG} at (0,0) size 30x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,370) size 747x36 - LayoutText {#text} at (0,0) size 739x36 - text run at (0,0) width 739: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size" - text run at (0,18) width 178: "has been doubled using the " - LayoutInline {CODE} at (0,0) size 48x15 - LayoutText {#text} at (177,20) size 48x15 - text run at (177,20) width 48: "height" - LayoutText {#text} at (224,18) size 68x18 - text run at (224,18) width 68: " property)." -layer at (8,100) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin-expected.png deleted file mode 100644 index a1e3b24..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin-expected.txt deleted file mode 100644 index 4e9507b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin-expected.txt +++ /dev/null
@@ -1,167 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 802 scrollHeight 2645 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x2645 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x2645 - LayoutBlockFlow {BODY} at (8,8) size 784x2629 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x105 - LayoutText {#text} at (0,0) size 352x105 - text run at (0,0) width 344: ".zero {background-color: silver; margin: 0;}" - text run at (343,0) width 1: " " - text run at (0,15) width 352: ".one {margin: 0.5in; background-color: aqua;}" - text run at (351,15) width 1: " " - text run at (0,30) width 344: ".two {margin: 25px; background-color: aqua;}" - text run at (343,30) width 1: " " - text run at (0,45) width 352: ".three {margin: 5em; background-color: aqua;}" - text run at (351,45) width 1: " " - text run at (0,60) width 344: ".four {margin: 25%; background-color: aqua;}" - text run at (343,60) width 1: " " - text run at (0,75) width 164: ".five {margin: 25px;}" - text run at (163,75) width 1: " " - text run at (0,90) width 352: ".six {margin: -10px; background-color: aqua;}" - text run at (351,90) width 1: " " - LayoutBlockFlow {P} at (0,170) size 784x36 - LayoutText {#text} at (0,0) size 752x36 - text run at (0,0) width 752: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" - text run at (0,18) width 252: "section 4.1.1 of the CSS1 specification." - LayoutBlockFlow {P} at (0,222) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (48,288) size 688x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 672x18 - text run at (0,0) width 672: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,354) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (25,397) size 734x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 655x18 - text run at (0,0) width 655: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,440) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (80,538) size 624x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 598x36 - text run at (0,0) width 598: "This sentence should have an overall margin of 5 em, which will require extra text in order to" - text run at (0,18) width 27: "test." - LayoutBlockFlow {P} at (0,654) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (196,868) size 392x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 386x54 - text run at (0,0) width 383: "This sentence should have an overall margin of 25%, which" - text run at (0,18) width 386: "is calculated with respect to the width of the parent element." - text run at (0,36) width 272: "This will require extra text in order to test." - LayoutBlockFlow {P} at (0,1118) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {UL} at (25,1161) size 734x122 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 694x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 382x18 - text run at (0,0) width 382: "This list has a margin of 25px, and a light blue background." - LayoutListItem {LI} at (40,18) size 694x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 269x18 - text run at (0,0) width 269: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (65,61) size 644x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 555x18 - text run at (0,0) width 555: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,104) size 694x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 304x18 - text run at (0,0) width 304: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,1308) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (-10,1316) size 804x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 789x54 - text run at (0,0) width 772: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,18) width 376: "subsequent text up toward it, and a light blue background. " - text run at (375,18) width 394: "In all other respects, however, the element should be normal. " - text run at (768,18) width 21: "No" - text run at (0,36) width 538: "styles have been applied to it besides the negative margin and the background color." - LayoutBlockFlow {P} at (0,1360) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutTable {TABLE} at (0,1378) size 784x1251 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x1249 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x1223 - LayoutTableCell {TD} at (0,624) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x1223 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x36 - LayoutText {#text} at (0,0) size 752x36 - text run at (0,0) width 752: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in" - text run at (0,18) width 252: "section 4.1.1 of the CSS1 specification." - LayoutBlockFlow {P} at (4,56) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (52,122) size 666x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 642x36 - text run at (0,0) width 642: "This sentence should have an overall margin of half an inch, which will require extra text in order to" - text run at (0,18) width 27: "test." - LayoutBlockFlow {P} at (4,206) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (29,249) size 712x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 655x18 - text run at (0,0) width 655: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - LayoutBlockFlow {P} at (4,292) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (84,390) size 602x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 598x36 - text run at (0,0) width 598: "This sentence should have an overall margin of 5 em, which will require extra text in order to" - text run at (0,18) width 27: "test." - LayoutBlockFlow {P} at (4,506) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (194.50,714.50) size 381x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 370x54 - text run at (0,0) width 340: "This sentence should have an overall margin of 25%," - text run at (0,18) width 370: "which is calculated with respect to the width of the parent" - text run at (0,36) width 59: "element. " - text run at (58,36) width 273: "This will require extra text in order to test." - LayoutBlockFlow {P} at (4,959) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {UL} at (29,1002) size 712x122 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 672x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 382x18 - text run at (0,0) width 382: "This list has a margin of 25px, and a light blue background." - LayoutListItem {LI} at (40,18) size 672x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 269x18 - text run at (0,0) width 269: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (65,61) size 622x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 555x18 - text run at (0,0) width 555: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,104) size 672x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 304x18 - text run at (0,0) width 304: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,1149) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (-6,1157) size 782x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 772x54 - text run at (0,0) width 772: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,18) width 376: "subsequent text up toward it, and a light blue background. " - text run at (375,18) width 390: "In all other respects, however, the element should be normal." - text run at (0,36) width 561: "No styles have been applied to it besides the negative margin and the background color." - LayoutBlockFlow {P} at (4,1201) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." -layer at (8,160) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,152) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png deleted file mode 100644 index b1d0159..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt deleted file mode 100644 index 3d4946d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt +++ /dev/null
@@ -1,151 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1729 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1729 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1729.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1713.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x135 - LayoutText {#text} at (0,0) size 406x135 - text run at (0,0) width 398: ".zero {background-color: silver; margin-bottom: 0;}" - text run at (397,0) width 1: " " - text run at (0,15) width 406: ".one {margin-bottom: 0.5in; background-color: aqua;}" - text run at (405,15) width 1: " " - text run at (0,30) width 398: ".two {margin-bottom: 25px; background-color: aqua;}" - text run at (397,30) width 1: " " - text run at (0,45) width 406: ".three {margin-bottom: 5em; background-color: aqua;}" - text run at (405,45) width 1: " " - text run at (0,60) width 398: ".four {margin-bottom: 25%; background-color: aqua;}" - text run at (397,60) width 1: " " - text run at (0,75) width 219: ".five {margin-bottom: 25px;}" - text run at (218,75) width 1: " " - text run at (0,90) width 406: ".six {margin-bottom: -10px; background-color: aqua;}" - text run at (405,90) width 1: " " - text run at (0,105) width 172: "P, UL {margin-top: 0;}" - text run at (171,105) width 1: " " - text run at (0,120) width 0: " " - LayoutBlockFlow {P} at (0,192) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,210) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 756x36 - text run at (0,0) width 756: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (0,294) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 739x36 - text run at (0,0) width 739: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (0,355) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 761x36 - text run at (0,0) width 761: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin" - text run at (0,18) width 159: "isn't applied to each line." - LayoutBlockFlow {P} at (0,471) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 754x36 - text run at (0,0) width 754: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin" - text run at (0,18) width 159: "isn't applied to each line." - LayoutBlockFlow {P} at (0,699.25) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,717.25) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "This element also has a class of zero." - LayoutBlockFlow {UL} at (0,735.25) size 769x97 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 433x18 - text run at (0,0) width 433: "This list has a margin-bottom of 25px, and a light blue background." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 269x18 - text run at (0,0) width 269: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 604x18 - text run at (0,0) width 604: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,79) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 304x18 - text run at (0,0) width 304: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,857.25) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 761x54 - text run at (0,0) width 761: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page," - text run at (0,18) width 125: "and no top margin. " - text run at (124,18) width 497: "No other styles have been applied to it besides a light blue background color. " - text run at (620,18) width 131: "In all other respects," - text run at (0,36) width 194: "the element should be normal." - LayoutBlockFlow {P} at (0,901.25) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,919.25) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "This element also has a class of zero." - LayoutTable {TABLE} at (0,937.25) size 769x776 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x774 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x748 - LayoutTableCell {TD} at (0,387) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x747.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,22) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 732x36 - text run at (0,0) width 732: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that" - text run at (0,18) width 232: "the margin isn't applied to each line." - LayoutBlockFlow {P} at (4,106) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 739x36 - text run at (0,0) width 739: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,167) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 712x36 - text run at (0,0) width 712: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,283) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 705x36 - text run at (0,0) width 705: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,505.75) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,523.75) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "This element also has a class of zero." - LayoutBlockFlow {UL} at (4,541.75) size 747x97 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 433x18 - text run at (0,0) width 433: "This list has a margin-bottom of 25px, and a light blue background." - LayoutListItem {LI} at (40,18) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 269x18 - text run at (0,0) width 269: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,36) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 604x18 - text run at (0,0) width 604: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,79) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 304x18 - text run at (0,0) width 304: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,663.75) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 730x54 - text run at (0,0) width 722: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the" - text run at (0,18) width 163: "page, and no top margin. " - text run at (162,18) width 498: "No other styles have been applied to it besides a light blue background color. " - text run at (659,18) width 71: "In all other" - text run at (0,36) width 253: "respects, the element should be normal." - LayoutBlockFlow {P} at (4,707.75) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,725.75) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "This element also has a class of zero." -layer at (8,190) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,182) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png deleted file mode 100644 index 48e080c4a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt deleted file mode 100644 index 40a2ec1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt +++ /dev/null
@@ -1,96 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x30 - LayoutText {#text} at (0,0) size 406x30 - text run at (0,0) width 398: ".one {margin-bottom: 25px; background-color: aqua;}" - text run at (397,0) width 1: " " - text run at (0,15) width 406: ".two {margin-bottom: -10px; background-color: aqua;}" - text run at (405,15) width 1: " " - LayoutBlockFlow {P} at (0,95) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 776x36 [bgcolor=#00FFFF] - LayoutText {#text} at (489,0) size 148x18 - text run at (489,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (636,2) size 25x15 - text run at (636,2) width 25: "one" - LayoutText {#text} at (660,0) size 776x36 - text run at (660,0) width 116: ", giving it an aqua" - text run at (0,18) width 249: "background and a 25px bottom margin" - LayoutText {#text} at (248,18) size 775x36 - text run at (248,18) width 9: ". " - text run at (256,18) width 519: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,36) width 297: "this element should have the same line-height." - LayoutBlockFlow {P} at (0,165) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 776x36 [bgcolor=#00FFFF] - LayoutText {#text} at (489,0) size 148x18 - text run at (489,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (636,2) size 25x15 - text run at (636,2) width 25: "two" - LayoutText {#text} at (660,0) size 776x36 - text run at (660,0) width 116: ", giving it an aqua" - text run at (0,18) width 254: "background and a -10px bottom margin" - LayoutText {#text} at (253,18) size 781x36 - text run at (253,18) width 9: ". " - text run at (261,18) width 520: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,36) width 297: "this element should have the same line-height." - LayoutTable {TABLE} at (0,235) size 784x160 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x158 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x132 - LayoutTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 742x36 [bgcolor=#00FFFF] - LayoutText {#text} at (489,0) size 148x18 - text run at (489,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (636,2) size 25x15 - text run at (636,2) width 25: "one" - LayoutText {#text} at (660,0) size 742x36 - text run at (660,0) width 82: ", giving it an" - text run at (0,18) width 283: "aqua background and a 25px bottom margin" - LayoutText {#text} at (282,18) size 759x36 - text run at (282,18) width 9: ". " - text run at (290,18) width 469: "Margins on inline elements does not affect line-height calculations, so all" - text run at (0,36) width 348: "lines in this element should have the same line-height." - LayoutBlockFlow {P} at (4,74) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 742x36 [bgcolor=#00FFFF] - LayoutText {#text} at (489,0) size 148x18 - text run at (489,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (636,2) size 25x15 - text run at (636,2) width 25: "two" - LayoutText {#text} at (660,0) size 742x36 - text run at (660,0) width 82: ", giving it an" - text run at (0,18) width 288: "aqua background and a -10px bottom margin" - LayoutText {#text} at (287,18) size 744x36 - text run at (287,18) width 9: ". " - text run at (295,18) width 449: "Margins on inline elements does not affect line-height calculations, so" - text run at (0,36) width 368: "all lines in this element should have the same line-height." -layer at (8,85) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png deleted file mode 100644 index 0c162df..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt deleted file mode 100644 index 7de450d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt +++ /dev/null
@@ -1,126 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 714 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x714 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x714 - LayoutBlockFlow {BODY} at (8,8) size 784x698 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 352x45 - text run at (0,0) width 344: ".zero {background-color: silver; margin: 0;}" - text run at (343,0) width 1: " " - text run at (0,15) width 344: ".one {margin: 25px; background-color: aqua;}" - text run at (343,15) width 1: " " - text run at (0,30) width 352: ".two {margin: -10px; background-color: aqua;}" - text run at (351,30) width 1: " " - LayoutBlockFlow {P} at (0,102) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,136) size 784x72 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 767x36 [bgcolor=#00FFFF] - LayoutText {#text} at (514,0) size 148x18 - text run at (514,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (661,2) size 25x15 - text run at (661,2) width 25: "one" - LayoutText {#text} at (685,0) size 767x36 - text run at (685,0) width 82: ", giving it an" - text run at (0,18) width 233: "aqua background and a 25px margin" - LayoutText {#text} at (257,18) size 782x54 - text run at (257,18) width 9: ". " - text run at (265,18) width 504: "Margins on inline elements does not affect line-height calculations, so all lines" - text run at (0,36) width 317: "in this element should have the same line-height. " - text run at (316,36) width 466: "However, there should be a 25px margin to the left side of the inline box" - text run at (0,54) width 761: "in the first line it appears, and a 25px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (0,224) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,258) size 784x72 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 766x36 [bgcolor=#00FFFF] - LayoutText {#text} at (479,0) size 148x18 - text run at (479,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (626,2) size 25x15 - text run at (626,2) width 25: "two" - LayoutText {#text} at (650,0) size 766x36 - text run at (650,0) width 116: ", giving it an aqua" - text run at (0,18) width 205: "background and a -10px margin" - LayoutText {#text} at (194,18) size 783x54 - text run at (194,18) width 9: ". " - text run at (202,18) width 547: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,36) width 274: "element should have the same line-height. " - text run at (273,36) width 510: "However, there should be a -10px margin to the left side of the inline box in the" - text run at (0,54) width 727: "first line it appears, and a -10px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (0,346) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutTable {TABLE} at (0,364) size 784x334 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x332 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x306 - LayoutTableCell {TD} at (0,166) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x306 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 762x90 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 748x36 [bgcolor=#00FFFF] - LayoutText {#text} at (514,0) size 148x18 - text run at (514,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (661,2) size 25x15 - text run at (661,2) width 25: "one" - LayoutText {#text} at (685,0) size 748x36 - text run at (685,0) width 63: ", giving it" - text run at (0,18) width 253: "an aqua background and a 25px margin" - LayoutText {#text} at (277,18) size 760x72 - text run at (277,18) width 9: ". " - text run at (285,18) width 469: "Margins on inline elements does not affect line-height calculations, so all" - text run at (0,36) width 352: "lines in this element should have the same line-height. " - text run at (351,36) width 396: "However, there should be a 25px margin to the left side of the" - text run at (0,54) width 760: "inline box in the first line it appears, and a 25px margin to the right side of the inline element box in the last line where" - text run at (0,72) width 66: "it appears." - LayoutBlockFlow {P} at (4,144) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,178) size 762x90 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 490x18 - text run at (0,0) width 400: "This element is unstyled save for a background color of gray.. " - text run at (399,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 732x36 [bgcolor=#00FFFF] - LayoutText {#text} at (479,0) size 148x18 - text run at (479,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (626,2) size 25x15 - text run at (626,2) width 25: "two" - LayoutText {#text} at (650,0) size 732x36 - text run at (650,0) width 82: ", giving it an" - text run at (0,18) width 239: "aqua background and a -10px margin" - LayoutText {#text} at (228,18) size 756x72 - text run at (228,18) width 9: ". " - text run at (236,18) width 520: "Margins on inline elements does not affect line-height calculations, so all lines in" - text run at (0,36) width 301: "this element should have the same line-height. " - text run at (300,36) width 442: "However, there should be a -10px margin to the left side of the inline" - text run at (0,54) width 738: "box in the first line it appears, and a -10px margin to the right side of the inline element box in the last line where it" - text run at (0,72) width 53: "appears." - LayoutBlockFlow {P} at (4,284) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left-expected.png deleted file mode 100644 index d957d69..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt deleted file mode 100644 index c1806f6..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt +++ /dev/null
@@ -1,121 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1005 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1005 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1005 - LayoutBlockFlow {BODY} at (8,8) size 769x989 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 398x90 - text run at (0,0) width 383: ".zero {background-color: silver; margin-left: 0;}" - text run at (382,0) width 1: " " - text run at (0,15) width 391: ".one {margin-left: 0.5in; background-color: aqua;}" - text run at (390,15) width 1: " " - text run at (0,30) width 383: ".two {margin-left: 25px; background-color: aqua;}" - text run at (382,30) width 1: " " - text run at (0,45) width 391: ".three {margin-left: 5em; background-color: aqua;}" - text run at (390,45) width 1: " " - text run at (0,60) width 383: ".four {margin-left: 25%; background-color: aqua;}" - text run at (382,60) width 1: " " - text run at (0,75) width 398: ".five {margin-left: -10px; background-color: aqua;}" - text run at (397,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (48,189) size 721x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 355x18 - text run at (0,0) width 355: "This sentence should have a left margin of half an inch." - LayoutBlockFlow {P} at (25,223) size 744x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 338x18 - text run at (0,0) width 338: "This sentence should have a left margin of 25 pixels." - LayoutBlockFlow {P} at (80,257) size 689x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 311x18 - text run at (0,0) width 311: "This sentence should have a left margin of 5 em." - LayoutBlockFlow {P} at (192.25,291) size 576.75x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 557x36 - text run at (0,0) width 557: "This sentence should have a left margin of 25%, which is calculated with respect to the" - text run at (0,18) width 180: "width of the parent element." - LayoutBlockFlow {UL} at (25,343) size 744x90 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 704x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 699x18 - text run at (0,0) width 699: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." - LayoutListItem {LI} at (65,18) size 679x54 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 669x54 - text run at (0,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,18) width 61: "checked. " - text run at (60,18) width 576: "This list item has its left margin also set to 25 pixels, which should combine with the list's" - text run at (0,36) width 537: "margin to make 50 pixels of margin, and its background color has been set to white." - LayoutListItem {LI} at (40,72) size 704x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 185x18 - text run at (0,0) width 185: "This is an unclassed list item" - LayoutBlockFlow {P} at (0,449) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (-10,483) size 779x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 773x54 - text run at (0,0) width 773: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" - text run at (0,18) width 116: "blue background. " - text run at (115,18) width 394: "In all other respects, however, the element should be normal. " - text run at (508,18) width 261: "No styles have been applied to it besides" - text run at (0,36) width 323: "the negative left margin and the background color." - LayoutTable {TABLE} at (0,553) size 769x436 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x434 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x408 - LayoutTableCell {TD} at (0,217) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x408 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (52,38) size 699x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 355x18 - text run at (0,0) width 355: "This sentence should have a left margin of half an inch." - LayoutBlockFlow {P} at (29,72) size 722x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 338x18 - text run at (0,0) width 338: "This sentence should have a left margin of 25 pixels." - LayoutBlockFlow {P} at (84,106) size 667x18 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 311x18 - text run at (0,0) width 311: "This sentence should have a left margin of 5 em." - LayoutBlockFlow {P} at (190.75,140) size 560.25x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 557x36 - text run at (0,0) width 557: "This sentence should have a left margin of 25%, which is calculated with respect to the" - text run at (0,18) width 180: "width of the parent element." - LayoutBlockFlow {UL} at (29,192) size 722x108 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 682x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 664x36 - text run at (0,0) width 664: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to" - text run at (0,18) width 32: "gray." - LayoutListItem {LI} at (65,36) size 657x54 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 652x54 - text run at (0,0) width 617: "Another list item might not be such a bad idea, either, considering that such things do need to be" - text run at (0,18) width 110: "double-checked. " - text run at (109,18) width 543: "This list item has its left margin also set to 25 pixels, which should combine with the" - text run at (0,36) width 570: "list's margin to make 50 pixels of margin, and its background color has been set to white." - LayoutListItem {LI} at (40,90) size 682x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 185x18 - text run at (0,0) width 185: "This is an unclassed list item" - LayoutBlockFlow {P} at (4,316) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (-6,350) size 757x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 751x54 - text run at (0,0) width 740: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a" - text run at (0,18) width 149: "light blue background. " - text run at (148,18) width 394: "In all other respects, however, the element should be normal. " - text run at (541,18) width 210: "No styles have been applied to it" - text run at (0,36) width 374: "besides the negative left margin and the background color." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png deleted file mode 100644 index 4f4107d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt deleted file mode 100644 index 5f2920df..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x30 - LayoutText {#text} at (0,0) size 391x30 - text run at (0,0) width 383: ".one {margin-left: 25px; background-color: aqua;}" - text run at (382,0) width 1: " " - text run at (0,15) width 391: ".two {margin-left: -10px; background-color: aqua;}" - text run at (390,15) width 1: " " - LayoutBlockFlow {P} at (0,95) size 784x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (575,0) size 149x18 - text run at (575,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (723,2) size 24x15 - text run at (723,2) width 24: "one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 350: "which should result in 25-pixel left margin only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (349,18) size 29x18 - text run at (349,18) width 29: "first" - LayoutText {#text} at (377,18) size 237x18 - text run at (377,18) width 237: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,147) size 784x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (540,0) size 149x18 - text run at (540,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (688,2) size 24x15 - text run at (688,2) width 24: "two" - LayoutText {#text} at (711,0) size 759x36 - text run at (711,0) width 48: ", which" - text run at (0,18) width 291: "should result in -10px left margin only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (290,18) size 29x18 - text run at (290,18) width 29: "first" - LayoutText {#text} at (318,18) size 237x18 - text run at (318,18) width 237: " line in which the inline box appears." - LayoutTable {TABLE} at (0,199) size 784x124 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x122 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x96 - LayoutTableCell {TD} at (0,61) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (575,0) size 149x18 - text run at (575,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (723,2) size 24x15 - text run at (723,2) width 24: "one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 350: "which should result in 25-pixel left margin only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (349,18) size 29x18 - text run at (349,18) width 29: "first" - LayoutText {#text} at (377,18) size 237x18 - text run at (377,18) width 237: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,56) size 762x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (540,0) size 149x18 - text run at (540,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (688,2) size 24x15 - text run at (688,2) width 24: "two" - LayoutText {#text} at (711,0) size 759x36 - text run at (711,0) width 48: ", which" - text run at (0,18) width 291: "should result in -10px left margin only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (290,18) size 29x18 - text run at (290,18) width 29: "first" - LayoutText {#text} at (318,18) size 237x18 - text run at (318,18) width 237: " line in which the inline box appears." -layer at (8,85) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right-expected.png deleted file mode 100644 index c4ca872..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt deleted file mode 100644 index 2b86296..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt +++ /dev/null
@@ -1,121 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 802 scrollHeight 1005 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1005 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1005 - LayoutBlockFlow {BODY} at (8,8) size 784x989 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x90 - LayoutText {#text} at (0,0) size 547x90 - text run at (0,0) width 539: ".zero {background-color: silver; margin-right: 0; text-align: right;}" - text run at (538,0) width 1: " " - text run at (0,15) width 547: ".one {margin-right: 0.5in; text-align: right; background-color: aqua;}" - text run at (546,15) width 1: " " - text run at (0,30) width 539: ".two {margin-right: 25px; text-align: right; background-color: aqua;}" - text run at (538,30) width 1: " " - text run at (0,45) width 547: ".three {margin-right: 5em; text-align: right; background-color: aqua;}" - text run at (546,45) width 1: " " - text run at (0,60) width 539: ".four {margin-right: 25%; text-align: right; background-color: aqua;}" - text run at (538,60) width 1: " " - text run at (0,75) width 406: ".five {margin-right: -10px; background-color: aqua;}" - text run at (405,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (576,0) size 208x18 - text run at (576,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,189) size 736x18 [bgcolor=#00FFFF] - LayoutText {#text} at (372,0) size 364x18 - text run at (372,0) width 364: "This sentence should have a right margin of half an inch." - LayoutBlockFlow {P} at (0,223) size 759x18 [bgcolor=#00FFFF] - LayoutText {#text} at (412,0) size 347x18 - text run at (412,0) width 347: "This sentence should have a right margin of 25 pixels." - LayoutBlockFlow {P} at (0,257) size 704x18 [bgcolor=#00FFFF] - LayoutText {#text} at (384,0) size 320x18 - text run at (384,0) width 320: "This sentence should have a right margin of 5 em." - LayoutBlockFlow {P} at (0,291) size 588x36 [bgcolor=#00FFFF] - LayoutText {#text} at (22,0) size 566x36 - text run at (22,0) width 566: "This sentence should have a right margin of 25%, which is calculated with respect to the" - text run at (408,18) width 180: "width of the parent element." - LayoutBlockFlow {UL} at (0,343) size 759x90 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 719x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (7,0) size 712x18 - text run at (7,0) width 712: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." - LayoutListItem {LI} at (40,18) size 694x54 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (25,0) size 694x54 - text run at (25,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,18) width 62: "checked. " - text run at (61,18) width 633: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin" - text run at (205,36) width 489: "to make 50 pixels of margin, and its background-color has been set to white." - LayoutListItem {LI} at (40,72) size 719x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (534,0) size 185x18 - text run at (534,0) width 185: "This is an unclassed list item" - LayoutBlockFlow {P} at (0,449) size 784x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (576,0) size 208x18 - text run at (576,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,483) size 794x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 793x54 - text run at (0,0) width 782: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light" - text run at (0,18) width 116: "blue background. " - text run at (115,18) width 394: "In all other respects, however, the element should be normal. " - text run at (508,18) width 285: "No styles have been applied to it besides the" - text run at (0,36) width 308: "negative right margin and the background color." - LayoutTable {TABLE} at (0,553) size 784x436 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x434 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x408 - LayoutTableCell {TD} at (0,217) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x408 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (554,0) size 208x18 - text run at (554,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 714x18 [bgcolor=#00FFFF] - LayoutText {#text} at (350,0) size 364x18 - text run at (350,0) width 364: "This sentence should have a right margin of half an inch." - LayoutBlockFlow {P} at (4,72) size 737x18 [bgcolor=#00FFFF] - LayoutText {#text} at (390,0) size 347x18 - text run at (390,0) width 347: "This sentence should have a right margin of 25 pixels." - LayoutBlockFlow {P} at (4,106) size 682x18 [bgcolor=#00FFFF] - LayoutText {#text} at (362,0) size 320x18 - text run at (362,0) width 320: "This sentence should have a right margin of 5 em." - LayoutBlockFlow {P} at (4,140) size 571.50x36 [bgcolor=#00FFFF] - LayoutText {#text} at (5,0) size 567x36 - text run at (5,0) width 567: "This sentence should have a right margin of 25%, which is calculated with respect to the" - text run at (391,18) width 181: "width of the parent element." - LayoutBlockFlow {UL} at (4,192) size 737x108 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 697x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (20,0) size 677x36 - text run at (20,0) width 677: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to" - text run at (665,18) width 32: "gray." - LayoutListItem {LI} at (40,36) size 672x54 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (3,0) size 669x54 - text run at (3,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (27,18) width 62: "checked. " - text run at (88,18) width 584: "This list item has its right margin also set to 25 pixels, which should combine with the list's" - text run at (134,36) width 538: "margin to make 50 pixels of margin, and its background-color has been set to white." - LayoutListItem {LI} at (40,90) size 697x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (512,0) size 185x18 - text run at (512,0) width 185: "This is an unclassed list item" - LayoutBlockFlow {P} at (4,316) size 762x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (554,0) size 208x18 - text run at (554,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,350) size 772x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 751x54 - text run at (0,0) width 749: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a" - text run at (0,18) width 149: "light blue background. " - text run at (148,18) width 394: "In all other respects, however, the element should be normal. " - text run at (541,18) width 210: "No styles have been applied to it" - text run at (0,36) width 383: "besides the negative right margin and the background color." -layer at (8,145) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png deleted file mode 100644 index f46ee83..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt deleted file mode 100644 index cf4788e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x30 - LayoutText {#text} at (0,0) size 539x30 - text run at (0,0) width 539: ".one {margin-right: 25px; text-align: right; background-color: aqua;}" - text run at (538,0) width 1: " " - text run at (0,15) width 398: ".two {margin-right: -10px; background-color: aqua;}" - text run at (397,15) width 1: " " - LayoutBlockFlow {P} at (0,95) size 784x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 359: "which should result in 25-pixel right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (358,18) size 25x18 - text run at (358,18) width 25: "last" - LayoutText {#text} at (382,18) size 238x18 - text run at (382,18) width 238: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,147) size 784x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "two" - LayoutText {#text} at (711,0) size 759x36 - text run at (711,0) width 48: ", which" - text run at (0,18) width 300: "should result in -10px right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (299,18) size 25x18 - text run at (299,18) width 25: "last" - LayoutText {#text} at (323,18) size 238x18 - text run at (323,18) width 238: " line in which the inline box appears." - LayoutTable {TABLE} at (0,199) size 784x124 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x122 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x96 - LayoutTableCell {TD} at (0,61) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 359: "which should result in 25-pixel right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (358,18) size 25x18 - text run at (358,18) width 25: "last" - LayoutText {#text} at (382,18) size 238x18 - text run at (382,18) width 238: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,56) size 762x36 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "two" - LayoutText {#text} at (711,0) size 759x36 - text run at (711,0) width 48: ", which" - text run at (0,18) width 300: "should result in -10px right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (299,18) size 25x18 - text run at (299,18) width 25: "last" - LayoutText {#text} at (323,18) size 238x18 - text run at (323,18) width 238: " line in which the inline box appears." -layer at (8,85) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top-expected.png deleted file mode 100644 index 75d9e7f..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt deleted file mode 100644 index 49cb0bb1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt +++ /dev/null
@@ -1,139 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1639 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1639 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1639.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1623.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,31) size 769x120 - LayoutText {#text} at (0,0) size 383x120 - text run at (0,0) width 375: ".zero {background-color: silver; margin-top: 0;}" - text run at (374,0) width 1: " " - text run at (0,15) width 383: ".one {margin-top: 0.5in; background-color: aqua;}" - text run at (382,15) width 1: " " - text run at (0,30) width 375: ".two {margin-top: 25px; background-color: aqua;}" - text run at (374,30) width 1: " " - text run at (0,45) width 383: ".three {margin-top: 5em; background-color: aqua;}" - text run at (382,45) width 1: " " - text run at (0,60) width 375: ".four {margin-top: 25%; background-color: aqua;}" - text run at (374,60) width 1: " " - text run at (0,75) width 196: ".five {margin-top: 25px;}" - text run at (195,75) width 1: " " - text run at (0,90) width 383: ".six {margin-top: -10px; background-color: aqua;}" - text run at (382,90) width 1: " " - text run at (0,105) width 196: "P, UL {margin-bottom: 0;}" - text run at (195,105) width 1: " " - LayoutBlockFlow {P} at (0,174) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,192) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "This element also has a class of zero." - LayoutBlockFlow {P} at (0,258) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 727x36 - text run at (0,0) width 727: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (0,319) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 758x36 - text run at (0,0) width 758: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin" - text run at (0,18) width 159: "isn't applied to each line." - LayoutBlockFlow {P} at (0,435) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 762x36 - text run at (0,0) width 762: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,18) width 129: "applied to each line." - LayoutBlockFlow {P} at (0,663.25) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 768x36 - text run at (0,0) width 740: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " - text run at (739,0) width 29: "This" - text run at (0,18) width 240: "will require extra text in order to test." - LayoutBlockFlow {UL} at (0,724.25) size 769x97 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 408x18 - text run at (0,0) width 408: "This list has a margin-top of 25px, and a light blue background." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 269x18 - text run at (0,0) width 269: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,61) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 579x18 - text run at (0,0) width 579: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,79) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 304x18 - text run at (0,0) width 304: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,821.25) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,829.25) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 758x54 - text run at (0,0) width 725: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom" - text run at (0,18) width 54: "margin. " - text run at (53,18) width 497: "No other styles have been applied to it besides a light blue background color. " - text run at (549,18) width 209: "In all other respects, the element" - text run at (0,36) width 116: "should be normal." - LayoutTable {TABLE} at (0,883.25) size 769x740 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x738 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x712 - LayoutTableCell {TD} at (0,369) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x711.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,22) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "This element also has a class of zero." - LayoutBlockFlow {P} at (4,88) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 727x36 - text run at (0,0) width 727: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,149) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 709x36 - text run at (0,0) width 709: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the" - text run at (0,18) width 208: "margin isn't applied to each line." - LayoutBlockFlow {P} at (4,265) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 732x36 - text run at (0,0) width 732: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin" - text run at (0,18) width 159: "isn't applied to each line." - LayoutBlockFlow {P} at (4,487.75) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 736x36 - text run at (0,0) width 736: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element." - text run at (0,18) width 272: "This will require extra text in order to test." - LayoutBlockFlow {UL} at (4,548.75) size 747x97 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 408x18 - text run at (0,0) width 408: "This list has a margin-top of 25px, and a light blue background." - LayoutListItem {LI} at (40,18) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 269x18 - text run at (0,0) width 269: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,61) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 579x18 - text run at (0,0) width 579: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,79) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 304x18 - text run at (0,0) width 304: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,645.75) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,653.75) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 725x54 - text run at (0,0) width 725: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom" - text run at (0,18) width 54: "margin. " - text run at (53,18) width 497: "No other styles have been applied to it besides a light blue background color. " - text run at (549,18) width 154: "In all other respects, the" - text run at (0,36) width 170: "element should be normal." -layer at (8,172) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,164) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png deleted file mode 100644 index 43932a1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt deleted file mode 100644 index 3bf6d67..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt +++ /dev/null
@@ -1,99 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 383x60 - text run at (0,0) width 375: ".zero {background-color: silver; margin-top: 0;}" - text run at (374,0) width 1: " " - text run at (0,15) width 375: ".one {margin-top: 25px; background-color: aqua;}" - text run at (374,15) width 1: " " - text run at (0,30) width 383: ".two {margin-top: -10px; background-color: aqua;}" - text run at (382,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 772x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "one" - LayoutText {#text} at (656,0) size 772x36 - text run at (656,0) width 116: ", giving it an aqua" - text run at (0,18) width 224: "background and a 25px top margin" - LayoutText {#text} at (223,18) size 764x36 - text run at (223,18) width 9: ". " - text run at (231,18) width 533: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,36) width 270: "element should have the same line-height." - LayoutBlockFlow {P} at (0,195) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 770x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 770x36 - text run at (656,0) width 114: ", giving the inline" - text run at (0,18) width 337: "element an aqua background and a -10px top margin" - LayoutText {#text} at (336,18) size 780x36 - text run at (336,18) width 9: ". " - text run at (344,18) width 436: "Margins on inline elements do not affect line-height calculations, so" - text run at (0,36) width 368: "all lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,265) size 784x160 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x158 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x132 - LayoutTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "one" - LayoutText {#text} at (656,0) size 738x36 - text run at (656,0) width 82: ", giving it an" - text run at (0,18) width 258: "aqua background and a 25px top margin" - LayoutText {#text} at (257,18) size 755x36 - text run at (257,18) width 9: ". " - text run at (265,18) width 490: "Margins on inline elements do not affect line-height calculations, so all lines" - text run at (0,36) width 313: "in this element should have the same line-height." - LayoutBlockFlow {P} at (4,74) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 729x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 729x36 - text run at (656,0) width 73: ", giving the" - text run at (0,18) width 377: "inline element an aqua background and a -10px top margin" - LayoutText {#text} at (376,18) size 718x36 - text run at (376,18) width 9: ". " - text run at (384,18) width 334: "Margins on inline elements do not affect line-height" - text run at (0,36) width 470: "calculations, so all lines in this element should have the same line-height." -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding-expected.png deleted file mode 100644 index d2fd48ce..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding-expected.txt deleted file mode 100644 index 6067158..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding-expected.txt +++ /dev/null
@@ -1,96 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2222 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2222 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2221.50 - LayoutBlockFlow {BODY} at (8,8) size 769x2205.50 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 367x90 - text run at (0,0) width 352: ".zero {background-color: silver; padding: 0;}" - text run at (351,0) width 1: " " - text run at (0,15) width 359: ".one {padding: 0.5in; background-color: aqua;}" - text run at (358,15) width 1: " " - text run at (0,30) width 352: ".two {padding: 25px; background-color: aqua;}" - text run at (351,30) width 1: " " - text run at (0,45) width 359: ".three {padding: 5em; background-color: aqua;}" - text run at (358,45) width 1: " " - text run at (0,60) width 352: ".four {padding: 25%; background-color: aqua;}" - text run at (351,60) width 1: " " - text run at (0,75) width 367: ".five {padding: -20px; background-color: aqua;}" - text run at (366,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,189) size 769x132 [bgcolor=#00FFFF] - LayoutText {#text} at (48,48) size 644x36 - text run at (48,48) width 644: "This element should have an overall padding of half an inch, which will require extra text in order to" - text run at (48,66) width 31: "test. " - text run at (78,66) width 472: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,337) size 769x86 [bgcolor=#00FFFF] - LayoutText {#text} at (25,25) size 716x36 - text run at (25,25) width 661: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (685,25) width 56: "Both the" - text run at (25,43) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,439) size 769x196 [bgcolor=#00FFFF] - LayoutText {#text} at (80,80) size 600x36 - text run at (80,80) width 600: "This element should have an overall padding of 5 em, which will require extra text in order to" - text run at (80,98) width 31: "test. " - text run at (110,98) width 472: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,651) size 769x456.50 [bgcolor=#00FFFF] - LayoutText {#text} at (192,192) size 370x73 - text run at (192,192) width 342: "This element should have an overall padding of 25%," - text run at (192,210) width 370: "which is calculated with respect to the width of the parent" - text run at (192,228) width 59: "element. " - text run at (250,228) width 293: "Both the content background and the padding" - text run at (192,246) width 176: "should be aqua (light blue)." - LayoutBlockFlow {P} at (0,1123.50) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 763x36 - text run at (0,0) width 550: "This element should have no padding, since negative padding values are not allowed. " - text run at (549,0) width 214: "Both the content background and" - text run at (0,18) width 304: "the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,1175.50) size 769x1030 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1028 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x1002 - LayoutTableCell {TD} at (0,514) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x1001.50 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 747x132 [bgcolor=#00FFFF] - LayoutText {#text} at (48,48) size 644x36 - text run at (48,48) width 644: "This element should have an overall padding of half an inch, which will require extra text in order to" - text run at (48,66) width 31: "test. " - text run at (78,66) width 472: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,186) size 747x86 [bgcolor=#00FFFF] - LayoutText {#text} at (25,25) size 692x36 - text run at (25,25) width 661: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (685,25) width 32: "Both" - text run at (25,43) width 436: "the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,288) size 747x196 [bgcolor=#00FFFF] - LayoutText {#text} at (80,80) size 584x36 - text run at (80,80) width 584: "This element should have an overall padding of 5 em, which will require extra text in order" - text run at (80,98) width 47: "to test. " - text run at (126,98) width 472: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,500) size 747x445.50 [bgcolor=#00FFFF] - LayoutText {#text} at (186,186) size 371x73 - text run at (186,186) width 343: "This element should have an overall padding of 25%," - text run at (186,204) width 371: "which is calculated with respect to the width of the parent" - text run at (186,222) width 60: "element. " - text run at (245,222) width 292: "Both the content background and the padding" - text run at (186,240) width 177: "should be aqua (light blue)." - LayoutBlockFlow {P} at (4,961.50) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 735x36 - text run at (0,0) width 550: "This element should have no padding, since negative padding values are not allowed. " - text run at (549,0) width 186: "Both the content background" - text run at (0,18) width 332: "and the normal padding should be aqua (light blue)." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png deleted file mode 100644 index ee2a1e2..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt deleted file mode 100644 index 593b21a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1550 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1550 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1550.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1534.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 422x90 - text run at (0,0) width 406: ".zero {background-color: silver; padding-bottom: 0;}" - text run at (405,0) width 1: " " - text run at (0,15) width 414: ".one {padding-bottom: 0.5in; background-color: aqua;}" - text run at (413,15) width 1: " " - text run at (0,30) width 406: ".two {padding-bottom: 25px; background-color: aqua;}" - text run at (405,30) width 1: " " - text run at (0,45) width 414: ".three {padding-bottom: 5em; background-color: aqua;}" - text run at (413,45) width 1: " " - text run at (0,60) width 406: ".four {padding-bottom: 25%; background-color: aqua;}" - text run at (405,60) width 1: " " - text run at (0,75) width 422: ".five {padding-bottom: -20px; background-color: aqua;}" - text run at (421,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,189) size 769x84 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 726x36 - text run at (0,0) width 671: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (670,0) width 56: "Both the" - text run at (0,18) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,289) size 769x61 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 760x36 - text run at (0,0) width 654: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (653,0) width 107: "Both the content" - text run at (0,18) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,366) size 769x116 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 733x36 - text run at (0,0) width 627: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (626,0) width 107: "Both the content" - text run at (0,18) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,498) size 769x228.25 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 767x36 - text run at (0,0) width 767: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element." - text run at (0,18) width 276: "This will require extra text in order to test. " - text run at (275,18) width 472: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,742.25) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,776.25) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 705x36 - text run at (0,0) width 599: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (598,0) width 107: "Both the content" - text run at (0,18) width 411: "background and the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,828.25) size 769x706 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x704 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x678 - LayoutTableCell {TD} at (0,352) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x677.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 747x84 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 726x36 - text run at (0,0) width 671: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (670,0) width 56: "Both the" - text run at (0,18) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,138) size 747x61 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 709x36 - text run at (0,0) width 654: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (653,0) width 56: "Both the" - text run at (0,18) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,215) size 747x116 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 733x36 - text run at (0,0) width 627: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (626,0) width 107: "Both the content" - text run at (0,18) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,347) size 747x240.75 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 726x54 - text run at (0,0) width 709: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent" - text run at (0,18) width 59: "element. " - text run at (58,18) width 277: "This will require extra text in order to test. " - text run at (334,18) width 392: "Both the content background and the padding should be aqua" - text run at (0,36) width 76: "(light blue)." - LayoutBlockFlow {P} at (4,603.75) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,637.75) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 705x36 - text run at (0,0) width 599: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (598,0) width 107: "Both the content" - text run at (0,18) width 411: "background and the normal padding should be aqua (light blue)." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png deleted file mode 100644 index 9c99f51..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt deleted file mode 100644 index 223bdf1b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 414x45 - text run at (0,0) width 406: ".one {padding-bottom: 25px; background-color: aqua;}" - text run at (405,0) width 1: " " - text run at (0,15) width 414: ".two {padding-bottom: -10px; background-color: aqua;}" - text run at (413,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x72 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 772x61 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "one" - LayoutText {#text} at (656,0) size 772x36 - text run at (656,0) width 116: ", giving it an aqua" - text run at (0,18) width 255: "background and a 25px bottom padding" - LayoutText {#text} at (254,18) size 781x54 - text run at (254,18) width 9: ". " - text run at (262,18) width 519: "Padding on inline elements does not affect line-height calculations, so all lines in" - text run at (0,36) width 301: "this element should have the same line-height. " - text run at (300,36) width 475: "There may be implementation-specific limits on how much of the padding" - text run at (0,54) width 204: "the user agent is able to display." - LayoutBlockFlow {P} at (0,198) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 772x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 772x36 - text run at (656,0) width 116: ", giving it an aqua" - text run at (0,18) width 530: "background and no bottom padding, since negative padding values are not allowed" - LayoutText {#text} at (529,18) size 770x36 - text run at (529,18) width 9: ". " - text run at (537,18) width 233: "Padding on inline elements does not" - text run at (0,36) width 584: "affect line-height calculations, so all lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,268) size 784x178 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x176 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x150 - LayoutTableCell {TD} at (0,88) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x150 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x72 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x61 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "one" - LayoutText {#text} at (656,0) size 738x36 - text run at (656,0) width 82: ", giving it an" - text run at (0,18) width 289: "aqua background and a 25px bottom padding" - LayoutText {#text} at (288,18) size 750x54 - text run at (288,18) width 9: ". " - text run at (296,18) width 449: "Padding on inline elements does not affect line-height calculations, so" - text run at (0,36) width 372: "all lines in this element should have the same line-height. " - text run at (371,36) width 379: "There may be implementation-specific limits on how much" - text run at (0,54) width 301: "of the padding the user agent is able to display." - LayoutBlockFlow {P} at (4,92) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 738x36 - text run at (656,0) width 82: ", giving it an" - text run at (0,18) width 564: "aqua background and no bottom padding, since negative padding values are not allowed" - LayoutText {#text} at (563,18) size 746x36 - text run at (563,18) width 9: ". " - text run at (571,18) width 175: "Padding on inline elements" - text run at (0,36) width 641: "does not affect line-height calculations, so all lines in this element should have the same line-height." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png deleted file mode 100644 index e1b7e227..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt deleted file mode 100644 index 937d996..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt +++ /dev/null
@@ -1,127 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 753 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x753 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x753 - LayoutBlockFlow {BODY} at (8,8) size 769x737 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x60 - LayoutText {#text} at (0,0) size 359x60 - text run at (0,0) width 352: ".zero {background-color: silver; padding: 0;}" - text run at (351,0) width 1: " " - text run at (0,15) width 352: ".one {padding: 25px; background-color: aqua;}" - text run at (351,15) width 1: " " - text run at (0,30) width 359: ".two {padding: -10px; background-color: aqua;}" - text run at (358,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,159) size 769x108 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 763x86 [bgcolor=#00FFFF] - LayoutText {#text} at (510,0) size 148x18 - text run at (510,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (657,2) size 25x15 - text run at (657,2) width 25: "one" - LayoutText {#text} at (681,0) size 763x36 - text run at (681,0) width 82: ", giving it an" - text run at (0,18) width 240: "aqua background and a 25px padding" - LayoutText {#text} at (264,18) size 747x90 - text run at (264,18) width 9: ". " - text run at (272,18) width 469: "Padding on inline elements does not affect line-height calculations, so all" - text run at (0,36) width 352: "lines in this element should have the same line-height. " - text run at (351,36) width 396: "There may be implementation-specific limits on how much of" - text run at (0,54) width 462: "the padding the user agent is able to display above and below each line. " - text run at (461,54) width 267: "However, there should be at least 25px of" - text run at (0,72) width 744: "padding to the left side of the inline box in the first line it appears, and 25px of padding to the right side of the inline" - text run at (0,90) width 286: "element box in the last line where it appears." - LayoutBlockFlow {P} at (0,283) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,317) size 769x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 738x36 - text run at (656,0) width 82: ", giving it an" - text run at (0,18) width 515: "aqua background and no padding, since negative padding values are not allowed" - LayoutText {#text} at (514,18) size 755x36 - text run at (514,18) width 9: ". " - text run at (522,18) width 233: "Padding on inline elements does not" - text run at (0,36) width 584: "affect line-height calculations, so all lines in this element should have the same line-height." - LayoutBlockFlow {P} at (0,387) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutTable {TABLE} at (0,421) size 769x316 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x314 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x288 - LayoutTableCell {TD} at (0,157) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x288 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 747x108 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 744x86 [bgcolor=#00FFFF] - LayoutText {#text} at (510,0) size 148x18 - text run at (510,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (657,2) size 25x15 - text run at (657,2) width 25: "one" - LayoutText {#text} at (681,0) size 744x36 - text run at (681,0) width 63: ", giving it" - text run at (0,18) width 259: "an aqua background and a 25px padding" - LayoutText {#text} at (283,18) size 740x90 - text run at (283,18) width 9: ". " - text run at (291,18) width 449: "Padding on inline elements does not affect line-height calculations, so" - text run at (0,36) width 372: "all lines in this element should have the same line-height. " - text run at (371,36) width 339: "There may be implementation-specific limits on how" - text run at (0,54) width 519: "much of the padding the user agent is able to display above and below each line. " - text run at (518,54) width 214: "However, there should be at least" - text run at (0,72) width 734: "25px of padding to the left side of the inline box in the first line it appears, and 25px of padding to the right side of" - text run at (0,90) width 350: "the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (4,162) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,196) size 747x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 738x36 - text run at (656,0) width 82: ", giving it an" - text run at (0,18) width 515: "aqua background and no padding, since negative padding values are not allowed" - LayoutText {#text} at (514,18) size 730x36 - text run at (514,18) width 9: ". " - text run at (522,18) width 208: "Padding on inline elements does" - text run at (0,36) width 608: "not affect line-height calculations, so all lines in this element should have the same line-height." - LayoutBlockFlow {P} at (4,266) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." -layer at (8,115) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left-expected.png deleted file mode 100644 index 5f8603c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt deleted file mode 100644 index de16672..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt +++ /dev/null
@@ -1,119 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1009 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1009 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1009 - LayoutBlockFlow {BODY} at (8,8) size 769x993 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 406x90 - text run at (0,0) width 391: ".zero {background-color: silver; padding-left: 0;}" - text run at (390,0) width 1: " " - text run at (0,15) width 398: ".one {padding-left: 0.5in; background-color: aqua;}" - text run at (397,15) width 1: " " - text run at (0,30) width 391: ".two {padding-left: 25px; background-color: aqua;}" - text run at (390,30) width 1: " " - text run at (0,45) width 398: ".three {padding-left: 5em; background-color: aqua;}" - text run at (397,45) width 1: " " - text run at (0,60) width 391: ".four {padding-left: 25%; background-color: aqua;}" - text run at (390,60) width 1: " " - text run at (0,75) width 406: ".five {padding-left: -20px; background-color: aqua;}" - text run at (405,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,189) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 702x36 - text run at (48,0) width 647: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (694,0) width 56: "Both the" - text run at (48,18) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,241) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 736x36 - text run at (25,0) width 630: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (654,0) width 107: "Both the content" - text run at (25,18) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,293) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (80,0) size 654x36 - text run at (80,0) width 599: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (678,0) width 56: "Both the" - text run at (80,18) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,345) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (192,0) size 576x54 - text run at (192,0) width 560: "This element should have a left padding of 25%, which is calculated with respect to the" - text run at (192,18) width 185: "width of the parent element. " - text run at (376,18) width 392: "Both the content background and the padding should be aqua" - text run at (192,36) width 76: "(light blue)." - LayoutBlockFlow {UL} at (0,415) size 769x72 [bgcolor=#808080] - LayoutListItem {LI} at (25,0) size 744x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 732x18 - text run at (0,0) width 732: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." - LayoutListItem {LI} at (25,18) size 744x54 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (25,0) size 714x54 - text run at (25,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (25,18) width 61: "checked. " - text run at (85,18) width 654: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding to" - text run at (25,36) width 168: "make 50 pixels of margin." - LayoutBlockFlow {P} at (0,503) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 761x36 - text run at (0,0) width 575: "This element should have no left padding, since negative padding values are not allowed. " - text run at (574,0) width 187: "Both the content background" - text run at (0,18) width 332: "and the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,555) size 769x438 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x436 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x410 - LayoutTableCell {TD} at (0,218) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x410 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 679x36 - text run at (48,0) width 647: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (694,0) width 33: "Both" - text run at (48,18) width 436: "the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,90) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 685x36 - text run at (25,0) width 630: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (654,0) width 56: "Both the" - text run at (25,18) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,142) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (80,0) size 654x36 - text run at (80,0) width 599: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (678,0) width 56: "Both the" - text run at (80,18) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,194) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (186,0) size 560x54 - text run at (186,0) width 560: "This element should have a left padding of 25%, which is calculated with respect to the" - text run at (186,18) width 185: "width of the parent element. " - text run at (370,18) width 358: "Both the content background and the padding should be" - text run at (186,36) width 111: "aqua (light blue)." - LayoutBlockFlow {UL} at (4,264) size 747x90 [bgcolor=#808080] - LayoutListItem {LI} at (25,0) size 722x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 702x36 - text run at (0,0) width 702: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to" - text run at (0,18) width 27: "test." - LayoutListItem {LI} at (25,36) size 722x54 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (25,0) size 669x54 - text run at (25,0) width 669: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (25,18) width 61: "checked. " - text run at (85,18) width 582: "This list item has its left padding also set to 25 pixels, which should combine with the list's" - text run at (25,36) width 240: "padding to make 50 pixels of margin." - LayoutBlockFlow {P} at (4,370) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 681x36 - text run at (0,0) width 575: "This element should have no left padding, since negative padding values are not allowed. " - text run at (574,0) width 107: "Both the content" - text run at (0,18) width 411: "background and the normal padding should be aqua (light blue)." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png deleted file mode 100644 index 0ab7804..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt deleted file mode 100644 index bf6956b1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt +++ /dev/null
@@ -1,102 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 398x45 - text run at (0,0) width 391: ".one {padding-left: 25px; background-color: aqua;}" - text run at (390,0) width 1: " " - text run at (0,15) width 398: ".two {padding-left: -10px; background-color: aqua;}" - text run at (397,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 197x18 [bgcolor=#00FFFF] - LayoutText {#text} at (575,0) size 149x18 - text run at (575,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (723,2) size 24x15 - text run at (723,2) width 24: "one" - LayoutText {#text} at (0,18) size 582x18 - text run at (0,18) width 582: "which should result in 25-pixel left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (581,18) size 29x18 - text run at (581,18) width 29: "first" - LayoutText {#text} at (609,18) size 761x36 - text run at (609,18) width 152: " line in which the inline" - text run at (0,36) width 81: "box appears." - LayoutBlockFlow {P} at (0,180) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "two" - LayoutText {#text} at (721,0) size 765x36 - text run at (721,0) width 44: " which" - text run at (0,18) width 523: "should result in -10px left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (522,18) size 29x18 - text run at (522,18) width 29: "first" - LayoutText {#text} at (550,18) size 730x36 - text run at (550,18) width 180: " line in which the inline box" - text run at (0,36) width 53: "appears." - LayoutTable {TABLE} at (0,250) size 784x160 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x158 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x132 - LayoutTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 197x18 [bgcolor=#00FFFF] - LayoutText {#text} at (575,0) size 149x18 - text run at (575,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (723,2) size 24x15 - text run at (723,2) width 24: "one" - LayoutText {#text} at (0,18) size 582x18 - text run at (0,18) width 582: "which should result in 25-pixel left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (581,18) size 29x18 - text run at (581,18) width 29: "first" - LayoutText {#text} at (609,18) size 761x36 - text run at (609,18) width 152: " line in which the inline" - text run at (0,36) width 81: "box appears." - LayoutBlockFlow {P} at (4,74) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "two" - LayoutText {#text} at (0,18) size 566x18 - text run at (0,18) width 566: "which should result in -10px left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 29x18 - LayoutText {#text} at (565,18) size 29x18 - text run at (565,18) width 29: "first" - LayoutText {#text} at (593,18) size 745x36 - text run at (593,18) width 152: " line in which the inline" - text run at (0,36) width 81: "box appears." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right-expected.png deleted file mode 100644 index d3dd1ba..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt deleted file mode 100644 index 5604ee9..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt +++ /dev/null
@@ -1,136 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1171 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1171 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1171 - LayoutBlockFlow {BODY} at (8,8) size 769x1155 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 562x90 - text run at (0,0) width 398: ".zero {background-color: silver; padding-right: 0;}" - text run at (397,0) width 1: " " - text run at (0,15) width 554: ".one {padding-right: 0.5in; text-align: right; background-color: aqua;}" - text run at (553,15) width 1: " " - text run at (0,30) width 547: ".two {padding-right: 25px; text-align: right; background-color: aqua;}" - text run at (546,30) width 1: " " - text run at (0,45) width 554: ".three {padding-right: 5em; text-align: right; background-color: aqua;}" - text run at (553,45) width 1: " " - text run at (0,60) width 547: ".four {padding-right: 25%; text-align: right; background-color: aqua;}" - text run at (546,60) width 1: " " - text run at (0,75) width 562: ".five {padding-right: -20px; text-align: right; background-color: aqua;}" - text run at (561,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,189) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (10,0) size 711x54 - text run at (10,0) width 657: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (666,0) width 55: "Both the" - text run at (34,18) width 418: "content background and the padding should be aqua (light blue). " - text run at (451,18) width 270: "The text has been right-aligned in order to" - text run at (486,36) width 235: "make the right padding easier to see." - LayoutBlockFlow {P} at (0,259) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (50,0) size 725x54 - text run at (50,0) width 640: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (689,0) width 55: "Both the" - text run at (19,18) width 417: "content background and the padding should be aqua (light blue). " - text run at (435,18) width 309: "The text has been right-aligned in order to make" - text run at (548,36) width 196: "the right padding easier to see." - LayoutBlockFlow {P} at (0,329) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (22,0) size 687x54 - text run at (22,0) width 613: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (634,0) width 55: "Both the" - text run at (2,18) width 418: "content background and the padding should be aqua (light blue). " - text run at (419,18) width 270: "The text has been right-aligned in order to" - text run at (454,36) width 235: "make the right padding easier to see." - LayoutBlockFlow {P} at (0,399) size 769x72 [bgcolor=#00FFFF] - LayoutText {#text} at (8,0) size 576x72 - text run at (8,0) width 569: "This element should have a right padding of 25%, which is calculated with respect to the" - text run at (1,18) width 185: "width of the parent element. " - text run at (185,18) width 392: "Both the content background and the padding should be aqua" - text run at (17,36) width 81: "(light blue). " - text run at (97,36) width 480: "The text has been right-aligned in order to make the right padding easier to" - text run at (552,54) width 25: "see." - LayoutBlockFlow {UL} at (0,487) size 769x72 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 704x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (8,0) size 696x36 - text run at (8,0) width 696: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order" - text run at (661,18) width 43: "to test." - LayoutListItem {LI} at (40,36) size 704x36 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (5,0) size 674x36 - text run at (5,0) width 674: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL" - text run at (624,18) width 55: "element." - LayoutBlockFlow {P} at (0,575) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (79,0) size 747x54 - text run at (79,0) width 585: "This element should have no right padding, since negative padding values are not allowed. " - text run at (663,0) width 106: "Both the content" - text run at (22,18) width 416: "background and the normal padding should be aqua (light blue). " - text run at (437,18) width 332: "The text has been right-aligned in order to make the" - text run at (549,36) width 220: "lack of right padding easier to see." - LayoutTable {TABLE} at (0,645) size 769x510 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x508 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x482 - LayoutTableCell {TD} at (0,254) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x482 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (12,0) size 694x54 - text run at (12,0) width 656: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (667,0) width 32: "Both" - text run at (5,18) width 441: "the content background and the padding should be aqua (light blue). " - text run at (445,18) width 254: "The text has been right-aligned in order" - text run at (448,36) width 251: "to make the right padding easier to see." - LayoutBlockFlow {P} at (4,108) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (28,0) size 694x54 - text run at (28,0) width 640: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (667,0) width 55: "Both the" - text run at (35,18) width 418: "content background and the padding should be aqua (light blue). " - text run at (452,18) width 270: "The text has been right-aligned in order to" - text run at (487,36) width 235: "make the right padding easier to see." - LayoutBlockFlow {P} at (4,178) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 667x54 - text run at (0,0) width 613: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (612,0) width 55: "Both the" - text run at (35,18) width 417: "content background and the padding should be aqua (light blue). " - text run at (451,18) width 216: "The text has been right-aligned in" - text run at (378,36) width 289: "order to make the right padding easier to see." - LayoutBlockFlow {P} at (4,248) size 747x72 [bgcolor=#00FFFF] - LayoutText {#text} at (15,0) size 556x72 - text run at (15,0) width 546: "This element should have a right padding of 25%, which is calculated with respect to" - text run at (14,18) width 209: "the width of the parent element. " - text run at (222,18) width 339: "Both the content background and the padding should" - text run at (5,36) width 134: "be aqua (light blue). " - text run at (138,36) width 423: "The text has been right-aligned in order to make the right padding" - text run at (478,54) width 83: "easier to see." - LayoutBlockFlow {UL} at (4,336) size 747x72 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 682x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (24,0) size 658x36 - text run at (24,0) width 658: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in" - text run at (601,18) width 81: "order to test." - LayoutListItem {LI} at (40,36) size 682x36 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (9,0) size 648x36 - text run at (9,0) width 648: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the" - text run at (577,18) width 80: "UL element." - LayoutBlockFlow {P} at (4,424) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (57,0) size 747x54 - text run at (57,0) width 585: "This element should have no right padding, since negative padding values are not allowed. " - text run at (641,0) width 106: "Both the content" - text run at (0,18) width 416: "background and the normal padding should be aqua (light blue). " - text run at (415,18) width 332: "The text has been right-aligned in order to make the" - text run at (527,36) width 220: "lack of right padding easier to see." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png deleted file mode 100644 index fe2d1ce..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt deleted file mode 100644 index d545cb63..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt +++ /dev/null
@@ -1,105 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 554x45 - text run at (0,0) width 547: ".one {padding-right: 25px; text-align: right; background-color: aqua;}" - text run at (546,0) width 1: " " - text run at (0,15) width 554: ".two {padding-right: -10px; text-align: right; background-color: aqua;}" - text run at (553,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 197x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 580: "which should result in 25-pixel right padding (which should also be light blue) only in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (579,18) size 25x18 - text run at (579,18) width 25: "last" - LayoutText {#text} at (603,18) size 783x36 - text run at (603,18) width 180: " line in which the inline box" - text run at (0,36) width 53: "appears." - LayoutBlockFlow {P} at (0,180) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "two" - LayoutText {#text} at (721,0) size 769x36 - text run at (721,0) width 48: ", which" - text run at (0,18) width 559: "should result in no right padding, since negative padding values are not allowed, in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (558,18) size 25x18 - text run at (558,18) width 25: "last" - LayoutText {#text} at (582,18) size 763x36 - text run at (582,18) width 181: " line in which the inline box" - text run at (0,36) width 53: "appears." - LayoutTable {TABLE} at (0,250) size 784x160 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x158 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x132 - LayoutTableCell {TD} at (0,79) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x132 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 197x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "one" - LayoutText {#text} at (746,0) size 751x36 - text run at (746,0) width 5: "," - text run at (0,18) width 580: "which should result in 25-pixel right padding (which should also be light blue) only in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (579,18) size 25x18 - text run at (579,18) width 25: "last" - LayoutText {#text} at (603,18) size 755x36 - text run at (603,18) width 152: " line in which the inline" - text run at (0,36) width 81: "box appears." - LayoutBlockFlow {P} at (4,74) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 551x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 156: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 172x18 [bgcolor=#00FFFF] - LayoutText {#text} at (550,0) size 149x18 - text run at (550,0) width 149: "inline element of class " - LayoutInline {TT} at (0,0) size 24x15 - LayoutText {#text} at (698,2) size 24x15 - text run at (698,2) width 24: "two" - LayoutText {#text} at (721,0) size 726x36 - text run at (721,0) width 5: "," - text run at (0,18) width 602: "which should result in no right padding, since negative padding values are not allowed, in the " - LayoutInline {STRONG} at (0,0) size 25x18 - LayoutText {#text} at (601,18) size 25x18 - text run at (601,18) width 25: "last" - LayoutText {#text} at (625,18) size 737x36 - text run at (625,18) width 112: " line in which the" - text run at (0,36) width 122: "inline box appears." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top-expected.png deleted file mode 100644 index 060c3e8a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt deleted file mode 100644 index fb0edd7..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt +++ /dev/null
@@ -1,92 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1464 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1464 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1464.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1448.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 398x90 - text run at (0,0) width 383: ".zero {background-color: silver; padding-top: 0;}" - text run at (382,0) width 1: " " - text run at (0,15) width 391: ".one {padding-top: 0.5in; background-color: aqua;}" - text run at (390,15) width 1: " " - text run at (0,30) width 383: ".two {padding-top: 25px; background-color: aqua;}" - text run at (382,30) width 1: " " - text run at (0,45) width 391: ".three {padding-top: 5em; background-color: aqua;}" - text run at (390,45) width 1: " " - text run at (0,60) width 383: ".four {padding-top: 25%; background-color: aqua;}" - text run at (382,60) width 1: " " - text run at (0,75) width 398: ".five {padding-top: -20px; background-color: aqua;}" - text run at (397,75) width 1: " " - LayoutBlockFlow {P} at (0,155) size 769x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (0,189) size 769x84 [bgcolor=#00FFFF] - LayoutText {#text} at (0,48) size 752x36 - text run at (0,48) width 647: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (646,48) width 106: "Both the content" - text run at (0,66) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,289) size 769x61 [bgcolor=#00FFFF] - LayoutText {#text} at (0,25) size 735x36 - text run at (0,25) width 629: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (628,25) width 107: "Both the content" - text run at (0,43) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,366) size 769x116 [bgcolor=#00FFFF] - LayoutText {#text} at (0,80) size 708x36 - text run at (0,80) width 603: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (602,80) width 106: "Both the content" - text run at (0,98) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,498) size 769x228.25 [bgcolor=#00FFFF] - LayoutText {#text} at (0,192) size 747x37 - text run at (0,192) width 742: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element." - text run at (0,210) width 475: "Both the content background and the padding should be aqua (light blue). " - text run at (475,210) width 272: "This will require extra text in order to test." - LayoutBlockFlow {P} at (0,742.25) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 760x36 - text run at (0,0) width 575: "This element should have no top padding, since negative padding values are not allowed. " - text run at (574,0) width 186: "Both the content background" - text run at (0,18) width 332: "and the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,794.25) size 769x654 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x652 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x626 - LayoutTableCell {TD} at (0,326) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x625.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This element has a class of zero." - LayoutBlockFlow {P} at (4,38) size 747x84 [bgcolor=#00FFFF] - LayoutText {#text} at (0,48) size 701x36 - text run at (0,48) width 647: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (646,48) width 55: "Both the" - text run at (0,66) width 413: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,138) size 747x61 [bgcolor=#00FFFF] - LayoutText {#text} at (0,25) size 735x36 - text run at (0,25) width 629: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (628,25) width 107: "Both the content" - text run at (0,43) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,215) size 747x116 [bgcolor=#00FFFF] - LayoutText {#text} at (0,80) size 708x36 - text run at (0,80) width 603: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (602,80) width 106: "Both the content" - text run at (0,98) width 362: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,347) size 747x222.75 [bgcolor=#00FFFF] - LayoutText {#text} at (0,186) size 747x37 - text run at (0,186) width 742: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element." - text run at (0,204) width 475: "Both the content background and the padding should be aqua (light blue). " - text run at (475,204) width 272: "This will require extra text in order to test." - LayoutBlockFlow {P} at (4,585.75) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 680x36 - text run at (0,0) width 575: "This element should have no top padding, since negative padding values are not allowed. " - text run at (574,0) width 106: "Both the content" - text run at (0,18) width 411: "background and the normal padding should be aqua (light blue)." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png deleted file mode 100644 index aab74a1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt deleted file mode 100644 index fc5d63d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 391x45 - text run at (0,0) width 383: ".one {padding-top: 25px; background-color: aqua;}" - text run at (382,0) width 1: " " - text run at (0,15) width 391: ".two {padding-top: -10px; background-color: aqua;}" - text run at (390,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x72 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 772x61 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "one" - LayoutText {#text} at (656,0) size 772x36 - text run at (656,0) width 116: ", giving it an aqua" - text run at (0,18) width 230: "background and a 25px top padding" - LayoutText {#text} at (229,18) size 784x54 - text run at (229,18) width 9: ". " - text run at (237,18) width 547: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,36) width 274: "element should have the same line-height. " - text run at (273,36) width 499: "There may be implementation-specific limits on how much of the padding the" - text run at (0,54) width 181: "user agent is able to display." - LayoutBlockFlow {P} at (0,198) size 784x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 772x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 772x36 - text run at (656,0) width 116: ", giving it an aqua" - text run at (0,18) width 505: "background and no top padding, since negative padding values are not allowed" - LayoutText {#text} at (504,18) size 745x36 - text run at (504,18) width 9: ". " - text run at (512,18) width 233: "Padding on inline elements does not" - text run at (0,36) width 584: "affect line-height calculations, so all lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,268) size 784x178 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x176 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x150 - LayoutTableCell {TD} at (0,88) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x150 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x72 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x61 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "one" - LayoutText {#text} at (656,0) size 738x36 - text run at (656,0) width 82: ", giving it an" - text run at (0,18) width 264: "aqua background and a 25px top padding" - LayoutText {#text} at (263,18) size 747x54 - text run at (263,18) width 9: ". " - text run at (271,18) width 469: "Padding on inline elements does not affect line-height calculations, so all" - text run at (0,36) width 352: "lines in this element should have the same line-height. " - text run at (351,36) width 396: "There may be implementation-specific limits on how much of" - text run at (0,54) width 283: "the padding the user agent is able to display." - LayoutBlockFlow {P} at (4,92) size 762x54 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 486x18 - text run at (0,0) width 396: "This element is unstyled save for a background color of gray. " - text run at (395,0) width 91: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x36 [bgcolor=#00FFFF] - LayoutText {#text} at (485,0) size 148x18 - text run at (485,0) width 148: "inline element of class " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (632,2) size 25x15 - text run at (632,2) width 25: "two" - LayoutText {#text} at (656,0) size 738x36 - text run at (656,0) width 82: ", giving it an" - text run at (0,18) width 539: "aqua background and no top padding, since negative padding values are not allowed" - LayoutText {#text} at (538,18) size 755x36 - text run at (538,18) width 9: ". " - text run at (546,18) width 209: "Padding on inline elements does" - text run at (0,36) width 608: "not affect line-height calculations, so all lines in this element should have the same line-height." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/width-expected.png deleted file mode 100644 index 2981ad5..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/width-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/width-expected.txt deleted file mode 100644 index 1d78dce..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/box_properties/width-expected.txt +++ /dev/null
@@ -1,87 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1378 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1378 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1377.50 - LayoutBlockFlow {BODY} at (8,8) size 769x1361.50 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x45 - LayoutText {#text} at (0,0) size 149x45 - text run at (0,0) width 149: ".one {width: 50px;}" - text run at (148,0) width 1: " " - text run at (0,15) width 141: ".two {width: 50%;}" - text run at (140,15) width 1: " " - text run at (0,30) width 149: "TABLE {width: 50%;}" - text run at (148,30) width 1: " " - LayoutBlockFlow (anonymous) at (0,102) size 769x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,168) size 769x18 - LayoutText {#text} at (0,0) size 291x18 - text run at (0,0) width 291: "The square above should be fifty pixels wide." - LayoutBlockFlow (anonymous) at (0,202) size 769x384.50 - LayoutImage {IMG} at (0,0) size 384.50x384.50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,602.50) size 769x18 - LayoutText {#text} at (0,0) size 683x18 - text run at (0,0) width 683: "The square above should be half as wide as the image's parent element (either the BODY or the table cell)." - LayoutBlockFlow {P} at (0,636.50) size 384.50x108 - LayoutText {#text} at (0,0) size 375x72 - text run at (0,0) width 336: "This paragraph should be half the width of its parent" - text run at (0,18) width 375: "element (either the BODY or the table, which should itself" - text run at (0,36) width 255: "be half as wide as the BODY element). " - text run at (254,36) width 108: "This is extra text" - text run at (0,54) width 329: "included to ensure that this will be a fair test of the " - LayoutInline {CODE} at (0,0) size 40x15 - LayoutText {#text} at (328,56) size 40x15 - text run at (328,56) width 40: "width" - LayoutText {#text} at (0,72) size 379x36 - text run at (0,72) width 379: "property without the need for the user to resize the viewing" - text run at (0,90) width 55: "window." - LayoutTable {TABLE} at (0,760.50) size 384x601 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 382x599 - LayoutTableRow {TR} at (0,0) size 382x26 - LayoutTableCell {TD} at (0,0) size 382x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 382x573 - LayoutTableCell {TD} at (0,299) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 370x573 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (4,4) size 362x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,70) size 362x18 - LayoutText {#text} at (0,0) size 291x18 - text run at (0,0) width 291: "The square above should be fifty pixels wide." - LayoutBlockFlow (anonymous) at (4,104) size 362x181 - LayoutImage {IMG} at (0,0) size 181x181 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,301) size 362x36 - LayoutText {#text} at (0,0) size 353x36 - text run at (0,0) width 353: "The square above should be half as wide as the image's" - text run at (0,18) width 326: "parent element (either the BODY or the table cell)." - LayoutBlockFlow {P} at (4,353) size 181x216 - LayoutText {#text} at (0,0) size 174x162 - text run at (0,0) width 163: "This paragraph should be" - text run at (0,18) width 170: "half the width of its parent" - text run at (0,36) width 170: "element (either the BODY" - text run at (0,54) width 166: "or the table, which should" - text run at (0,72) width 174: "itself be half as wide as the" - text run at (0,90) width 114: "BODY element). " - text run at (113,90) width 44: "This is" - text run at (0,108) width 136: "extra text included to" - text run at (0,126) width 156: "ensure that this will be a" - text run at (0,144) width 94: "fair test of the " - LayoutInline {CODE} at (0,0) size 40x15 - LayoutText {#text} at (93,146) size 40x15 - text run at (93,146) width 40: "width" - LayoutText {#text} at (0,162) size 165x54 - text run at (0,162) width 165: "property without the need" - text run at (0,180) width 155: "for the user to resize the" - text run at (0,198) width 111: "viewing window." -layer at (8,100) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/cascade_order-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/cascade_order-expected.png deleted file mode 100644 index da728f24..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/cascade_order-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt deleted file mode 100644 index d7c38c7..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt +++ /dev/null
@@ -1,143 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 790 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x790 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x790 - LayoutBlockFlow {BODY} at (8,8) size 769x774 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x165 - LayoutText {#text} at (0,0) size 562x165 - text run at (0,0) width 562: "<LINK rel=\"stylesheet\" type=\"text/css\" HREF=\"../resources/linktest.css\">" - text run at (561,0) width 1: " " - text run at (0,15) width 149: "LI {color: purple;}" - text run at (148,15) width 1: " " - text run at (0,30) width 157: "UL LI {color: blue;}" - text run at (156,30) width 1: " " - text run at (0,45) width 180: "UL LI LI {color: gray;}" - text run at (179,45) width 1: " " - text run at (0,60) width 172: "LI.red {color: green;}" - text run at (171,60) width 1: " " - text run at (0,75) width 211: "UL LI.mar {color: #660000;}" - text run at (210,75) width 1: " " - text run at (0,90) width 196: "UL LI#gre {color: green;}" - text run at (195,90) width 1: " " - text run at (0,105) width 157: ".test {color: blue;}" - text run at (156,105) width 1: " " - text run at (0,120) width 172: ".test {color: purple;}" - text run at (171,120) width 1: " " - text run at (0,135) width 289: ".one {text-decoration: line-through;}" - text run at (288,135) width 1: " " - text run at (0,150) width 0: " " - LayoutBlockFlow {UL} at (0,230) size 769x144 - LayoutListItem {LI} at (40,0) size 729x18 [color=#0000FF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 194x18 - text run at (0,0) width 194: "This list item should be blue..." - LayoutListItem {LI} at (40,18) size 729x72 [color=#0000FF] - LayoutBlockFlow (anonymous) at (0,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 295x18 - text run at (0,0) width 295: "...and so should this; neither should be purple." - LayoutBlockFlow {UL} at (0,18) size 729x54 - LayoutListItem {LI} at (40,0) size 689x18 [color=#808080] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 194x18 - text run at (0,0) width 194: "This list item should be gray..." - LayoutListItem {LI} at (40,18) size 689x18 [color=#808080] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...as should this...." - LayoutListItem {LI} at (40,36) size 689x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "...but this one should be green." - LayoutListItem {LI} at (40,90) size 729x18 [color=#660000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 174x18 - text run at (0,0) width 174: "This ought to be dark red..." - LayoutListItem {LI} at (40,108) size 729x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 87x18 - text run at (0,0) width 87: "...this green..." - LayoutListItem {LI} at (40,126) size 729x18 [color=#0000FF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 98x18 - text run at (0,0) width 98: "...and this blue." - LayoutBlockFlow {P} at (0,390) size 769x18 [color=#0000FF] - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "This sentence should be blue (STYLE attr.)." - LayoutBlockFlow {P} at (0,424) size 769x18 [color=#800080] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This sentence should be purple [" - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (207,2) size 95x15 - text run at (207,2) width 95: "class=\"test\"" - LayoutText {#text} at (301,0) size 10x18 - text run at (301,0) width 10: "]." - LayoutBlockFlow {P} at (0,458) size 769x18 - LayoutText {#text} at (0,0) size 697x18 - text run at (0,0) width 697: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." - LayoutTable {TABLE} at (0,492) size 719x282 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 717x280 - LayoutTableRow {TR} at (0,0) size 717x26 - LayoutTableCell {TD} at (0,0) size 717x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 717x254 - LayoutTableCell {TD} at (0,140) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 705x254 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 697x144 - LayoutListItem {LI} at (40,0) size 657x18 [color=#0000FF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 194x18 - text run at (0,0) width 194: "This list item should be blue..." - LayoutListItem {LI} at (40,18) size 657x72 [color=#0000FF] - LayoutBlockFlow (anonymous) at (0,0) size 657x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 295x18 - text run at (0,0) width 295: "...and so should this; neither should be purple." - LayoutBlockFlow {UL} at (0,18) size 657x54 - LayoutListItem {LI} at (40,0) size 617x18 [color=#808080] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 194x18 - text run at (0,0) width 194: "This list item should be gray..." - LayoutListItem {LI} at (40,18) size 617x18 [color=#808080] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...as should this...." - LayoutListItem {LI} at (40,36) size 617x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "...but this one should be green." - LayoutListItem {LI} at (40,90) size 657x18 [color=#660000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 174x18 - text run at (0,0) width 174: "This ought to be dark red..." - LayoutListItem {LI} at (40,108) size 657x18 [color=#008000] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 87x18 - text run at (0,0) width 87: "...this green..." - LayoutListItem {LI} at (40,126) size 657x18 [color=#0000FF] - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 98x18 - text run at (0,0) width 98: "...and this blue." - LayoutBlockFlow {P} at (4,164) size 697x18 [color=#0000FF] - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "This sentence should be blue (STYLE attr.)." - LayoutBlockFlow {P} at (4,198) size 697x18 [color=#800080] - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "This sentence should be purple [" - LayoutInline {CODE} at (0,0) size 95x15 - LayoutText {#text} at (207,2) size 95x15 - text run at (207,2) width 95: "class=\"test\"" - LayoutText {#text} at (301,0) size 10x18 - text run at (301,0) width 10: "]." - LayoutBlockFlow {P} at (4,232) size 697x18 - LayoutText {#text} at (0,0) size 697x18 - text run at (0,0) width 697: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." -layer at (8,220) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,212) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/important-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/important-expected.png deleted file mode 100644 index b11aa90..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/important-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/important-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/important-expected.txt deleted file mode 100644 index 8444083..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/cascade/important-expected.txt +++ /dev/null
@@ -1,69 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 [color=#008000] - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 227x60 - text run at (0,0) width 227: "P {color: green ! important;}" - text run at (226,0) width 1: " " - text run at (0,15) width 118: "P {color: red;}" - text run at (117,15) width 1: " " - text run at (0,30) width 172: "P#id1 {color: purple;}" - text run at (171,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x36 [color=#008000] - LayoutText {#text} at (0,0) size 784x36 - text run at (0,0) width 784: "This sentence should be green, because the declaration marked important should override any other normal declaration for" - text run at (0,18) width 366: "the same element, even if it occurs later in the stylesheet." - LayoutBlockFlow {P} at (0,177) size 784x36 [color=#008000] - LayoutText {#text} at (0,0) size 409x18 - text run at (0,0) width 409: "This sentence should also be green, even though it has an ID of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (408,2) size 25x15 - text run at (408,2) width 25: "id1" - LayoutText {#text} at (432,0) size 738x36 - text run at (432,0) width 263: ", which would ordinarily make it purple. " - text run at (694,0) width 44: "This is" - text run at (0,18) width 714: "because declarations marked important have more weight than normal declarations given in a STYLE attribute." - LayoutBlockFlow {P} at (0,229) size 784x36 [color=#008000] - LayoutText {#text} at (0,0) size 712x36 - text run at (0,0) width 615: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (614,0) width 98: "This is because" - text run at (0,18) width 659: "declarations marked important have more weight than normal declarations given in a STYLE attribute." - LayoutTable {TABLE} at (0,281) size 784x176 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x174 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x148 - LayoutTableCell {TD} at (0,87) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x148 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x36 [color=#008000] - LayoutText {#text} at (0,0) size 761x36 - text run at (0,0) width 761: "This sentence should be green, because the declaration marked important should override any other normal declaration" - text run at (0,18) width 388: "for the same element, even if it occurs later in the stylesheet." - LayoutBlockFlow {P} at (4,56) size 762x36 [color=#008000] - LayoutText {#text} at (0,0) size 409x18 - text run at (0,0) width 409: "This sentence should also be green, even though it has an ID of " - LayoutInline {TT} at (0,0) size 25x15 - LayoutText {#text} at (408,2) size 25x15 - text run at (408,2) width 25: "id1" - LayoutText {#text} at (432,0) size 738x36 - text run at (432,0) width 263: ", which would ordinarily make it purple. " - text run at (694,0) width 44: "This is" - text run at (0,18) width 714: "because declarations marked important have more weight than normal declarations given in a STYLE attribute." - LayoutBlockFlow {P} at (4,108) size 762x36 [color=#008000] - LayoutText {#text} at (0,0) size 712x36 - text run at (0,0) width 615: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (614,0) width 98: "This is because" - text run at (0,18) width 659: "declarations marked important have more weight than normal declarations given in a STYLE attribute." -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/display-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/display-expected.png deleted file mode 100644 index aa17561..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/display-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/display-expected.txt deleted file mode 100644 index 8a2b75f..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/display-expected.txt +++ /dev/null
@@ -1,130 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 816 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x816 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x816 - LayoutBlockFlow {BODY} at (8,8) size 769x800 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x75 - LayoutText {#text} at (0,0) size 554x75 - text run at (0,0) width 172: ".one {display: block;}" - text run at (171,0) width 1: " " - text run at (0,15) width 180: ".two {display: inline;}" - text run at (179,15) width 1: " " - text run at (0,30) width 554: ".three {display: list-item; list-style-type: square; margin-left: 3em;}" - text run at (553,30) width 1: " " - text run at (0,45) width 266: ".four {display: none; color: red;}" - text run at (265,45) width 1: " " - text run at (0,60) width 149: "I {display: block;}" - text run at (148,60) width 1: " " - LayoutBlockFlow {P} at (0,140) size 769x18 - LayoutText {#text} at (0,0) size 299x18 - text run at (0,0) width 299: "This sentence should be a block-level element." - LayoutBlockFlow (anonymous) at (0,174) size 769x54 - LayoutInline {P} at (0,0) size 458x18 - LayoutText {#text} at (0,0) size 458x18 - text run at (0,0) width 458: "This sentence should be part of an inline element, as are the next three. " - LayoutInline {P} at (0,0) size 748x54 - LayoutText {#text} at (457,0) size 748x54 - text run at (457,0) width 280: "This sentence and the next two are part of a" - text run at (0,18) width 148: "second inline element. " - text run at (147,18) width 601: "They should therefore appear, along with the sentence above, to be all one paragraph which is" - text run at (0,36) width 133: "four sentences long. " - text run at (132,36) width 256: "If this is not the case, then the keyword " - LayoutInline {CODE} at (0,0) size 48x15 - LayoutText {#text} at (387,38) size 48x15 - text run at (387,38) width 48: "inline" - LayoutText {#text} at (434,36) size 112x18 - text run at (434,36) width 112: " is being ignored." - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {P} at (48,244) size 721x54 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 694x36 - text run at (0,0) width 694: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list" - text run at (0,18) width 58: "items (if " - LayoutInline {CODE} at (0,0) size 118x15 - LayoutText {#text} at (57,20) size 118x15 - text run at (57,20) width 118: "list-style-type" - LayoutText {#text} at (174,18) size 720x36 - text run at (174,18) width 369: " is supported, there will be a square for the item marker). " - text run at (542,18) width 178: "A 3em left margin has been" - text run at (0,36) width 438: "applied in order to ensure that there is space for the list-item marker." - LayoutBlockFlow {P} at (0,314) size 769x18 - LayoutText {#text} at (0,0) size 467x18 - text run at (0,0) width 467: "The next paragraph should be invisible (if it's visible, you'll see red text)." - LayoutBlockFlow {P} at (0,348) size 769x18 - LayoutText {#text} at (0,0) size 252x18 - text run at (0,0) width 252: "There should be no text after the colon:" - LayoutBlockFlow {P} at (0,382) size 769x54 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "The italicized text" - LayoutBlockFlow {I} at (0,18) size 769x18 - LayoutText {#text} at (0,0) size 113x18 - text run at (0,0) width 113: "in this paragraph" - LayoutBlockFlow (anonymous) at (0,36) size 769x18 - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "should be a block-level element." - LayoutTable {TABLE} at (0,452) size 769x348 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x346 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x320 - LayoutTableCell {TD} at (0,173) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x320 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 299x18 - text run at (0,0) width 299: "This sentence should be a block-level element." - LayoutBlockFlow (anonymous) at (4,38) size 747x54 - LayoutInline {P} at (0,0) size 458x18 - LayoutText {#text} at (0,0) size 458x18 - text run at (0,0) width 458: "This sentence should be part of an inline element, as are the next three. " - LayoutInline {P} at (0,0) size 737x54 - LayoutText {#text} at (457,0) size 737x54 - text run at (457,0) width 280: "This sentence and the next two are part of a" - text run at (0,18) width 148: "second inline element. " - text run at (147,18) width 587: "They should therefore appear, along with the sentence above, to be all one paragraph which" - text run at (0,36) width 148: "is four sentences long. " - text run at (147,36) width 256: "If this is not the case, then the keyword " - LayoutInline {CODE} at (0,0) size 47x15 - LayoutText {#text} at (402,38) size 47x15 - text run at (402,38) width 47: "inline" - LayoutText {#text} at (448,36) size 113x18 - text run at (448,36) width 113: " is being ignored." - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {P} at (52,108) size 699x54 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 694x36 - text run at (0,0) width 694: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list" - text run at (0,18) width 58: "items (if " - LayoutInline {CODE} at (0,0) size 118x15 - LayoutText {#text} at (57,20) size 118x15 - text run at (57,20) width 118: "list-style-type" - LayoutText {#text} at (174,18) size 686x36 - text run at (174,18) width 369: " is supported, there will be a square for the item marker). " - text run at (542,18) width 144: "A 3em left margin has" - text run at (0,36) width 472: "been applied in order to ensure that there is space for the list-item marker." - LayoutBlockFlow {P} at (4,178) size 747x18 - LayoutText {#text} at (0,0) size 467x18 - text run at (0,0) width 467: "The next paragraph should be invisible (if it's visible, you'll see red text)." - LayoutBlockFlow {P} at (4,212) size 747x18 - LayoutText {#text} at (0,0) size 252x18 - text run at (0,0) width 252: "There should be no text after the colon:" - LayoutBlockFlow {P} at (4,246) size 747x54 - LayoutBlockFlow (anonymous) at (0,0) size 747x18 - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "The italicized text" - LayoutBlockFlow {I} at (0,18) size 747x18 - LayoutText {#text} at (0,0) size 113x18 - text run at (0,0) width 113: "in this paragraph" - LayoutBlockFlow (anonymous) at (0,36) size 747x18 - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "should be a block-level element." -layer at (8,130) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,122) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style-expected.png deleted file mode 100644 index 49fc1be..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style-expected.txt deleted file mode 100644 index fcaeb27..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style-expected.txt +++ /dev/null
@@ -1,54 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x30 - LayoutText {#text} at (0,0) size 484x30 - text run at (0,0) width 297: ".one {list-style: upper-alpha inside;}" - text run at (296,0) width 1: " " - text run at (0,15) width 484: ".two {list-style: url(../resources/oransqr.gif) disc outside;}" - text run at (483,15) width 1: " " - LayoutBlockFlow {UL} at (0,95) size 784x36 - LayoutListItem {LI} at (40,0) size 744x36 - LayoutListMarker (anonymous) at (0,0) size 19.55x18: "A" - LayoutText {#text} at (19,0) size 695x36 - text run at (19,0) width 676: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left" - text run at (0,18) width 345: "margin, leaving no blank space beneath the capital-A." - LayoutBlockFlow {UL} at (0,147) size 784x37 - LayoutListItem {LI} at (40,0) size 744x37 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 727x36 - text run at (0,1) width 489: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (488,1) width 239: "Also, the bullet should be outside the" - text run at (0,19) width 290: "text block, as the list has been set to 'outside'." - LayoutTable {TABLE} at (0,200) size 784x141 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x139 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x113 - LayoutTableCell {TD} at (0,69) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x113 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 762x36 - LayoutListItem {LI} at (40,0) size 722x36 - LayoutListMarker (anonymous) at (0,0) size 19.55x18: "A" - LayoutText {#text} at (19,0) size 695x36 - text run at (19,0) width 676: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left" - text run at (0,18) width 345: "margin, leaving no blank space beneath the capital-A." - LayoutBlockFlow {UL} at (4,56) size 762x37 - LayoutListItem {LI} at (40,0) size 722x37 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 703x36 - text run at (0,1) width 489: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (488,1) width 215: "Also, the bullet should be outside" - text run at (0,19) width 314: "the text block, as the list has been set to 'outside'." -layer at (8,85) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_image-expected.png deleted file mode 100644 index eeccd98..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_image-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_image-expected.txt deleted file mode 100644 index ed7aedd..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_image-expected.txt +++ /dev/null
@@ -1,81 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 430x45 - text run at (0,0) width 430: ".one {list-style-image: url(../resources/oransqr.gif);}" - text run at (429,0) width 1: " " - text run at (0,15) width 235: ".two {list-style-image: none;}" - text run at (234,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {UL} at (0,110) size 784x57 - LayoutListItem {LI} at (40,0) size 744x19 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 64x18 - text run at (0,1) width 64: "This list..." - LayoutListItem {LI} at (40,19) size 744x19 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 116x18 - text run at (0,1) width 116: "...should feature..." - LayoutListItem {LI} at (40,38) size 744x19 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 150x18 - text run at (0,1) width 150: "...images for each item." - LayoutBlockFlow {UL} at (0,183) size 784x54 - LayoutListItem {LI} at (40,0) size 744x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 744x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 744x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "...standard list markers for each item." - LayoutTable {TABLE} at (0,253) size 300x179 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 298x177 - LayoutTableRow {TR} at (0,0) size 298x26 - LayoutTableCell {TD} at (0,0) size 298x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 298x151 - LayoutTableCell {TD} at (0,88) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 286x151 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 278x57 - LayoutListItem {LI} at (40,0) size 238x19 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 64x18 - text run at (0,1) width 64: "This list..." - LayoutListItem {LI} at (40,19) size 238x19 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 116x18 - text run at (0,1) width 116: "...should feature..." - LayoutListItem {LI} at (40,38) size 238x19 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,1) size 150x18 - text run at (0,1) width 150: "...images for each item." - LayoutBlockFlow {UL} at (4,77) size 278x54 - LayoutListItem {LI} at (40,0) size 238x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 238x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 238x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 238x18 - text run at (0,0) width 238: "...standard list markers for each item." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_position-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_position-expected.png deleted file mode 100644 index 8ec70df..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_position-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_position-expected.txt deleted file mode 100644 index 525a27f..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_position-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 281x45 - text run at (0,0) width 281: ".one {list-style-position: outside;}" - text run at (280,0) width 1: " " - text run at (0,15) width 274: ".two {list-style-position: inside;}" - text run at (273,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {UL} at (0,110) size 784x36 - LayoutListItem {LI} at (40,0) size 744x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 743x36 - text run at (0,0) width 743: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank" - text run at (0,18) width 158: "space beneath the bullet." - LayoutBlockFlow {UL} at (0,162) size 784x36 - LayoutListItem {LI} at (40,0) size 744x36 - LayoutListMarker (anonymous) at (-1,0) size 7x18: bullet - LayoutText {#text} at (22,0) size 727x36 - text run at (22,0) width 705: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin," - text run at (0,18) width 268: "leaving no blank space beneath the bullet." - LayoutTable {TABLE} at (0,214) size 784x140 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x138 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x112 - LayoutTableCell {TD} at (0,69) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x112 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 762x36 - LayoutListItem {LI} at (40,0) size 722x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 704x36 - text run at (0,0) width 704: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving" - text run at (0,18) width 197: "blank space beneath the bullet." - LayoutBlockFlow {UL} at (4,56) size 762x36 - LayoutListItem {LI} at (40,0) size 722x36 - LayoutListMarker (anonymous) at (-1,0) size 7x18: bullet - LayoutText {#text} at (22,0) size 674x36 - text run at (22,0) width 652: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left" - text run at (0,18) width 321: "margin, leaving no blank space beneath the bullet." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_type-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_type-expected.png deleted file mode 100644 index 2c26b31..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_type-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_type-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_type-expected.txt deleted file mode 100644 index f57e3831..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/list_style_type-expected.txt +++ /dev/null
@@ -1,271 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1527 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1527 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1527 - LayoutBlockFlow {BODY} at (8,8) size 769x1511 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x150 - LayoutText {#text} at (0,0) size 297x150 - text run at (0,0) width 227: ".one {list-style-type: disc;}" - text run at (226,0) width 1: " " - text run at (0,15) width 242: ".two {list-style-type: circle;}" - text run at (241,15) width 1: " " - text run at (0,30) width 258: ".three {list-style-type: square;}" - text run at (257,30) width 1: " " - text run at (0,45) width 289: ".four {list-style-type: lower-roman;}" - text run at (288,45) width 1: " " - text run at (0,60) width 289: ".five {list-style-type: upper-roman;}" - text run at (288,60) width 1: " " - text run at (0,75) width 281: ".six {list-style-type: lower-alpha;}" - text run at (280,75) width 1: " " - text run at (0,90) width 297: ".seven {list-style-type: upper-alpha;}" - text run at (296,90) width 1: " " - text run at (0,105) width 266: ".eight {list-style-type: decimal;}" - text run at (265,105) width 1: " " - text run at (0,120) width 235: ".nine {list-style-type: none;}" - text run at (234,120) width 1: " " - text run at (0,135) width 0: " " - LayoutBlockFlow {UL} at (0,215) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 137x18 - text run at (0,0) width 137: "...discs for each item." - LayoutBlockFlow {UL} at (0,285) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 147x18 - text run at (0,0) width 147: "...circles for each item." - LayoutBlockFlow {UL} at (0,355) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 153x18 - text run at (0,0) width 153: "...squares for each item." - LayoutBlockFlow {OL} at (0,425) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-12.44,0) size 12.44x18: "i" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-16.89,0) size 16.89x18: "ii" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-21.33,0) size 21.33x18: "iii" - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "...lowercase Roman numerals for each item." - LayoutBlockFlow {OL} at (0,495) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-13.33,0) size 13.33x18: "I" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-18.66,0) size 18.66x18: "II" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-23.98,0) size 23.98x18: "III" - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "...uppercase Roman numerals for each item." - LayoutBlockFlow {OL} at (0,565) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-15.09,0) size 15.09x18: "a" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "b" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-15.09,0) size 15.09x18: "c" - LayoutText {#text} at (0,0) size 212x18 - text run at (0,0) width 212: "...lowercase letters for each item." - LayoutBlockFlow {OL} at (0,635) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-19.55,0) size 19.55x18: "A" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-18.67,0) size 18.67x18: "B" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-18.67,0) size 18.67x18: "C" - LayoutText {#text} at (0,0) size 212x18 - text run at (0,0) width 212: "...uppercase letters for each item." - LayoutBlockFlow {OL} at (0,705) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-19.55,0) size 19.55x18: "A" - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "This list should feature..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutListMarker (anonymous) at (-18.67,0) size 18.67x18: "B" - LayoutText {#text} at (0,0) size 152x18 - text run at (0,0) width 152: "...letters for each item..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "3" - LayoutText {#text} at (0,0) size 112x18 - text run at (0,0) width 112: "...except this one." - LayoutBlockFlow {UL} at (0,775) size 769x54 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 729x18 - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 729x18 - LayoutText {#text} at (0,0) size 154x18 - text run at (0,0) width 154: "...nothing for each item." - LayoutTable {TABLE} at (0,845) size 344x666 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 342x664 - LayoutTableRow {TR} at (0,0) size 342x26 - LayoutTableCell {TD} at (0,0) size 342x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 342x638 - LayoutTableCell {TD} at (0,332) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 330x638 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 137x18 - text run at (0,0) width 137: "...discs for each item." - LayoutBlockFlow {UL} at (4,74) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutText {#text} at (0,0) size 147x18 - text run at (0,0) width 147: "...circles for each item." - LayoutBlockFlow {UL} at (4,144) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: black square - LayoutText {#text} at (0,0) size 153x18 - text run at (0,0) width 153: "...squares for each item." - LayoutBlockFlow {OL} at (4,214) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-12.44,0) size 12.44x18: "i" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-16.89,0) size 16.89x18: "ii" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-21.33,0) size 21.33x18: "iii" - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "...lowercase Roman numerals for each item." - LayoutBlockFlow {OL} at (4,284) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-13.33,0) size 13.33x18: "I" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-18.66,0) size 18.66x18: "II" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-23.98,0) size 23.98x18: "III" - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "...uppercase Roman numerals for each item." - LayoutBlockFlow {OL} at (4,354) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-15.09,0) size 15.09x18: "a" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "b" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-15.09,0) size 15.09x18: "c" - LayoutText {#text} at (0,0) size 212x18 - text run at (0,0) width 212: "...lowercase letters for each item." - LayoutBlockFlow {OL} at (4,424) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-19.55,0) size 19.55x18: "A" - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-18.67,0) size 18.67x18: "B" - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-18.67,0) size 18.67x18: "C" - LayoutText {#text} at (0,0) size 212x18 - text run at (0,0) width 212: "...uppercase letters for each item." - LayoutBlockFlow {OL} at (4,494) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutListMarker (anonymous) at (-19.55,0) size 19.55x18: "A" - LayoutText {#text} at (0,0) size 160x18 - text run at (0,0) width 160: "This list should feature..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutListMarker (anonymous) at (-18.67,0) size 18.67x18: "B" - LayoutText {#text} at (0,0) size 152x18 - text run at (0,0) width 152: "...letters for each item..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "3" - LayoutText {#text} at (0,0) size 112x18 - text run at (0,0) width 112: "...except this one." - LayoutBlockFlow {UL} at (4,564) size 322x54 - LayoutListItem {LI} at (40,0) size 282x18 - LayoutText {#text} at (0,0) size 64x18 - text run at (0,0) width 64: "This list..." - LayoutListItem {LI} at (40,18) size 282x18 - LayoutText {#text} at (0,0) size 116x18 - text run at (0,0) width 116: "...should feature..." - LayoutListItem {LI} at (40,36) size 282x18 - LayoutText {#text} at (0,0) size 154x18 - text run at (0,0) width 154: "...nothing for each item." -layer at (8,205) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,197) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/white_space-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/white_space-expected.png deleted file mode 100644 index 9c6003a6..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/white_space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/white_space-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/white_space-expected.txt deleted file mode 100644 index ef8ed43..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/classification/white_space-expected.txt +++ /dev/null
@@ -1,81 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 936 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 227x60 - text run at (0,0) width 188: ".one {white-space: pre;}" - text run at (187,0) width 1: " " - text run at (0,15) width 211: ".two {white-space: nowrap;}" - text run at (210,15) width 1: " " - text run at (0,30) width 227: ".three {white-space: normal;}" - text run at (226,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x90 - LayoutText {#text} at (0,0) size 576x90 - text run at (0,0) width 0: " " - text run at (0,18) width 576: "This sentence should show extra space where there would ordinarily not be any." - text run at (575,18) width 1: " " - text run at (0,36) width 302: " There should also be preservation of returns" - text run at (301,36) width 1: " " - text run at (0,54) width 100: "as this sentence" - text run at (99,54) width 1: " " - text run at (0,72) width 189: " very clearly demonstrates." - text run at (188,72) width 1: " " - LayoutBlockFlow {P} at (0,231) size 784x18 - LayoutText {#text} at (0,0) size 906x18 - text run at (0,0) width 906: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - LayoutBlockFlow {P} at (0,265) size 784x36 - LayoutText {#text} at (0,0) size 300x36 - text run at (0,0) width 0: " " - text run at (0,18) width 300: "This sentence should show extra space, " - LayoutInline {SPAN} at (0,0) size 160x18 - LayoutText {#text} at (299,18) size 160x18 - text run at (299,18) width 87: "except in the " - text run at (385,18) width 74: "second half" - LayoutText {#text} at (458,18) size 5x18 - text run at (458,18) width 5: "." - text run at (462,18) width 1: " " - LayoutTable {TABLE} at (0,317) size 928x212 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 926x210 - LayoutTableRow {TR} at (0,0) size 926x26 - LayoutTableCell {TD} at (0,0) size 926x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 926x184 - LayoutTableCell {TD} at (0,105) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 914x184 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 906x90 - LayoutText {#text} at (0,0) size 576x90 - text run at (0,0) width 0: " " - text run at (0,18) width 576: "This sentence should show extra space where there would ordinarily not be any." - text run at (575,18) width 1: " " - text run at (0,36) width 302: " There should also be preservation of returns" - text run at (301,36) width 1: " " - text run at (0,54) width 100: "as this sentence" - text run at (99,54) width 1: " " - text run at (0,72) width 189: " very clearly demonstrates." - text run at (188,72) width 1: " " - LayoutBlockFlow {P} at (4,110) size 906x18 - LayoutText {#text} at (0,0) size 906x18 - text run at (0,0) width 906: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - LayoutBlockFlow {P} at (4,144) size 906x36 - LayoutText {#text} at (0,0) size 300x36 - text run at (0,0) width 0: " " - text run at (0,18) width 300: "This sentence should show extra space, " - LayoutInline {SPAN} at (0,0) size 160x18 - LayoutText {#text} at (299,18) size 160x18 - text run at (299,18) width 87: "except in the " - text run at (385,18) width 74: "second half" - LayoutText {#text} at (458,18) size 5x18 - text run at (458,18) width 5: "." - text run at (462,18) width 1: " " -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background-expected.png deleted file mode 100644 index dd92bbeb..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background-expected.txt deleted file mode 100644 index 04a33a4..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background-expected.txt +++ /dev/null
@@ -1,93 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 721 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x721 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x721 - LayoutBlockFlow {BODY} at (8,8) size 769x705 [bgcolor=#008000] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x60 - LayoutText {#text} at (0,0) size 632x60 - text run at (0,0) width 632: "BODY {background: green url(../resources/oransqr.gif) repeat-x center top fixed;}" - text run at (631,0) width 1: " " - text run at (0,15) width 554: ".one {background: lime url(../resources/oransqr.gif) repeat-y 100% 0%;}" - text run at (553,15) width 1: " " - text run at (0,30) width 578: ".two {background: lime url(../resources/oransqr.gif) repeat-y center top;}" - text run at (577,30) width 1: " " - text run at (0,45) width 578: ".three {background: lime url(../resources/oransqr.gif) repeat-x left top;}" - text run at (577,45) width 1: " " - LayoutBlockFlow {P} at (0,125) size 769x54 - LayoutText {#text} at (0,0) size 741x18 - text run at (0,0) width 741: "This document should have a green background with an orange strip running across the entire top of the page, since" - LayoutInline {CODE} at (0,0) size 63x15 - LayoutText {#text} at (0,20) size 63x15 - text run at (0,20) width 63: "repeat-x" - LayoutText {#text} at (62,18) size 768x36 - text run at (62,18) width 308: " indicates tiling in both directions of the x-axis. " - text run at (369,18) width 304: "Furthermore, the strip should be fixed in place. " - text run at (672,18) width 96: "I'll have to add" - text run at (0,36) width 502: "extra text at the end of this page to make it long enough to scroll conveniently." - LayoutBlockFlow {P} at (0,195) size 769x54 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 758x54 - text run at (0,0) width 758: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,18) width 717: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" - text run at (0,36) width 183: "handling these declarations. " - text run at (182,36) width 311: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (0,265) size 769x54 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 766x54 - text run at (0,0) width 766: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." - text run at (0,18) width 717: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" - text run at (0,36) width 183: "handling these declarations. " - text run at (182,36) width 311: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (0,335) size 769x54 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 758x54 - text run at (0,0) width 758: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,18) width 717: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in" - text run at (0,36) width 183: "handling these declarations. " - text run at (182,36) width 311: "Hey, I didn't say the page would be pretty, did I?" - LayoutTable {TABLE} at (0,405) size 769x300 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x298 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x272 - LayoutTableCell {TD} at (0,149) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x272 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x54 - LayoutText {#text} at (0,0) size 741x18 - text run at (0,0) width 741: "This document should have a green background with an orange strip running across the entire top of the page, since" - LayoutInline {CODE} at (0,0) size 63x15 - LayoutText {#text} at (0,20) size 63x15 - text run at (0,20) width 63: "repeat-x" - LayoutText {#text} at (62,18) size 741x36 - text run at (62,18) width 308: " indicates tiling in both directions of the x-axis. " - text run at (369,18) width 304: "Furthermore, the strip should be fixed in place. " - text run at (672,18) width 69: "I'll have to" - text run at (0,36) width 530: "add extra text at the end of this page to make it long enough to scroll conveniently." - LayoutBlockFlow {P} at (4,74) size 747x54 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 704x54 - text run at (0,0) width 704: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the" - text run at (0,18) width 54: "bottom. " - text run at (53,18) width 645: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your" - text run at (0,36) width 255: "browser in handling these declarations. " - text run at (254,36) width 311: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (4,144) size 747x54 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 713x54 - text run at (0,0) width 713: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the" - text run at (0,18) width 54: "bottom. " - text run at (53,18) width 645: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your" - text run at (0,36) width 255: "browser in handling these declarations. " - text run at (254,36) width 311: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (4,214) size 747x54 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 739x54 - text run at (0,0) width 720: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top" - text run at (0,18) width 39: "right. " - text run at (38,18) width 701: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser" - text run at (0,36) width 199: "in handling these declarations. " - text run at (198,36) width 311: "Hey, I didn't say the page would be pretty, did I?" -layer at (8,115) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt deleted file mode 100644 index a3fa681..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt +++ /dev/null
@@ -1,185 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 858 scrollHeight 1195 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1195 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1194.53 - LayoutBlockFlow {BODY} at (8,8) size 784x1178.53 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x30 - LayoutText {#text} at (0,0) size 851x30 - text run at (0,0) width 851: "BODY {background-image: url(../resources/bg.gif); background-repeat: repeat-x; background-attachment: fixed;}" - text run at (850,0) width 1: " " - text run at (0,15) width 0: " " - LayoutBlockFlow {P} at (0,95) size 784x90 - LayoutText {#text} at (0,0) size 778x90 - text run at (0,0) width 778: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does" - text run at (0,18) width 204: "NOT scroll with the document. " - text run at (203,18) width 563: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when" - text run at (0,36) width 199: "the end of the page is reached. " - text run at (198,36) width 574: "In addition, the default Test Suite background should NOT appear, as it's been overridden" - text run at (0,54) width 176: "by the styles shown above. " - text run at (175,54) width 560: "I'll have to add a lot of extra text to the page in order to make all this something we can" - text run at (0,72) width 100: "actually check. " - text run at (99,72) width 231: "Don't worry, I'll think of something." - LayoutBlockFlow {P} at (0,201) size 784x18 - LayoutText {#text} at (0,0) size 518x18 - text run at (0,0) width 425: "In fact, why not the relevant section from the CSS1 specification? " - text run at (424,0) width 94: "A capital idea." - LayoutBlockFlow {H4} at (0,268.27) size 784x18 - LayoutInline {A} at (0,0) size 222x18 - LayoutText {#text} at (0,0) size 222x18 - text run at (0,0) width 222: "5.3.5 'background-attachment'" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,307.53) size 784x90 - LayoutInline {EM} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Value:" - LayoutText {#text} at (40,0) size 84x18 - text run at (40,0) width 84: " scroll | fixed" - LayoutBR {BR} at (123,14) size 1x0 - LayoutInline {EM} at (0,0) size 45x18 - LayoutText {#text} at (0,18) size 45x18 - text run at (0,18) width 45: "Initial:" - LayoutText {#text} at (44,18) size 40x18 - text run at (44,18) width 40: " scroll" - LayoutBR {BR} at (83,32) size 1x0 - LayoutInline {EM} at (0,0) size 70x18 - LayoutText {#text} at (0,36) size 70x18 - text run at (0,36) width 70: "Applies to:" - LayoutText {#text} at (69,36) size 82x18 - text run at (69,36) width 82: " all elements" - LayoutBR {BR} at (150,50) size 1x0 - LayoutInline {EM} at (0,0) size 64x18 - LayoutText {#text} at (0,54) size 64x18 - text run at (0,54) width 64: "Inherited:" - LayoutText {#text} at (63,54) size 21x18 - text run at (63,54) width 21: " no" - LayoutBR {BR} at (83,68) size 1x0 - LayoutInline {EM} at (0,0) size 123x18 - LayoutText {#text} at (0,72) size 123x18 - text run at (0,72) width 123: "Percentage values:" - LayoutText {#text} at (122,72) size 33x18 - text run at (122,72) width 33: " N/A" - LayoutBR {BR} at (154,86) size 1x0 - LayoutBlockFlow {P} at (0,413.53) size 784x36 - LayoutText {#text} at (0,0) size 781x36 - text run at (0,0) width 781: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas" - text run at (0,18) width 237: "or if it scrolls along with the content." - LayoutBlockFlow {PRE} at (0,465.53) size 784x75 - LayoutText {#text} at (0,0) size 289x75 - text run at (0,0) width 71: " BODY { " - text run at (70,0) width 1: " " - text run at (0,15) width 289: " background: red url(pendant.gif);" - text run at (288,15) width 1: " " - text run at (0,30) width 250: " background-repeat: repeat-y;" - text run at (249,30) width 1: " " - text run at (0,45) width 258: " background-attachment: fixed;" - text run at (257,45) width 1: " " - text run at (0,60) width 24: " }" - text run at (23,60) width 1: " " - LayoutBlockFlow {P} at (0,556.53) size 784x54 - LayoutInline {EM} at (0,0) size 72x18 - LayoutText {#text} at (0,0) size 72x18 - text run at (0,0) width 72: "CSS1 core:" - LayoutText {#text} at (71,0) size 778x54 - text run at (71,0) width 683: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" - text run at (0,18) width 778: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that support" - text run at (0,36) width 42: "'fixed'." - LayoutTable {TABLE} at (0,626.53) size 784x552 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x550 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x524 - LayoutTableCell {TD} at (0,275) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x523.53 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x90 - LayoutText {#text} at (0,0) size 760x90 - text run at (0,0) width 745: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which" - text run at (0,18) width 237: "does NOT scroll with the document. " - text run at (236,18) width 524: "It should, instead, appear to be a fixed pattern past which the content scrolls, even" - text run at (0,36) width 237: "when the end of the page is reached. " - text run at (236,36) width 501: "In addition, the default Test Suite background should NOT appear, as it's been" - text run at (0,54) width 250: "overridden by the styles shown above. " - text run at (249,54) width 510: "I'll have to add a lot of extra text to the page in order to make all this something" - text run at (0,72) width 149: "we can actually check. " - text run at (148,72) width 231: "Don't worry, I'll think of something." - LayoutBlockFlow {P} at (4,110) size 762x18 - LayoutText {#text} at (0,0) size 518x18 - text run at (0,0) width 425: "In fact, why not the relevant section from the CSS1 specification? " - text run at (424,0) width 94: "A capital idea." - LayoutBlockFlow {H4} at (4,177.27) size 762x18 - LayoutInline {A} at (0,0) size 222x18 - LayoutText {#text} at (0,0) size 222x18 - text run at (0,0) width 222: "5.3.5 'background-attachment'" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,216.53) size 762x90 - LayoutInline {EM} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Value:" - LayoutText {#text} at (40,0) size 84x18 - text run at (40,0) width 84: " scroll | fixed" - LayoutBR {BR} at (123,14) size 1x0 - LayoutInline {EM} at (0,0) size 45x18 - LayoutText {#text} at (0,18) size 45x18 - text run at (0,18) width 45: "Initial:" - LayoutText {#text} at (44,18) size 40x18 - text run at (44,18) width 40: " scroll" - LayoutBR {BR} at (83,32) size 1x0 - LayoutInline {EM} at (0,0) size 70x18 - LayoutText {#text} at (0,36) size 70x18 - text run at (0,36) width 70: "Applies to:" - LayoutText {#text} at (69,36) size 82x18 - text run at (69,36) width 82: " all elements" - LayoutBR {BR} at (150,50) size 1x0 - LayoutInline {EM} at (0,0) size 64x18 - LayoutText {#text} at (0,54) size 64x18 - text run at (0,54) width 64: "Inherited:" - LayoutText {#text} at (63,54) size 21x18 - text run at (63,54) width 21: " no" - LayoutBR {BR} at (83,68) size 1x0 - LayoutInline {EM} at (0,0) size 123x18 - LayoutText {#text} at (0,72) size 123x18 - text run at (0,72) width 123: "Percentage values:" - LayoutText {#text} at (122,72) size 33x18 - text run at (122,72) width 33: " N/A" - LayoutBR {BR} at (154,86) size 1x0 - LayoutBlockFlow {P} at (4,322.53) size 762x36 - LayoutText {#text} at (0,0) size 734x36 - text run at (0,0) width 734: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the" - text run at (0,18) width 284: "canvas or if it scrolls along with the content." - LayoutBlockFlow {PRE} at (4,374.53) size 762x75 - LayoutText {#text} at (0,0) size 289x75 - text run at (0,0) width 71: " BODY { " - text run at (70,0) width 1: " " - text run at (0,15) width 289: " background: red url(pendant.gif);" - text run at (288,15) width 1: " " - text run at (0,30) width 250: " background-repeat: repeat-y;" - text run at (249,30) width 1: " " - text run at (0,45) width 258: " background-attachment: fixed;" - text run at (257,45) width 1: " " - text run at (0,60) width 24: " }" - text run at (23,60) width 1: " " - LayoutBlockFlow {P} at (4,465.53) size 762x54 - LayoutInline {EM} at (0,0) size 72x18 - LayoutText {#text} at (0,0) size 72x18 - text run at (0,0) width 72: "CSS1 core:" - LayoutText {#text} at (71,0) size 754x54 - text run at (71,0) width 683: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the" - text run at (0,18) width 726: "HTML and BODY elements, since there is no way for an author to provide an image only for those browsers that" - text run at (0,36) width 94: "support 'fixed'." -layer at (8,85) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,243) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,235) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,253) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,245) size 784x2 [border: (1px inset #EEEEEE)] -layer at (25,806) size 762x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,144) size 762x2 [border: (1px inset #EEEEEE)] -layer at (25,816) size 762x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,154) size 762x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_color-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_color-expected.png deleted file mode 100644 index f4488f7..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt deleted file mode 100644 index 2540bb6..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt +++ /dev/null
@@ -1,84 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 289x60 - text run at (0,0) width 219: "P {background-color: green;}" - text run at (218,0) width 1: " " - text run at (0,15) width 235: ".one {background-color: lime;}" - text run at (234,15) width 1: " " - text run at (0,30) width 289: ".two {background-color: transparent;}" - text run at (288,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x18 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "This element's background should be green." - LayoutBlockFlow {P} at (0,159) size 784x18 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 358x18 - text run at (0,0) width 358: "This element's background should be lime (light green)." - LayoutBlockFlow {P} at (0,193) size 784x54 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 663x18 - text run at (0,0) width 663: "This element's background should be green, and the last word in this sentence should also have a green " - LayoutInline {SPAN} at (0,0) size 77x18 - LayoutText {#text} at (662,0) size 77x18 - text run at (662,0) width 77: "background" - LayoutText {#text} at (738,0) size 775x54 - text run at (738,0) width 9: ". " - text run at (746,0) width 29: "This" - text run at (0,18) width 726: "is because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word" - text run at (0,36) width 187: "\"sentence,\" which was set to " - LayoutInline {CODE} at (0,0) size 87x15 - LayoutText {#text} at (186,38) size 87x15 - text run at (186,38) width 87: "transparent" - LayoutText {#text} at (272,36) size 403x18 - text run at (272,36) width 9: ". " - text run at (280,36) width 395: "If the document background is visible, the browser is in error." - LayoutBlockFlow {P} at (0,263) size 784x18 - LayoutText {#text} at (0,0) size 754x18 - text run at (0,0) width 469: "This element should allow the document background to \"shine through.\" " - text run at (468,0) width 286: "There should be no green backgrounds here!" - LayoutTable {TABLE} at (0,297) size 784x192 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x190 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x164 - LayoutTableCell {TD} at (0,95) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x18 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 282x18 - text run at (0,0) width 282: "This element's background should be green." - LayoutBlockFlow {P} at (4,38) size 762x18 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 358x18 - text run at (0,0) width 358: "This element's background should be lime (light green)." - LayoutBlockFlow {P} at (4,72) size 762x54 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 663x18 - text run at (0,0) width 663: "This element's background should be green, and the last word in this sentence should also have a green " - LayoutInline {SPAN} at (0,0) size 77x18 - LayoutText {#text} at (662,0) size 77x18 - text run at (662,0) width 77: "background" - LayoutText {#text} at (738,0) size 758x54 - text run at (738,0) width 5: "." - text run at (0,18) width 758: "This is because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word" - text run at (0,36) width 187: "\"sentence,\" which was set to " - LayoutInline {CODE} at (0,0) size 87x15 - LayoutText {#text} at (186,38) size 87x15 - text run at (186,38) width 87: "transparent" - LayoutText {#text} at (272,36) size 403x18 - text run at (272,36) width 9: ". " - text run at (280,36) width 395: "If the document background is visible, the browser is in error." - LayoutBlockFlow {P} at (4,142) size 762x18 - LayoutText {#text} at (0,0) size 754x18 - text run at (0,0) width 469: "This element should allow the document background to \"shine through.\" " - text run at (468,0) width 286: "There should be no green backgrounds here!" -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_image-expected.png deleted file mode 100644 index 93cf295d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt deleted file mode 100644 index 95274fa..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt +++ /dev/null
@@ -1,95 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 367x45 - text run at (0,0) width 367: "P {background-image: url(../resources/bg.gif);}" - text run at (366,0) width 1: " " - text run at (0,15) width 235: ".one {background-image: none;}" - text run at (234,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x36 - LayoutText {#text} at (0,0) size 760x36 - text run at (0,0) width 512: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (511,0) width 249: "The background image should also tile" - text run at (0,18) width 678: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - LayoutBlockFlow {P} at (0,162) size 784x72 - LayoutText {#text} at (0,0) size 607x18 - text run at (0,0) width 607: "This sentence should be backed by a repeated green-grid image, as should the last three words " - LayoutInline {STRONG} at (0,0) size 105x18 - LayoutInline {SPAN} at (0,0) size 105x18 - LayoutText {#text} at (606,0) size 105x18 - text run at (606,0) width 105: "in this sentence" - LayoutText {#text} at (710,0) size 757x36 - text run at (710,0) width 9: ". " - text run at (718,0) width 39: "If it is" - text run at (0,18) width 60: "not, then " - LayoutInline {CODE} at (0,0) size 33x15 - LayoutText {#text} at (59,20) size 33x15 - text run at (59,20) width 33: "none" - LayoutText {#text} at (91,18) size 174x18 - text run at (91,18) width 169: " is interpreted incorrectly. " - text run at (259,18) width 6: "(" - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (264,20) size 32x15 - text run at (264,20) width 32: "none" - LayoutText {#text} at (295,18) size 763x54 - text run at (295,18) width 468: " means that the element has no background image, allowing the parent to" - text run at (0,36) width 763: "\"shine through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image" - text run at (0,54) width 118: "should be visible.)" - LayoutBlockFlow {P} at (0,250) size 784x36 - LayoutText {#text} at (0,0) size 774x36 - text run at (0,0) width 774: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\"" - text run at (0,18) width 50: "instead." - LayoutTable {TABLE} at (0,302) size 784x212 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x210 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x184 - LayoutTableCell {TD} at (0,105) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x184 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x36 - LayoutText {#text} at (0,0) size 760x36 - text run at (0,0) width 512: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (511,0) width 249: "The background image should also tile" - text run at (0,18) width 678: "along both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - LayoutBlockFlow {P} at (4,56) size 762x72 - LayoutText {#text} at (0,0) size 607x18 - text run at (0,0) width 607: "This sentence should be backed by a repeated green-grid image, as should the last three words " - LayoutInline {STRONG} at (0,0) size 105x18 - LayoutInline {SPAN} at (0,0) size 105x18 - LayoutText {#text} at (606,0) size 105x18 - text run at (606,0) width 105: "in this sentence" - LayoutText {#text} at (710,0) size 757x36 - text run at (710,0) width 9: ". " - text run at (718,0) width 39: "If it is" - text run at (0,18) width 60: "not, then " - LayoutInline {CODE} at (0,0) size 33x15 - LayoutText {#text} at (59,20) size 33x15 - text run at (59,20) width 33: "none" - LayoutText {#text} at (91,18) size 174x18 - text run at (91,18) width 169: " is interpreted incorrectly. " - text run at (259,18) width 6: "(" - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (264,20) size 32x15 - text run at (264,20) width 32: "none" - LayoutText {#text} at (295,18) size 747x54 - text run at (295,18) width 452: " means that the element has no background image, allowing the parent" - text run at (0,36) width 737: "to \"shine through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's" - text run at (0,54) width 161: "image should be visible.)" - LayoutBlockFlow {P} at (4,144) size 762x36 - LayoutText {#text} at (0,0) size 714x36 - text run at (0,0) width 714: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine" - text run at (0,18) width 110: "through\" instead." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt deleted file mode 100644 index 1e90e84..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt +++ /dev/null
@@ -1,149 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1458 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1458 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1458 - LayoutBlockFlow {BODY} at (8,8) size 769x1442 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x255 - LayoutText {#text} at (0,0) size 671x255 - text run at (0,0) width 632: "BODY {background-image: url(../resources/bg.gif); background-position: right top;" - text run at (631,0) width 1: " " - text run at (0,15) width 281: " background-repeat: no-repeat;}" - text run at (280,15) width 1: " " - text run at (0,30) width 609: ".one {background-image: url(../resources/bg.gif); background-position: center;" - text run at (608,30) width 1: " " - text run at (0,45) width 469: " background-repeat: no-repeat; background-color: aqua;}" - text run at (468,45) width 1: " " - text run at (0,60) width 617: ".two {background-image: url(../resources/bg.gif); background-position: 50% 50%;" - text run at (616,60) width 1: " " - text run at (0,75) width 469: " background-repeat: no-repeat; background-color: aqua;}" - text run at (468,75) width 1: " " - text run at (0,90) width 671: ".three {background-image: url(../resources/bg.gif); background-position: bottom right;" - text run at (670,90) width 1: " " - text run at (0,105) width 484: " background-repeat: no-repeat; background-color: aqua;}" - text run at (483,105) width 1: " " - text run at (0,120) width 640: ".four {background-image: url(../resources/bg.gif); background-position: 100% 100%;" - text run at (639,120) width 1: " " - text run at (0,135) width 476: " background-repeat: no-repeat; background-color: aqua;}" - text run at (475,135) width 1: " " - text run at (0,150) width 617: ".five {background-image: url(../resources/bg.gif); background-position: 0% 50%;" - text run at (616,150) width 1: " " - text run at (0,165) width 476: " background-repeat: no-repeat; background-color: aqua;}" - text run at (475,165) width 1: " " - text run at (0,180) width 617: ".six {background-image: url(../resources/bg.gif); background-position: 75% 25%;" - text run at (616,180) width 1: " " - text run at (0,195) width 476: " background-repeat: no-repeat; background-color: aqua;}" - text run at (475,195) width 1: " " - text run at (0,210) width 648: ".seven {background-image: url(../resources/bg.gif); background-position: 20px 20px;" - text run at (647,210) width 1: " " - text run at (0,225) width 476: " background-repeat: no-repeat; background-color: aqua;}" - text run at (475,225) width 1: " " - text run at (0,240) width 0: " " - LayoutBlockFlow {P} at (0,320) size 769x18 - LayoutText {#text} at (0,0) size 514x18 - text run at (0,0) width 514: "This document should have a single, small green image in its upper right corner." - LayoutBlockFlow {P} at (0,354) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 756x54 - text run at (0,0) width 753: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,18) width 231: "fixed at the center of the paragraph. " - text run at (231,18) width 525: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,36) width 295: "and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (0,424) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 756x54 - text run at (0,0) width 753: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be" - text run at (0,18) width 231: "fixed at the center of the paragraph. " - text run at (231,18) width 525: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,36) width 295: "and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (0,494) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 764x54 - text run at (0,0) width 748: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,18) width 417: "image should be fixed at the lower right corner of the paragraph. " - text run at (416,18) width 348: "The background color will make it easier to determine" - text run at (0,36) width 445: "the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (0,564) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 764x54 - text run at (0,0) width 748: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,18) width 417: "image should be fixed at the lower right corner of the paragraph. " - text run at (416,18) width 348: "The background color will make it easier to determine" - text run at (0,36) width 445: "the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (0,634) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 751x54 - text run at (0,0) width 741: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image" - text run at (0,18) width 323: "should be fixed at the left center of the paragraph. " - text run at (322,18) width 429: "The background color will make it easier to determine the edges of" - text run at (0,36) width 391: "the paragraph, and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (0,704) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 762x54 - text run at (0,0) width 762: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down." - text run at (0,18) width 758: "The background color will make it easier to determine the edges of the paragraph, which should help in determining if" - text run at (0,36) width 683: "all this is so, and the extra text should make the element long enough for this test to be simpler to evaluate." - LayoutBlockFlow {P} at (0,774) size 769x72 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 769x72 - text run at (0,0) width 764: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand" - text run at (0,18) width 759: "corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner" - text run at (0,36) width 100: "of the element. " - text run at (99,36) width 670: "The background color will make it easier to determine the edges of the paragraph, which should assist in" - text run at (0,54) width 124: "evaluating this test." - LayoutTable {TABLE} at (0,862) size 769x580 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x578 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x552 - LayoutTableCell {TD} at (0,289) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x552 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 514x18 - text run at (0,0) width 514: "This document should have a single, small green image in its upper right corner." - LayoutBlockFlow {P} at (4,38) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 734x54 - text run at (0,0) width 734: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should" - text run at (0,18) width 251: "be fixed at the center of the paragraph. " - text run at (250,18) width 453: "The background color will make it easier to determine the edges of the" - text run at (0,36) width 367: "paragraph, and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (4,108) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 734x54 - text run at (0,0) width 734: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should" - text run at (0,18) width 251: "be fixed at the center of the paragraph. " - text run at (250,18) width 453: "The background color will make it easier to determine the edges of the" - text run at (0,36) width 367: "paragraph, and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (4,178) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 748x54 - text run at (0,0) width 748: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,18) width 417: "image should be fixed at the lower right corner of the paragraph. " - text run at (416,18) width 280: "The background color will make it easier to" - text run at (0,36) width 513: "determine the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (4,248) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 748x54 - text run at (0,0) width 748: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the" - text run at (0,18) width 417: "image should be fixed at the lower right corner of the paragraph. " - text run at (416,18) width 280: "The background color will make it easier to" - text run at (0,36) width 513: "determine the edges of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (4,318) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 741x54 - text run at (0,0) width 741: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image" - text run at (0,18) width 323: "should be fixed at the left center of the paragraph. " - text run at (322,18) width 412: "The background color will make it easier to determine the edges" - text run at (0,36) width 408: "of the paragraph, and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (4,388) size 747x72 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 719x72 - text run at (0,0) width 719: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25%" - text run at (0,18) width 44: "down. " - text run at (43,18) width 663: "The background color will make it easier to determine the edges of the paragraph, which should help in" - text run at (0,36) width 717: "determining if all this is so, and the extra text should make the element long enough for this test to be simpler to" - text run at (0,54) width 58: "evaluate." - LayoutBlockFlow {P} at (4,476) size 747x72 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 738x72 - text run at (0,0) width 733: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-" - text run at (0,18) width 728: "hand corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-" - text run at (0,36) width 170: "left corner of the element. " - text run at (169,36) width 569: "The background color will make it easier to determine the edges of the paragraph, which" - text run at (0,54) width 226: "should assist in evaluating this test." -layer at (8,310) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,302) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png deleted file mode 100644 index f2a96c8..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt deleted file mode 100644 index 15c11b7..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt +++ /dev/null
@@ -1,311 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 866 scrollHeight 1838 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1838 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1838 - LayoutBlockFlow {BODY} at (8,8) size 784x1822 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x225 - LayoutText {#text} at (0,0) size 859x225 - text run at (0,0) width 656: ".one {background-image: url(../resources/oransqr.gif); background-repeat: repeat-y;}" - text run at (655,0) width 1: " " - text run at (0,15) width 656: ".two {background-image: url(../resources/oransqr.gif); background-repeat: repeat-x;}" - text run at (655,15) width 1: " " - text run at (0,30) width 679: ".three {background-image: url(../resources/oransqr.gif); background-repeat: no-repeat;}" - text run at (678,30) width 1: " " - text run at (0,45) width 859: ".four {background-image: url(../resources/bg.gif); background-position: 50% 50%; background-repeat: repeat-y;}" - text run at (858,45) width 1: " " - text run at (0,60) width 687: ".five {background-image: url(../resources/crosshair2.gif); background-position: 50% 50%;" - text run at (686,60) width 1: " " - text run at (0,75) width 235: " background-color: red;}" - text run at (234,75) width 1: " " - text run at (0,90) width 703: ".six {background-image: url(../resources/crosshair2.gif); background-position: center top;" - text run at (702,90) width 1: " " - text run at (0,105) width 227: " background-color: red;}" - text run at (226,105) width 1: " " - text run at (0,120) width 703: ".seven {background-image: url(../resources/crosshair2.gif); background-position: top left;" - text run at (702,120) width 1: " " - text run at (0,135) width 242: " background-color: red;}" - text run at (241,135) width 1: " " - text run at (0,150) width 734: ".eight {background-image: url(../resources/crosshair2.gif); background-position: bottom right;" - text run at (733,150) width 1: " " - text run at (0,165) width 242: " background-color: red;}" - text run at (241,165) width 1: " " - text run at (0,180) width 687: ".nine {background-image: url(../resources/crosshair2.gif); background-position: 50% 50%;" - text run at (686,180) width 1: " " - text run at (0,195) width 235: " background-color: red;}" - text run at (234,195) width 1: " " - text run at (0,210) width 0: " " - LayoutBlockFlow {P} at (0,290) size 784x54 - LayoutText {#text} at (0,0) size 779x36 - text run at (0,0) width 779: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default" - text run at (0,18) width 23: "for " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (22,20) size 149x15 - text run at (22,20) width 149: "background-position" - LayoutText {#text} at (170,18) size 740x36 - text run at (170,18) width 328: " is '0% 0%' and that property is not declared here). " - text run at (497,18) width 243: "This is extra text included for the sole" - text run at (0,36) width 264: "purpose of making the paragraph longer. " - text run at (263,36) width 224: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,360) size 784x54 - LayoutText {#text} at (0,0) size 779x36 - text run at (0,0) width 779: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default" - text run at (0,18) width 23: "for " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (22,20) size 149x15 - text run at (22,20) width 149: "background-position" - LayoutText {#text} at (170,18) size 740x36 - text run at (170,18) width 328: " is '0% 0%' and that property is not declared here). " - text run at (497,18) width 243: "This is extra text included for the sole" - text run at (0,36) width 264: "purpose of making the paragraph longer. " - text run at (263,36) width 224: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,430) size 784x54 - LayoutText {#text} at (0,0) size 712x18 - text run at (0,0) width 712: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (0,20) size 149x15 - text run at (0,20) width 149: "background-position" - LayoutText {#text} at (148,18) size 772x36 - text run at (148,18) width 327: " is '0% 0%' and that property is not declared here). " - text run at (474,18) width 298: "This is extra text included for the sole purpose" - text run at (0,36) width 209: "of making the paragraph longer. " - text run at (208,36) width 225: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,500) size 784x72 - LayoutText {#text} at (0,0) size 778x36 - text run at (0,0) width 778: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image" - text run at (0,18) width 221: "exactly centered in the paragraph. " - text run at (220,18) width 103: "This is because " - LayoutInline {CODE} at (0,0) size 63x15 - LayoutText {#text} at (322,20) size 63x15 - text run at (322,20) width 63: "repeat-y" - LayoutText {#text} at (384,18) size 118x18 - text run at (384,18) width 118: " specifies tiling in " - LayoutInline {EM} at (0,0) size 30x18 - LayoutText {#text} at (501,18) size 30x18 - text run at (501,18) width 30: "both" - LayoutText {#text} at (530,18) size 779x36 - text run at (530,18) width 162: " directions on the y-axis. " - text run at (691,18) width 88: "Note that this" - text run at (0,36) width 275: "test is only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (274,38) size 149x15 - text run at (274,38) width 149: "background-position" - LayoutText {#text} at (422,36) size 35x18 - text run at (422,36) width 35: " (see " - LayoutInline {A} at (0,0) size 59x18 [color=#0000FF] - LayoutText {#text} at (456,36) size 59x18 - text run at (456,36) width 59: "test 5.3.6" - LayoutText {#text} at (514,36) size 771x36 - text run at (514,36) width 14: "). " - text run at (527,36) width 244: "I'll fill the paragraph with extra text to" - text run at (0,54) width 350: "make the conformance (or lack thereof) more obvious." - LayoutBlockFlow {P} at (0,588) size 784x90 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 768x18 - text run at (0,0) width 670: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (669,0) width 99: "This is because" - LayoutInline {CODE} at (0,0) size 133x15 - LayoutText {#text} at (0,20) size 133x15 - text run at (0,20) width 133: "background-repeat" - LayoutText {#text} at (132,18) size 118x18 - text run at (132,18) width 118: " specifies tiling in " - LayoutInline {EM} at (0,0) size 18x18 - LayoutText {#text} at (249,18) size 18x18 - text run at (249,18) width 18: "all" - LayoutText {#text} at (266,18) size 765x36 - text run at (266,18) width 372: " directions, regardless of the position of the origin image. " - text run at (637,18) width 128: "Note that this test is" - text run at (0,36) width 234: "only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (233,38) size 149x15 - text run at (233,38) width 149: "background-position" - LayoutText {#text} at (381,36) size 35x18 - text run at (381,36) width 35: " (see " - LayoutInline {A} at (0,0) size 59x18 [color=#0000FF] - LayoutText {#text} at (415,36) size 59x18 - text run at (415,36) width 59: "test 5.3.6" - LayoutText {#text} at (473,36) size 783x54 - text run at (473,36) width 14: "). " - text run at (486,36) width 283: "I'll fill the paragraph with extra text to make" - text run at (0,54) width 315: "the conformance (or lack thereof) more obvious. " - text run at (314,54) width 469: "A background color is present, although if it is visible then the image has" - text run at (0,72) width 144: "not bee correctly tiled." - LayoutBlockFlow {P} at (0,694) size 784x54 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 781x54 - text run at (0,0) width 781: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be" - text run at (0,18) width 283: "the exact center of the top of the paragraph. " - text run at (282,18) width 460: "I'll fill it with extra text to make the conformance (or lack thereof) more" - text run at (0,36) width 59: "obvious. " - text run at (58,36) width 669: "A background color is present, although if it is visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (0,764) size 784x54 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 770x54 - text run at (0,0) width 499: "This sentence should have a fully tiled background which starts at its top left. " - text run at (498,0) width 228: "I'll fill it with extra text to make the" - text run at (0,18) width 291: "conformance (or lack thereof) more obvious. " - text run at (290,18) width 480: "A background color is present, although if it is visible, then the image may" - text run at (0,36) width 186: "not have been tiled correctly." - LayoutBlockFlow {P} at (0,834) size 784x72 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 778x72 - text run at (0,0) width 778: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of" - text run at (0,18) width 702: "the image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (701,18) width 53: "I'll fill it" - text run at (0,36) width 467: "with extra text to make the conformance (or lack thereof) more obvious. " - text run at (466,36) width 299: "A background color is present, although if it is" - text run at (0,54) width 366: "visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (0,922) size 784x108 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 782x108 - text run at (0,0) width 737: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,18) width 414: "background's origin should be the exact center of the paragraph. " - text run at (413,18) width 369: "I'll fill it with extra text to make the conformance (or lack" - text run at (0,36) width 151: "thereof) more obvious. " - text run at (150,36) width 454: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (603,36) width 160: "This is true because I am" - text run at (0,54) width 765: "not able to increase the text size without resorting to either headings or other CSS properties, neither of which I want to" - text run at (0,72) width 162: "use in this circumstance. " - text run at (161,72) width 245: "This ought to be enough text, though. " - text run at (405,72) width 350: "A background color is present, although if it is visible," - text run at (0,90) width 315: "then the image may not have been tiled correctly." - LayoutTable {TABLE} at (0,1046) size 784x776 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x774 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x748 - LayoutTableCell {TD} at (0,387) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x748 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x54 - LayoutText {#text} at (0,0) size 731x36 - text run at (0,0) width 731: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the" - text run at (0,18) width 72: "default for " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (71,20) size 149x15 - text run at (71,20) width 149: "background-position" - LayoutText {#text} at (219,18) size 759x36 - text run at (219,18) width 327: " is '0% 0%' and that property is not declared here). " - text run at (545,18) width 214: "This is extra text included for the" - text run at (0,36) width 294: "sole purpose of making the paragraph longer. " - text run at (293,36) width 224: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,74) size 762x54 - LayoutText {#text} at (0,0) size 731x36 - text run at (0,0) width 731: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the" - text run at (0,18) width 72: "default for " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (71,20) size 149x15 - text run at (71,20) width 149: "background-position" - LayoutText {#text} at (219,18) size 759x36 - text run at (219,18) width 327: " is '0% 0%' and that property is not declared here). " - text run at (545,18) width 214: "This is extra text included for the" - text run at (0,36) width 294: "sole purpose of making the paragraph longer. " - text run at (293,36) width 224: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,144) size 762x54 - LayoutText {#text} at (0,0) size 712x18 - text run at (0,0) width 712: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (0,20) size 149x15 - text run at (0,20) width 149: "background-position" - LayoutText {#text} at (148,18) size 717x36 - text run at (148,18) width 327: " is '0% 0%' and that property is not declared here). " - text run at (474,18) width 243: "This is extra text included for the sole" - text run at (0,36) width 264: "purpose of making the paragraph longer. " - text run at (263,36) width 224: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,214) size 762x72 - LayoutText {#text} at (0,0) size 734x36 - text run at (0,0) width 734: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin" - text run at (0,18) width 264: "image exactly centered in the paragraph. " - text run at (263,18) width 103: "This is because " - LayoutInline {CODE} at (0,0) size 63x15 - LayoutText {#text} at (365,20) size 63x15 - text run at (365,20) width 63: "repeat-y" - LayoutText {#text} at (427,18) size 118x18 - text run at (427,18) width 118: " specifies tiling in " - LayoutInline {EM} at (0,0) size 30x18 - LayoutText {#text} at (544,18) size 30x18 - text run at (544,18) width 30: "both" - LayoutText {#text} at (573,18) size 732x36 - text run at (573,18) width 159: " directions on the y-axis." - text run at (0,36) width 365: "Note that this test is only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (364,38) size 149x15 - text run at (364,38) width 149: "background-position" - LayoutText {#text} at (512,36) size 35x18 - text run at (512,36) width 35: " (see " - LayoutInline {A} at (0,0) size 59x18 [color=#0000FF] - LayoutText {#text} at (546,36) size 59x18 - text run at (546,36) width 59: "test 5.3.6" - LayoutText {#text} at (604,36) size 749x36 - text run at (604,36) width 14: "). " - text run at (617,36) width 132: "I'll fill the paragraph" - text run at (0,54) width 463: "with extra text to make the conformance (or lack thereof) more obvious." - LayoutBlockFlow {P} at (4,302) size 762x90 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 714x36 - text run at (0,0) width 670: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (669,0) width 45: "This is" - text run at (0,18) width 55: "because " - LayoutInline {CODE} at (0,0) size 134x15 - LayoutText {#text} at (54,20) size 134x15 - text run at (54,20) width 134: "background-repeat" - LayoutText {#text} at (187,18) size 118x18 - text run at (187,18) width 118: " specifies tiling in " - LayoutInline {EM} at (0,0) size 18x18 - LayoutText {#text} at (304,18) size 18x18 - text run at (304,18) width 18: "all" - LayoutText {#text} at (321,18) size 752x36 - text run at (321,18) width 372: " directions, regardless of the position of the origin image. " - text run at (692,18) width 60: "Note that" - text run at (0,36) width 302: "this test is only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 149x15 - LayoutText {#text} at (301,38) size 149x15 - text run at (301,38) width 149: "background-position" - LayoutText {#text} at (449,36) size 35x18 - text run at (449,36) width 35: " (see " - LayoutInline {A} at (0,0) size 59x18 [color=#0000FF] - LayoutText {#text} at (483,36) size 59x18 - text run at (483,36) width 59: "test 5.3.6" - LayoutText {#text} at (541,36) size 754x54 - text run at (541,36) width 14: "). " - text run at (554,36) width 200: "I'll fill the paragraph with extra" - text run at (0,54) width 398: "text to make the conformance (or lack thereof) more obvious. " - text run at (397,54) width 346: "A background color is present, although if it is visible" - text run at (0,72) width 268: "then the image has not bee correctly tiled." - LayoutBlockFlow {P} at (4,408) size 762x54 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 761x54 - text run at (0,0) width 761: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should" - text run at (0,18) width 302: "be the exact center of the top of the paragraph. " - text run at (301,18) width 460: "I'll fill it with extra text to make the conformance (or lack thereof) more" - text run at (0,36) width 59: "obvious. " - text run at (58,36) width 669: "A background color is present, although if it is visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (4,478) size 762x54 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 738x54 - text run at (0,0) width 499: "This sentence should have a fully tiled background which starts at its top left. " - text run at (498,0) width 228: "I'll fill it with extra text to make the" - text run at (0,18) width 291: "conformance (or lack thereof) more obvious. " - text run at (290,18) width 448: "A background color is present, although if it is visible, then the image" - text run at (0,36) width 217: "may not have been tiled correctly." - LayoutBlockFlow {P} at (4,548) size 762x72 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 760x72 - text run at (0,0) width 760: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance" - text run at (0,18) width 719: "of the image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (718,18) width 40: "I'll fill" - text run at (0,36) width 479: "it with extra text to make the conformance (or lack thereof) more obvious. " - text run at (478,36) width 272: "A background color is present, although if" - text run at (0,54) width 394: "it is visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (4,636) size 762x108 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 761x108 - text run at (0,0) width 737: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,18) width 414: "background's origin should be the exact center of the paragraph. " - text run at (413,18) width 338: "I'll fill it with extra text to make the conformance (or" - text run at (0,36) width 181: "lack thereof) more obvious. " - text run at (180,36) width 455: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (634,36) width 127: "This is true because" - text run at (0,54) width 746: "I am not able to increase the text size without resorting to either headings or other CSS properties, neither of which I" - text run at (0,72) width 213: "want to use in this circumstance. " - text run at (212,72) width 245: "This ought to be enough text, though. " - text run at (456,72) width 299: "A background color is present, although if it is" - text run at (0,90) width 366: "visible, then the image may not have been tiled correctly." -layer at (8,280) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,272) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/color-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/color-expected.png deleted file mode 100644 index 7a3efb8..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/color-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/color-expected.txt deleted file mode 100644 index 28fa63bc..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/color_and_background/color-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x30 - LayoutText {#text} at (0,0) size 157x30 - text run at (0,0) width 157: ".one {color: green;}" - text run at (156,0) width 1: " " - text run at (0,15) width 0: " " - LayoutBlockFlow {P} at (0,95) size 784x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,129) size 784x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutTable {TABLE} at (0,163) size 219x88 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 217x86 - LayoutTableRow {TR} at (0,0) size 217x26 - LayoutTableCell {TD} at (0,0) size 217x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 217x60 - LayoutTableCell {TD} at (0,43) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 205x60 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,38) size 197x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." -layer at (8,85) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png deleted file mode 100644 index 1439750..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt deleted file mode 100644 index e80136a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt +++ /dev/null
@@ -1,550 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4053 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4053 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4053 - LayoutBlockFlow {BODY} at (8,8) size 769x4037 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x810 - LayoutText {#text} at (0,0) size 554x810 - text run at (0,0) width 297: "P.one {color: green; rotation: 70deg;}" - text run at (296,0) width 1: " " - text run at (0,15) width 172: "P.oneb {color: green;}" - text run at (171,15) width 1: " " - text run at (0,30) width 227: "P.oneb {color: invalidValue;}" - text run at (226,30) width 1: " " - text run at (0,45) width 266: "P.two {background-color: inherit;}" - text run at (265,45) width 1: " " - text run at (0,60) width 211: "H1 + P.three {color: blue;}" - text run at (210,60) width 1: " " - text run at (0,75) width 196: "P.four + H1 {color: red;}" - text run at (195,75) width 1: " " - text run at (0,90) width 258: "P.five {background-color: \"red\";}" - text run at (257,90) width 1: " " - text run at (0,105) width 398: "P.sixa {border-width: medium; border-style: solid;}" - text run at (397,105) width 1: " " - text run at (0,120) width 391: "P.sixb {border-width: funny; border-style: solid;}" - text run at (390,120) width 1: " " - text run at (0,135) width 383: "P.sixc {border-width: 50zu; border-style: solid;}" - text run at (382,135) width 1: " " - text run at (0,150) width 367: "P.sixd {border-width: px; border-style: solid;}" - text run at (366,150) width 1: " " - text run at (0,165) width 94: "@three-dee {" - text run at (93,165) width 1: " " - text run at (0,180) width 180: " @background-lighting {" - text run at (179,180) width 1: " " - text run at (0,195) width 133: " azimuth: 30deg;" - text run at (132,195) width 1: " " - text run at (0,210) width 157: " elevation: 190deg;" - text run at (156,210) width 1: " " - text run at (0,225) width 24: " }" - text run at (23,225) width 1: " " - text run at (0,240) width 180: " P.seven { color: red }" - text run at (179,240) width 1: " " - text run at (0,255) width 16: " }" - text run at (15,255) width 1: " " - text run at (0,270) width 180: "P.eight {COLOR: GREEN;}" - text run at (179,270) width 1: " " - text run at (0,285) width 188: "OL:wait {color: maroon;}" - text run at (187,285) width 1: " " - text run at (0,300) width 266: "P.ten:first-child {color: maroon;}" - text run at (265,300) width 1: " " - text run at (0,315) width 203: "UL:lang(fr) {color: gray;}" - text run at (202,315) width 1: " " - text run at (0,330) width 242: "BLOCKQUOTE[href] {color: navy;}" - text run at (241,330) width 1: " " - text run at (0,345) width 281: "ACRONYM[href=\"foo\"] {color: purple;}" - text run at (280,345) width 1: " " - text run at (0,360) width 289: "ADDRESS[href~=\"foo\"] {color: purple;}" - text run at (288,360) width 1: " " - text run at (0,375) width 242: "SPAN[lang|=\"fr\"] {color: #c37;}" - text run at (241,375) width 1: " " - text run at (0,390) width 94: "@media tty {" - text run at (93,390) width 1: " " - text run at (0,405) width 133: " H1 {color: red;}" - text run at (132,405) width 1: " " - text run at (0,420) width 188: " P.sixteen {color: red;}" - text run at (187,420) width 1: " " - text run at (0,435) width 16: " }" - text run at (15,435) width 1: " " - text run at (0,450) width 94: "@three-dee {" - text run at (93,450) width 1: " " - text run at (0,465) width 203: " P.seventeen {color: red }" - text run at (202,465) width 1: " " - text run at (0,480) width 16: " }" - text run at (15,480) width 1: " " - text run at (0,495) width 554: "P.eighteena {text-decoration: underline overline line-through diagonal;" - text run at (553,495) width 1: " " - text run at (0,510) width 406: " font: bold highlighted 100% sans-serif;}" - text run at (405,510) width 1: " " - text run at (0,525) width 554: "P.eighteenb {text-decoration: underline overline line-through diagonal;" - text run at (553,525) width 1: " " - text run at (0,540) width 367: " font: bold highlighted 100% serif;}" - text run at (366,540) width 1: " " - text run at (0,555) width 375: "EM, P.nineteena ! EM, STRONG {font-size: 200%; }" - text run at (374,555) width 1: " " - text run at (0,570) width 0: " " - text run at (0,585) width 125: "// UL.nineteenb," - text run at (124,585) width 1: " " - text run at (0,600) width 196: "P.nineteenb {color: red;}" - text run at (195,600) width 1: " " - text run at (0,615) width 0: " " - text run at (0,630) width 352: "P.twentya {rotation-code: \"}\"; color: blue;} " - text run at (351,630) width 1: " " - text run at (0,645) width 383: "P.twentyb {rotation-code: \"\\\"}\\\"\"; color: green;}" - text run at (382,645) width 1: " " - text run at (0,660) width 391: "P.twentyonea {rotation-code: '}'; color: purple;} " - text run at (390,660) width 1: " " - text run at (0,675) width 406: "P.twentyoneb {rotation-code: '\\'}\\''; color: green;}" - text run at (405,675) width 1: " " - text run at (0,690) width 102: "P.twentytwo {" - text run at (101,690) width 1: " " - text run at (0,705) width 367: " type-display: @threedee {rotation-code: '}';};" - text run at (366,705) width 1: " " - text run at (0,720) width 110: " color: green;" - text run at (109,720) width 1: " " - text run at (0,735) width 16: " }" - text run at (15,735) width 1: " " - text run at (0,750) width 274: "P.twentythree {text-indent: 0.5in;}" - text run at (273,750) width 1: " " - text run at (0,765) width 110: " color: maroon" - text run at (109,765) width 1: " " - text run at (0,780) width 203: "P.twentyfour {color: red;}" - text run at (202,780) width 1: " " - text run at (0,795) width 0: " " - LayoutBlockFlow {P} at (0,875) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 493x18 - text run at (0,0) width 493: "This paragraph should be green, because only the rotation should be ignored." - LayoutBlockFlow {P} at (0,909) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 634x18 - text run at (0,0) width 634: "This paragraph should be green, since error-checking should be done before calculating specificity." - LayoutBlockFlow {P} at (0,943) size 769x36 - LayoutText {#text} at (0,0) size 568x18 - text run at (0,0) width 568: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " - LayoutInline {CODE} at (0,0) size 55x15 - LayoutText {#text} at (567,2) size 55x15 - text run at (567,2) width 55: "inherit" - LayoutText {#text} at (622,0) size 769x36 - text run at (622,0) width 147: " is an invalid keyword," - text run at (0,18) width 530: "and in CSS2, it will cause the gray background (not the white grid) to be inherited." - LayoutBlockFlow {P} at (0,995) size 769x18 - LayoutText {#text} at (0,0) size 649x18 - text run at (0,0) width 649: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (0,1029) size 769x18 - LayoutText {#text} at (0,0) size 649x18 - text run at (0,0) width 649: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (0,1063) size 769x18 - LayoutText {#text} at (0,0) size 532x18 - text run at (0,0) width 532: "This paragraph should have a white background, since keywords cannot be quoted." - LayoutBlockFlow {P} at (0,1097) size 769x42 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 731x36 - text run at (3,3) width 656: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (658,3) width 76: "This should" - text run at (3,21) width 365: "cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1155) size 769x42 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 754x36 - text run at (3,3) width 754: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," - text run at (3,21) width 233: "because the border-width is invalid. " - text run at (235,21) width 444: "This should cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1213) size 769x60 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 754x54 - text run at (3,3) width 754: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," - text run at (3,21) width 599: "because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (601,21) width 139: "This should cause the" - text run at (3,39) width 302: "user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1289) size 769x60 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 758x54 - text run at (3,3) width 758: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" - text run at (3,21) width 558: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (560,21) width 170: "This should cause the user" - text run at (3,39) width 271: "agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1365) size 769x18 - LayoutText {#text} at (0,0) size 676x18 - text run at (0,0) width 676: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (0,1399) size 769x36 [color=#008000] - LayoutText {#text} at (0,0) size 739x36 - text run at (0,0) width 210: "This paragraph should be green. " - text run at (209,0) width 530: "CSS is case-insensitive, unless required to be case sensitive due to interaction with" - text run at (0,18) width 278: "other standards (e.g., font names or URLs.)" - LayoutBlockFlow {OL} at (0,1451) size 769x18 - LayoutListItem {LI} at (40,0) size 729x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "1" - LayoutText {#text} at (0,0) size 635x18 - text run at (0,0) width 635: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - LayoutBlockFlow {P} at (0,1485) size 769x36 - LayoutText {#text} at (0,0) size 765x36 - text run at (0,0) width 765: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is" - text run at (0,18) width 113: "not the first child." - LayoutBlockFlow {UL} at (0,1537) size 769x36 - LayoutListItem {LI} at (40,0) size 729x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 704x36 - text run at (0,0) width 704: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,18) width 232: "CSS2, the selector should not apply." - LayoutBlockFlow {BLOCKQUOTE} at (40,1589) size 689x36 - LayoutText {#text} at (0,0) size 654x36 - text run at (0,0) width 654: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,18) width 232: "CSS2, the selector should not apply." - LayoutBlockFlow {P} at (0,1641) size 769x36 - LayoutInline {ACRONYM} at (0,0) size 761x36 - LayoutText {#text} at (0,0) size 761x36 - text run at (0,0) width 761: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,18) width 110: "should not apply." - LayoutBlockFlow {ADDRESS} at (0,1693) size 769x36 - LayoutText {#text} at (0,0) size 756x36 - text run at (0,0) width 756: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,18) width 110: "should not apply." - LayoutBlockFlow {P} at (0,1745) size 769x36 - LayoutInline {SPAN} at (0,0) size 734x36 - LayoutText {#text} at (0,0) size 734x36 - text run at (0,0) width 734: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,18) width 110: "should not apply." - LayoutBlockFlow {P} at (0,1797) size 769x36 - LayoutText {#text} at (0,0) size 755x36 - text run at (0,0) width 680: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (679,0) width 76: "However, it" - text run at (0,18) width 617: "is valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - LayoutBlockFlow {P} at (0,1849) size 769x18 - LayoutText {#text} at (0,0) size 676x18 - text run at (0,0) width 676: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (0,1883) size 769x72 - LayoutText {#text} at (0,0) size 753x18 - text run at (0,0) width 753: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 63x15 - LayoutText {#text} at (0,20) size 63x15 - text run at (0,20) width 63: "diagonal" - LayoutText {#text} at (62,18) size 231x18 - text run at (62,18) width 231: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 118x15 - LayoutText {#text} at (292,20) size 118x15 - text run at (292,20) width 118: "text-decoration" - LayoutText {#text} at (409,18) size 135x18 - text run at (409,18) width 57: " invalid. " - text run at (465,18) width 79: "In addition, " - LayoutInline {CODE} at (0,0) size 87x15 - LayoutText {#text} at (543,20) size 87x15 - text run at (543,20) width 87: "highlighted" - LayoutText {#text} at (629,18) size 762x36 - text run at (629,18) width 133: " is not a valid part of" - text run at (0,36) width 24: "the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (23,38) size 32x15 - text run at (23,38) width 32: "font" - LayoutText {#text} at (54,36) size 733x36 - text run at (54,36) width 184: " property, making it invalid. " - text run at (237,36) width 496: "Therefore, this paragraph's font should be the UA default, and match the next" - text run at (0,54) width 72: "paragraph. " - text run at (71,54) width 197: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (267,56) size 32x15 - text run at (267,56) width 32: "font" - LayoutText {#text} at (298,54) size 255x18 - text run at (298,54) width 255: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (0,1971) size 769x72 - LayoutText {#text} at (0,0) size 753x18 - text run at (0,0) width 753: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 63x15 - LayoutText {#text} at (0,20) size 63x15 - text run at (0,20) width 63: "diagonal" - LayoutText {#text} at (62,18) size 231x18 - text run at (62,18) width 231: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 118x15 - LayoutText {#text} at (292,20) size 118x15 - text run at (292,20) width 118: "text-decoration" - LayoutText {#text} at (409,18) size 135x18 - text run at (409,18) width 57: " invalid. " - text run at (465,18) width 79: "In addition, " - LayoutInline {CODE} at (0,0) size 87x15 - LayoutText {#text} at (543,20) size 87x15 - text run at (543,20) width 87: "highlighted" - LayoutText {#text} at (629,18) size 762x36 - text run at (629,18) width 133: " is not a valid part of" - text run at (0,36) width 24: "the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (23,38) size 32x15 - text run at (23,38) width 32: "font" - LayoutText {#text} at (54,36) size 760x36 - text run at (54,36) width 184: " property, making it invalid. " - text run at (237,36) width 523: "Therefore, this paragraph's font should be the UA default, and match the previous" - text run at (0,54) width 72: "paragraph. " - text run at (71,54) width 197: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (267,56) size 32x15 - text run at (267,56) width 32: "font" - LayoutText {#text} at (298,54) size 255x18 - text run at (298,54) width 255: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (0,2059) size 769x54 - LayoutText {#text} at (0,0) size 542x18 - text run at (0,0) width 513: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (512,0) width 30: "The " - LayoutInline {EM} at (0,0) size 102x18 - LayoutText {#text} at (541,0) size 102x18 - text run at (541,0) width 102: "emphasized text" - LayoutText {#text} at (642,0) size 56x18 - text run at (642,0) width 56: " and the " - LayoutInline {STRONG} at (0,0) size 741x36 - LayoutText {#text} at (697,0) size 741x36 - text run at (697,0) width 44: "strong" - text run at (0,18) width 26: "text" - LayoutText {#text} at (25,18) size 736x36 - text run at (25,18) width 711: " within it should also be normal size, since the entire ruleset should be skipped (since in some future version of" - text run at (0,36) width 603: "CSS, there could be an operator within the selector that has higher precedence than a comma)." - LayoutBlockFlow {P} at (0,2129) size 769x36 - LayoutText {#text} at (0,0) size 474x18 - text run at (0,0) width 474: "This paragraph should be black, because the line before the declaration is " - LayoutInline {STRONG} at (0,0) size 23x18 - LayoutText {#text} at (473,0) size 23x18 - text run at (473,0) width 23: "not" - LayoutText {#text} at (495,0) size 759x36 - text run at (495,0) width 264: " a comment and therefore the selector for" - text run at (0,18) width 141: "P.nineteenb is invalid." - LayoutBlockFlow {P} at (0,2181) size 769x18 [color=#0000FF] - LayoutText {#text} at (0,0) size 480x18 - text run at (0,0) width 480: "This paragraph should be blue, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2215) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 488x18 - text run at (0,0) width 488: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2249) size 769x18 [color=#800080] - LayoutText {#text} at (0,0) size 493x18 - text run at (0,0) width 493: "This paragraph should be purple, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2283) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 488x18 - text run at (0,0) width 488: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2317) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 488x18 - text run at (0,0) width 488: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2351) size 769x18 - LayoutText {#text} at (48,0) size 612x18 - text run at (48,0) width 494: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (541,0) width 119: "It should be black." - LayoutBlockFlow {P} at (0,2385) size 769x36 - LayoutText {#text} at (0,0) size 767x36 - text run at (0,0) width 767: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" - text run at (0,18) width 632: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." - LayoutTable {TABLE} at (0,2437) size 769x1600 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1598 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x1572 - LayoutTableCell {TD} at (0,799) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x1572 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 493x18 - text run at (0,0) width 493: "This paragraph should be green, because only the rotation should be ignored." - LayoutBlockFlow {P} at (4,38) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 634x18 - text run at (0,0) width 634: "This paragraph should be green, since error-checking should be done before calculating specificity." - LayoutBlockFlow {P} at (4,72) size 747x36 - LayoutText {#text} at (0,0) size 568x18 - text run at (0,0) width 568: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " - LayoutInline {CODE} at (0,0) size 55x15 - LayoutText {#text} at (567,2) size 55x15 - text run at (567,2) width 55: "inherit" - LayoutText {#text} at (622,0) size 705x36 - text run at (622,0) width 83: " is an invalid" - text run at (0,18) width 594: "keyword, and in CSS2, it will cause the gray background (not the white grid) to be inherited." - LayoutBlockFlow {P} at (4,124) size 747x18 - LayoutText {#text} at (0,0) size 649x18 - text run at (0,0) width 649: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (4,158) size 747x18 - LayoutText {#text} at (0,0) size 649x18 - text run at (0,0) width 649: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (4,192) size 747x18 - LayoutText {#text} at (0,0) size 532x18 - text run at (0,0) width 532: "This paragraph should have a white background, since keywords cannot be quoted." - LayoutBlockFlow {P} at (4,226) size 747x42 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 731x36 - text run at (3,3) width 656: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (658,3) width 76: "This should" - text run at (3,21) width 365: "cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,284) size 747x60 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 694x54 - text run at (3,3) width 670: "This paragraph should have a medium-width border around it (the same as the previous and the next two" - text run at (3,21) width 317: "paragraphs), because the border-width is invalid. " - text run at (319,21) width 378: "This should cause the user agent to use the default value of" - text run at (3,39) width 63: "'medium'." - LayoutBlockFlow {P} at (4,360) size 747x60 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 711x54 - text run at (3,3) width 670: "This paragraph should have a medium-width border around it (the same as the next and the previous two" - text run at (3,21) width 683: "paragraphs), because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (685,21) width 29: "This" - text run at (3,39) width 411: "should cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,436) size 747x60 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 734x54 - text run at (3,3) width 734: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because" - text run at (3,21) width 582: "the border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (584,21) width 139: "This should cause the" - text run at (3,39) width 302: "user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,512) size 747x18 - LayoutText {#text} at (0,0) size 676x18 - text run at (0,0) width 676: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (4,546) size 747x36 [color=#008000] - LayoutText {#text} at (0,0) size 739x36 - text run at (0,0) width 210: "This paragraph should be green. " - text run at (209,0) width 530: "CSS is case-insensitive, unless required to be case sensitive due to interaction with" - text run at (0,18) width 278: "other standards (e.g., font names or URLs.)" - LayoutBlockFlow {OL} at (4,598) size 747x18 - LayoutListItem {LI} at (40,0) size 707x18 - LayoutListMarker (anonymous) at (-16,0) size 16x18: "1" - LayoutText {#text} at (0,0) size 635x18 - text run at (0,0) width 635: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - LayoutBlockFlow {P} at (4,632) size 747x36 - LayoutText {#text} at (0,0) size 683x36 - text run at (0,0) width 683: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this" - text run at (0,18) width 196: "paragraph is not the first child." - LayoutBlockFlow {UL} at (4,684) size 747x36 - LayoutListItem {LI} at (40,0) size 707x36 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 704x36 - text run at (0,0) width 704: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,18) width 232: "CSS2, the selector should not apply." - LayoutBlockFlow {BLOCKQUOTE} at (44,736) size 667x36 - LayoutText {#text} at (0,0) size 654x36 - text run at (0,0) width 654: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to" - text run at (0,18) width 232: "CSS2, the selector should not apply." - LayoutBlockFlow {P} at (4,788) size 747x36 - LayoutInline {ACRONYM} at (0,0) size 707x36 - LayoutText {#text} at (0,0) size 707x36 - text run at (0,0) width 707: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,18) width 164: "selector should not apply." - LayoutBlockFlow {ADDRESS} at (4,840) size 747x36 - LayoutText {#text} at (0,0) size 701x36 - text run at (0,0) width 701: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,18) width 165: "selector should not apply." - LayoutBlockFlow {P} at (4,892) size 747x36 - LayoutInline {SPAN} at (0,0) size 734x36 - LayoutText {#text} at (0,0) size 734x36 - text run at (0,0) width 734: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,18) width 110: "should not apply." - LayoutBlockFlow {P} at (4,944) size 747x36 - LayoutText {#text} at (0,0) size 742x36 - text run at (0,0) width 680: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (679,0) width 63: "However," - text run at (0,18) width 630: "it is valid in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - LayoutBlockFlow {P} at (4,996) size 747x18 - LayoutText {#text} at (0,0) size 676x18 - text run at (0,0) width 676: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (4,1030) size 747x72 - LayoutText {#text} at (0,0) size 699x36 - text run at (0,0) width 699: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold)," - text run at (0,18) width 55: "because " - LayoutInline {CODE} at (0,0) size 64x15 - LayoutText {#text} at (54,20) size 64x15 - text run at (54,20) width 64: "diagonal" - LayoutText {#text} at (117,18) size 230x18 - text run at (117,18) width 230: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 118x15 - LayoutText {#text} at (346,20) size 118x15 - text run at (346,20) width 118: "text-decoration" - LayoutText {#text} at (463,18) size 135x18 - text run at (463,18) width 58: " invalid. " - text run at (520,18) width 78: "In addition, " - LayoutInline {CODE} at (0,0) size 87x15 - LayoutText {#text} at (597,20) size 87x15 - text run at (597,20) width 87: "highlighted" - LayoutText {#text} at (683,18) size 735x36 - text run at (683,18) width 52: " is not a" - text run at (0,36) width 106: "valid part of the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (105,38) size 32x15 - text run at (105,38) width 32: "font" - LayoutText {#text} at (136,36) size 717x36 - text run at (136,36) width 184: " property, making it invalid. " - text run at (319,36) width 398: "Therefore, this paragraph's font should be the UA default, and" - text run at (0,54) width 171: "match the next paragraph. " - text run at (170,54) width 196: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (365,56) size 32x15 - text run at (365,56) width 32: "font" - LayoutText {#text} at (396,54) size 255x18 - text run at (396,54) width 255: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (4,1118) size 747x72 - LayoutText {#text} at (0,0) size 699x36 - text run at (0,0) width 699: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold)," - text run at (0,18) width 55: "because " - LayoutInline {CODE} at (0,0) size 64x15 - LayoutText {#text} at (54,20) size 64x15 - text run at (54,20) width 64: "diagonal" - LayoutText {#text} at (117,18) size 230x18 - text run at (117,18) width 230: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 118x15 - LayoutText {#text} at (346,20) size 118x15 - text run at (346,20) width 118: "text-decoration" - LayoutText {#text} at (463,18) size 135x18 - text run at (463,18) width 58: " invalid. " - text run at (520,18) width 78: "In addition, " - LayoutInline {CODE} at (0,0) size 87x15 - LayoutText {#text} at (597,20) size 87x15 - text run at (597,20) width 87: "highlighted" - LayoutText {#text} at (683,18) size 735x36 - text run at (683,18) width 52: " is not a" - text run at (0,36) width 106: "valid part of the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (105,38) size 32x15 - text run at (105,38) width 32: "font" - LayoutText {#text} at (136,36) size 717x36 - text run at (136,36) width 184: " property, making it invalid. " - text run at (319,36) width 398: "Therefore, this paragraph's font should be the UA default, and" - text run at (0,54) width 198: "match the previous paragraph. " - text run at (197,54) width 196: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x15 - LayoutText {#text} at (392,56) size 32x15 - text run at (392,56) width 32: "font" - LayoutText {#text} at (423,54) size 256x18 - text run at (423,54) width 256: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (4,1206) size 747x54 - LayoutText {#text} at (0,0) size 542x18 - text run at (0,0) width 513: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (512,0) width 30: "The " - LayoutInline {EM} at (0,0) size 102x18 - LayoutText {#text} at (541,0) size 102x18 - text run at (541,0) width 102: "emphasized text" - LayoutText {#text} at (642,0) size 56x18 - text run at (642,0) width 56: " and the " - LayoutInline {STRONG} at (0,0) size 741x36 - LayoutText {#text} at (697,0) size 741x36 - text run at (697,0) width 44: "strong" - text run at (0,18) width 26: "text" - LayoutText {#text} at (25,18) size 736x36 - text run at (25,18) width 711: " within it should also be normal size, since the entire ruleset should be skipped (since in some future version of" - text run at (0,36) width 603: "CSS, there could be an operator within the selector that has higher precedence than a comma)." - LayoutBlockFlow {P} at (4,1276) size 747x36 - LayoutText {#text} at (0,0) size 474x18 - text run at (0,0) width 474: "This paragraph should be black, because the line before the declaration is " - LayoutInline {STRONG} at (0,0) size 23x18 - LayoutText {#text} at (473,0) size 23x18 - text run at (473,0) width 23: "not" - LayoutText {#text} at (495,0) size 737x36 - text run at (495,0) width 242: " a comment and therefore the selector" - text run at (0,18) width 164: "for P.nineteenb is invalid." - LayoutBlockFlow {P} at (4,1328) size 747x18 [color=#0000FF] - LayoutText {#text} at (0,0) size 480x18 - text run at (0,0) width 480: "This paragraph should be blue, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1362) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 488x18 - text run at (0,0) width 488: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1396) size 747x18 [color=#800080] - LayoutText {#text} at (0,0) size 493x18 - text run at (0,0) width 493: "This paragraph should be purple, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1430) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 488x18 - text run at (0,0) width 488: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1464) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 488x18 - text run at (0,0) width 488: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1498) size 747x18 - LayoutText {#text} at (48,0) size 612x18 - text run at (48,0) width 494: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (541,0) width 119: "It should be black." - LayoutBlockFlow {P} at (4,1532) size 747x36 - LayoutText {#text} at (0,0) size 743x36 - text run at (0,0) width 743: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of" - text run at (0,18) width 656: "the selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." -layer at (8,865) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,857) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font-expected.png deleted file mode 100644 index 73638e9..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font-expected.txt deleted file mode 100644 index 1267e44..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font-expected.txt +++ /dev/null
@@ -1,230 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4227 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4227 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4227.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4211.33 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x14 - LayoutText {#text} at (0,0) size 272x14 - text run at (0,0) width 272: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,26) size 769x168 - LayoutText {#text} at (0,0) size 411x168 - text run at (0,0) width 166: "BODY {font-size: 12px;}" - text run at (165,0) width 1: " " - text run at (0,14) width 332: ".one {font: italic small-caps 13pt Helvetica;}" - text run at (331,14) width 1: " " - text run at (0,28) width 209: ".two {font: 150%/150% serif;}" - text run at (208,28) width 1: " " - text run at (0,42) width 260: ".three {font: 150%/150% sans-serif;}" - text run at (259,42) width 1: " " - text run at (0,56) width 238: ".four {font: small/200% cursive;}" - text run at (237,56) width 1: " " - text run at (0,70) width 411: ".five {font: italic small-caps 900 150%/150% sans-serif;}" - text run at (410,70) width 1: " " - text run at (0,84) width 404: ".six {font: italic small-caps 100 150%/300% sans-serif;}" - text run at (403,84) width 1: " " - text run at (0,98) width 404: ".seven {font: italic small-caps 900 150%/2em monospace;}" - text run at (403,98) width 1: " " - text run at (0,112) width 411: ".eight {font: italic small-caps 500 150%/1in sans-serif;}" - text run at (410,112) width 1: " " - text run at (0,126) width 389: ".nine {font: oblique normal 700 18px/200% sans-serif;}" - text run at (388,126) width 1: " " - text run at (0,140) width 310: ".ten {font: normal 400 80%/2.5 sans-serif;}" - text run at (309,140) width 1: " " - text run at (0,154) width 274: "SPAN.color {background-color: silver;}" - text run at (273,154) width 1: " " - LayoutBlockFlow {P} at (0,220) size 769x14 - LayoutText {#text} at (0,0) size 720x14 - text run at (0,0) width 431: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (430,0) width 290: "This is the \"base font size\" referred to in the following tests." - LayoutBlockFlow {P} at (0,251.33) size 769x20 - LayoutText {#text} at (0,0) size 494x20 - text run at (0,0) width 494: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (0,289.33) size 769x81 - LayoutText {#text} at (0,2) size 764x76 - text run at (0,2) width 278: "This element should be in a serif font. " - text run at (277,2) width 475: "Its font-size should be 150% the base font size, and its line-height" - text run at (0,29) width 418: "should 150% of that value (18px and 27px, respectively). " - text run at (417,29) width 347: "Extra text is included for the purposes of testing" - text run at (0,56) width 152: "this more effectively." - LayoutBlockFlow {P} at (0,388.33) size 769x81 - LayoutText {#text} at (0,3) size 761x75 - text run at (0,3) width 349: "This element should be in a sans-serif font. " - text run at (348,3) width 413: "Its font-size should be 150% the base font size, and" - text run at (0,30) width 569: "its line-height should 150% of that value (18px and 27px, respectively). " - text run at (568,30) width 193: "Extra text is included for" - text run at (0,57) width 350: "the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,487.33) size 769x78 - LayoutText {#text} at (0,2) size 756x47 - text run at (0,2) width 608: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (607,2) width 149: "For example, if the font-size" - text run at (0,28) width 32: "value " - LayoutInline {CODE} at (0,0) size 31x12 - LayoutText {#text} at (31,33) size 31x12 - text run at (31,33) width 31: "small" - LayoutText {#text} at (61,28) size 760x47 - text run at (61,28) width 313: " is calculated at 10px, then the line-height should be 20px. " - text run at (373,28) width 271: "The actual value of the font-size is UA-dependent. " - text run at (643,28) width 117: "Extra text is included" - text run at (0,54) width 244: "for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,583.33) size 769x108 - LayoutText {#text} at (0,3) size 750x102 - text run at (0,3) width 729: "This element should be in a sans-serif font, italicized and small caps, with a weight of 900. " - text run at (728,3) width 22: "Its" - text run at (0,30) width 748: "font-size should be 150% the base font size, and its line-height should be 150% of that value" - text run at (0,57) width 243: "(18px and 27px, respectively). " - text run at (242,57) width 480: "Extra text is included for the purposes of testing this more" - text run at (0,84) width 92: "effectively." - LayoutBlockFlow {P} at (0,709.33) size 769x162 - LayoutText {#text} at (0,16) size 765x129 - text run at (0,16) width 699: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " - text run at (698,16) width 67: "Its font-" - text run at (0,70) width 761: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" - text run at (0,124) width 153: "54px, respectively). " - text run at (152,124) width 547: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,889.33) size 769x144 - LayoutText {#text} at (0,7) size 733x129 - text run at (0,7) width 733: "This element should be in a monospace font, italicized and small caps, with a weight of" - text run at (0,43) width 54: "900. " - text run at (54,43) width 672: "Its font-size should be 150% the base font size, and its line-height should be" - text run at (0,79) width 605: "2em, or twice the element's font size (18px and 36px, respectively). " - text run at (604,79) width 111: "Extra text is" - text run at (0,115) width 488: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1051.33) size 769x288 - LayoutText {#text} at (0,37) size 741x213 - text run at (0,37) width 719: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. " - text run at (718,37) width 23: "Its" - text run at (0,133) width 691: "font-size should be 150% the base font size, or 18px, and its line-height should be 1in. " - text run at (690,133) width 48: "Extra" - text run at (0,229) width 523: "text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1357.33) size 769x144 - LayoutText {#text} at (0,7) size 753x129 - text run at (0,7) width 753: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of" - text run at (0,43) width 41: "700. " - text run at (40,43) width 666: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 177: "element's font size). " - text run at (176,79) width 501: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (0,1519.33) size 769x46 - LayoutText {#text} at (0,6) size 742x33 - text run at (0,6) width 276: "This element should be in a sans-serif font, with a weight of 400. " - text run at (275,6) width 417: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px. " - text run at (691,6) width 51: "Extra text is" - text run at (0,29) width 239: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1583.33) size 769x216 - LayoutInline {SPAN} at (0,0) size 765x183 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,16) size 765x183 - text run at (0,16) width 699: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " - text run at (698,16) width 67: "Its font-" - text run at (0,70) width 761: "size should be 150% the base font size, and its line-height should be 300% of that value (18px and" - text run at (0,124) width 753: "54px, respectively). The text should have a silver background. The background color has been set" - text run at (0,178) width 678: "on an inline element and should therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1817.33) size 769x2394 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2392 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x2366 - LayoutTableCell {TD} at (0,1196) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x2366.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x36 - LayoutText {#text} at (0,0) size 746x36 - text run at (0,0) width 575: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (574,0) width 172: "This is the \"base font size\"" - text run at (0,18) width 210: "referred to in the following tests." - LayoutBlockFlow {P} at (4,57.33) size 747x20 - LayoutText {#text} at (0,0) size 494x20 - text run at (0,0) width 494: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (4,101.33) size 747x144 - LayoutText {#text} at (0,4) size 729x136 - text run at (0,4) width 370: "This element should be in a serif font. " - text run at (369,4) width 360: "Its font-size should be 150% the base" - text run at (0,40) width 688: "font size, and its line-height should 150% of that value (18px and 27px," - text run at (0,76) width 136: "respectively). " - text run at (135,76) width 559: "Extra text is included for the purposes of testing this more" - text run at (0,112) width 107: "effectively." - LayoutBlockFlow {P} at (4,269.33) size 747x144 - LayoutText {#text} at (0,4) size 741x136 - text run at (0,4) width 465: "This element should be in a sans-serif font. " - text run at (464,4) width 234: "Its font-size should be" - text run at (0,40) width 741: "150% the base font size, and its line-height should 150% of that value" - text run at (0,76) width 327: "(18px and 27px, respectively). " - text run at (326,76) width 403: "Extra text is included for the purposes" - text run at (0,112) width 321: "of testing this more effectively." - LayoutBlockFlow {P} at (4,437.33) size 747x78 - LayoutText {#text} at (0,2) size 737x47 - text run at (0,2) width 608: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (607,2) width 130: "For example, if the font-" - text run at (0,28) width 54: "size value " - LayoutInline {CODE} at (0,0) size 31x12 - LayoutText {#text} at (53,33) size 31x12 - text run at (53,33) width 31: "small" - LayoutText {#text} at (83,28) size 733x47 - text run at (83,28) width 313: " is calculated at 10px, then the line-height should be 20px. " - text run at (395,28) width 271: "The actual value of the font-size is UA-dependent. " - text run at (665,28) width 68: "Extra text is" - text run at (0,54) width 293: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,539.33) size 747x180 - LayoutText {#text} at (0,4) size 730x172 - text run at (0,4) width 722: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,40) width 228: "with a weight of 900. " - text run at (227,40) width 503: "Its font-size should be 150% the base font size," - text run at (0,76) width 679: "and its line-height should be 150% of that value (18px and 27px," - text run at (0,112) width 150: "respectively). " - text run at (149,112) width 571: "Extra text is included for the purposes of testing this" - text run at (0,148) width 178: "more effectively." - LayoutBlockFlow {P} at (4,743.33) size 747x288 - LayoutText {#text} at (0,22) size 739x244 - text run at (0,22) width 739: "This element should be in a sans-serif font, italicized and small caps, with" - text run at (0,94) width 173: "a weight of 100. " - text run at (172,94) width 559: "Its font-size should be 150% the base font size, and its" - text run at (0,166) width 722: "line-height should be 300% of that value (18px and 54px, respectively)." - text run at (0,238) width 717: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1055.33) size 747x195 - LayoutText {#text} at (0,8) size 733x179 - text run at (0,8) width 700: "This element should be in a monospace font, italicized and small caps, with a" - text run at (0,47) width 150: "weight of 900. " - text run at (149,47) width 584: "Its font-size should be 150% the base font size, and its line-" - text run at (0,86) width 658: "height should be 2em, or twice the element's font size (18px and 36px," - text run at (0,125) width 136: "respectively). " - text run at (135,125) width 542: "Extra text is included for the purposes of testing this more" - text run at (0,164) width 105: "effectively." - LayoutBlockFlow {P} at (4,1274.33) size 747x384 - LayoutText {#text} at (0,34) size 726x316 - text run at (0,34) width 711: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,130) width 227: "with a weight of 500. " - text run at (226,130) width 500: "Its font-size should be 150% the base font size," - text run at (0,226) width 438: "or 18px, and its line-height should be 1in. " - text run at (437,226) width 272: "Extra text is included for" - text run at (0,322) width 476: "the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1682.33) size 747x144 - LayoutText {#text} at (0,7) size 731x129 - text run at (0,7) width 731: "This element should be in a sans-serif font, oblique and not small-caps, with a weight" - text run at (0,43) width 63: "of 700. " - text run at (62,43) width 666: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 177: "element's font size). " - text run at (176,79) width 501: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 92: "effectively." - LayoutBlockFlow {P} at (4,1844.33) size 747x62 - LayoutText {#text} at (0,8) size 728x46 - text run at (0,8) width 368: "This element should be in a sans-serif font, with a weight of 400. " - text run at (367,8) width 361: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,39) width 190: "shoud be 2.5 times that, or 24px. " - text run at (189,39) width 390: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1930.33) size 747x432 - LayoutInline {SPAN} at (0,0) size 739x388 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,22) size 739x388 - text run at (0,22) width 739: "This element should be in a sans-serif font, italicized and small caps, with" - text run at (0,94) width 173: "a weight of 100. " - text run at (172,94) width 559: "Its font-size should be 150% the base font size, and its" - text run at (0,166) width 722: "line-height should be 300% of that value (18px and 54px, respectively)." - text run at (0,238) width 700: "The text should have a silver background. The background color has" - text run at (0,310) width 718: "been set on an inline element and should therefore only cover the text," - text run at (0,382) width 253: "not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,214) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,206) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_family-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_family-expected.png deleted file mode 100644 index 63c5071..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_family-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_family-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_family-expected.txt deleted file mode 100644 index 0cb9245c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_family-expected.txt +++ /dev/null
@@ -1,140 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1313 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1313 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1313 - LayoutBlockFlow {BODY} at (8,8) size 769x1297 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x135 - LayoutText {#text} at (0,0) size 305x135 - text run at (0,0) width 211: "DIV.a {font-family: serif;}" - text run at (210,0) width 1: " " - text run at (0,15) width 242: "DIV.b {font-family: monospace;}" - text run at (241,15) width 1: " " - text run at (0,30) width 203: ".one {font-family: serif;}" - text run at (202,30) width 1: " " - text run at (0,45) width 242: ".two {font-family: sans-serif;}" - text run at (241,45) width 1: " " - text run at (0,60) width 235: ".three {font-family: cursive;}" - text run at (234,60) width 1: " " - text run at (0,75) width 227: ".four {font-family: fantasy;}" - text run at (226,75) width 1: " " - text run at (0,90) width 242: ".five {font-family: monospace;}" - text run at (241,90) width 1: " " - text run at (0,105) width 305: ".six {font-family: sans-serif,cursive;}" - text run at (304,105) width 1: " " - text run at (0,120) width 297: ".seven {font-family: monospace,serif;}" - text run at (296,120) width 1: " " - LayoutBlockFlow {DIV} at (0,200) size 769x199 - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 653x18 - text run at (0,0) width 653: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,34) size 769x18 - LayoutText {#text} at (0,0) size 248x18 - text run at (0,0) width 248: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,68) size 769x18 - LayoutText {#text} at (0,0) size 314x18 - text run at (0,0) width 314: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,102) size 769x25 - LayoutText {#text} at (0,0) size 266x25 - text run at (0,0) width 266: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,143) size 769x25 - LayoutText {#text} at (0,0) size 296x25 - text run at (0,0) width 296: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,184) size 769x15 - LayoutText {#text} at (0,0) size 344x15 - text run at (0,0) width 344: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (0,430) size 769x18 - LayoutText {#text} at (0,0) size 400x18 - text run at (0,0) width 400: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (0,464) size 769x18 - LayoutText {#text} at (0,0) size 529x18 - text run at (0,0) width 529: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (0,513) size 769x211 - LayoutBlockFlow {P} at (0,0) size 769x30 - LayoutText {#text} at (0,0) size 749x30 - text run at (0,0) width 749: "This sentence is normal for the first division, which is the next five sentences; it should be a" - text run at (0,15) width 118: "monospace font." - LayoutBlockFlow {P} at (0,46) size 769x18 - LayoutText {#text} at (0,0) size 248x18 - text run at (0,0) width 248: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,80) size 769x18 - LayoutText {#text} at (0,0) size 314x18 - text run at (0,0) width 314: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,114) size 769x25 - LayoutText {#text} at (0,0) size 266x25 - text run at (0,0) width 266: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,155) size 769x25 - LayoutText {#text} at (0,0) size 296x25 - text run at (0,0) width 296: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,196) size 769x15 - LayoutText {#text} at (0,0) size 344x15 - text run at (0,0) width 344: "This sentence should be in a monospace font." - LayoutTable {TABLE} at (0,737) size 769x560 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x558 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x532 - LayoutTableCell {TD} at (0,279) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x532 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {DIV} at (4,4) size 747x199 - LayoutBlockFlow {P} at (0,0) size 747x18 - LayoutText {#text} at (0,0) size 653x18 - text run at (0,0) width 653: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,34) size 747x18 - LayoutText {#text} at (0,0) size 248x18 - text run at (0,0) width 248: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,68) size 747x18 - LayoutText {#text} at (0,0) size 314x18 - text run at (0,0) width 314: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,102) size 747x25 - LayoutText {#text} at (0,0) size 266x25 - text run at (0,0) width 266: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,143) size 747x25 - LayoutText {#text} at (0,0) size 296x25 - text run at (0,0) width 296: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,184) size 747x15 - LayoutText {#text} at (0,0) size 344x15 - text run at (0,0) width 344: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (4,234) size 747x18 - LayoutText {#text} at (0,0) size 400x18 - text run at (0,0) width 400: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (4,268) size 747x18 - LayoutText {#text} at (0,0) size 529x18 - text run at (0,0) width 529: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (4,317) size 747x211 - LayoutBlockFlow {P} at (0,0) size 747x30 - LayoutText {#text} at (0,0) size 734x30 - text run at (0,0) width 734: "This sentence is normal for the first division, which is the next five sentences; it should be" - text run at (0,15) width 133: "a monospace font." - LayoutBlockFlow {P} at (0,46) size 747x18 - LayoutText {#text} at (0,0) size 248x18 - text run at (0,0) width 248: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,80) size 747x18 - LayoutText {#text} at (0,0) size 314x18 - text run at (0,0) width 314: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,114) size 747x25 - LayoutText {#text} at (0,0) size 266x25 - text run at (0,0) width 266: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,155) size 747x25 - LayoutText {#text} at (0,0) size 296x25 - text run at (0,0) width 296: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,196) size 747x15 - LayoutText {#text} at (0,0) size 344x15 - text run at (0,0) width 344: "This sentence should be in a monospace font." -layer at (8,190) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,182) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,420) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,412) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,506) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,498) size 769x2 [border: (1px inset #EEEEEE)] -layer at (25,988) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,216) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1074) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,302) size 747x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_size-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_size-expected.png deleted file mode 100644 index b65e3ba..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_size-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_size-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_size-expected.txt deleted file mode 100644 index f8d7d2b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_size-expected.txt +++ /dev/null
@@ -1,258 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2811 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2811 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2811.27 - LayoutBlockFlow {BODY} at (8,8) size 769x2795.27 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x300 - LayoutText {#text} at (0,0) size 219x300 - text run at (0,0) width 196: ".one {font-size: medium;}" - text run at (195,0) width 1: " " - text run at (0,15) width 196: ".two {font-size: larger;}" - text run at (195,15) width 1: " " - text run at (0,30) width 219: ".three {font-size: smaller;}" - text run at (218,30) width 1: " " - text run at (0,45) width 219: ".four {font-size: xx-small;}" - text run at (218,45) width 1: " " - text run at (0,60) width 211: ".five {font-size: x-small;}" - text run at (210,60) width 1: " " - text run at (0,75) width 188: ".six {font-size: small;}" - text run at (187,75) width 1: " " - text run at (0,90) width 203: ".seven {font-size: large;}" - text run at (202,90) width 1: " " - text run at (0,105) width 219: ".eight {font-size: x-large;}" - text run at (218,105) width 1: " " - text run at (0,120) width 219: ".nine {font-size: xx-large;}" - text run at (218,120) width 1: " " - text run at (0,135) width 172: ".a {font-size: 0.5in;}" - text run at (171,135) width 1: " " - text run at (0,150) width 157: ".b {font-size: 1cm;}" - text run at (156,150) width 1: " " - text run at (0,165) width 164: ".c {font-size: 10mm;}" - text run at (163,165) width 1: " " - text run at (0,180) width 164: ".d {font-size: 18pt;}" - text run at (163,180) width 1: " " - text run at (0,195) width 172: ".e {font-size: 1.5pc;}" - text run at (171,195) width 1: " " - text run at (0,210) width 157: ".f {font-size: 2em;}" - text run at (156,210) width 1: " " - text run at (0,225) width 157: ".g {font-size: 3ex;}" - text run at (156,225) width 1: " " - text run at (0,240) width 164: ".h {font-size: 25px;}" - text run at (163,240) width 1: " " - text run at (0,255) width 164: ".i {font-size: 200%;}" - text run at (163,255) width 1: " " - text run at (0,270) width 180: ".j {font-size: -0.5in;}" - text run at (179,270) width 1: " " - text run at (0,285) width 0: " " - LayoutBlockFlow {P} at (0,365) size 769x18 - LayoutText {#text} at (0,0) size 707x18 - text run at (0,0) width 707: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - LayoutBlockFlow {P} at (0,399) size 769x18 - LayoutText {#text} at (0,0) size 190x18 - text run at (0,0) width 190: "This sentence has been set to " - LayoutInline {CODE} at (0,0) size 48x15 - LayoutText {#text} at (189,2) size 48x15 - text run at (189,2) width 48: "medium" - LayoutText {#text} at (236,0) size 368x18 - text run at (236,0) width 368: ", which may or may not be the same size as unstyled text." - LayoutBlockFlow {P} at (0,436.19) size 769x22 - LayoutText {#text} at (0,0) size 380x22 - text run at (0,0) width 380: "This sentence should be larger than unstyled text." - LayoutBlockFlow {P} at (0,477.38) size 769x15 - LayoutText {#text} at (0,0) size 272x15 - text run at (0,0) width 272: "This sentence should be smaller than unstyled text." - LayoutBlockFlow {P} at (0,505.70) size 769x18 - LayoutText {#text} at (0,6) size 286x10 - text run at (0,6) width 286: "This sentence should be very small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 54x18 - LayoutText {#text} at (285,0) size 54x18 - text run at (285,0) width 54: "medium" - LayoutText {#text} at (338,6) size 3x10 - text run at (338,6) width 3: "." - LayoutBlockFlow {P} at (0,533.70) size 769x18 - LayoutText {#text} at (0,4) size 324x13 - text run at (0,4) width 324: "This sentence should be rather small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 53x18 - LayoutText {#text} at (323,0) size 53x18 - text run at (323,0) width 53: "medium" - LayoutText {#text} at (375,4) size 4x13 - text run at (375,4) width 4: "." - LayoutBlockFlow {P} at (0,564.70) size 769x18 - LayoutText {#text} at (0,2) size 387x15 - text run at (0,2) width 387: "This sentence should be small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 54x18 - LayoutText {#text} at (386,0) size 54x18 - text run at (386,0) width 54: "medium" - LayoutText {#text} at (439,2) size 4x15 - text run at (439,2) width 4: "." - LayoutBlockFlow {P} at (0,600.70) size 769x22 - LayoutText {#text} at (0,0) size 533x22 - text run at (0,0) width 533: "This sentence should be large, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 53x18 - LayoutText {#text} at (532,3) size 53x18 - text run at (532,3) width 53: "medium" - LayoutText {#text} at (584,0) size 5x22 - text run at (584,0) width 5: "." - LayoutBlockFlow {P} at (0,646.70) size 769x56 - LayoutText {#text} at (0,0) size 766x28 - text run at (0,0) width 766: "This sentence should be rather large, but the last word in the sentence should be" - LayoutInline {SPAN} at (0,0) size 53x18 - LayoutText {#text} at (0,36) size 53x18 - text run at (0,36) width 53: "medium" - LayoutText {#text} at (52,28) size 7x28 - text run at (52,28) width 7: "." - LayoutBlockFlow {P} at (0,734.70) size 769x74 - LayoutText {#text} at (0,0) size 754x74 - text run at (0,0) width 754: "This sentence should be very large, but the last word in the" - text run at (0,37) width 250: "sentence should be " - LayoutInline {SPAN} at (0,0) size 54x18 - LayoutText {#text} at (249,52) size 54x18 - text run at (249,52) width 54: "medium" - LayoutText {#text} at (302,37) size 9x37 - text run at (302,37) width 9: "." - LayoutBlockFlow {P} at (0,856.70) size 769x110 - LayoutText {#text} at (0,0) size 699x110 - text run at (0,0) width 699: "This sentence should be half an inch" - text run at (0,55) width 74: "tall." - LayoutBlockFlow {P} at (0,1014.70) size 769x43 - LayoutText {#text} at (0,0) size 663x43 - text run at (0,0) width 663: "This sentence should be one centimeter tall." - LayoutBlockFlow {P} at (0,1095.48) size 769x43 - LayoutText {#text} at (0,0) size 667x43 - text run at (0,0) width 667: "This sentence should be ten millimeters tall." - LayoutBlockFlow {P} at (0,1176.27) size 769x28 - LayoutText {#text} at (0,0) size 425x28 - text run at (0,0) width 425: "This sentence should be eighteen points tall." - LayoutBlockFlow {P} at (0,1228.27) size 769x28 - LayoutText {#text} at (0,0) size 494x28 - text run at (0,0) width 494: "This sentence should be one and one half picas tall." - LayoutBlockFlow {P} at (0,1288.27) size 769x37 - LayoutText {#text} at (0,0) size 467x37 - text run at (0,0) width 467: "This sentence should be two em tall." - LayoutBlockFlow {P} at (0,1357.27) size 769x24 - LayoutText {#text} at (0,0) size 319x24 - text run at (0,0) width 319: "This sentence should be three ex tall." - LayoutBlockFlow {P} at (0,1406.27) size 769x29 - LayoutText {#text} at (0,0) size 471x29 - text run at (0,0) width 471: "This sentence should be twenty-five pixels tall." - LayoutBlockFlow {P} at (0,1467.27) size 769x37 - LayoutText {#text} at (0,0) size 549x37 - text run at (0,0) width 549: "This sentence should be twice normal size." - LayoutBlockFlow {P} at (0,1536.27) size 769x18 - LayoutText {#text} at (0,0) size 686x18 - text run at (0,0) width 686: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." - LayoutTable {TABLE} at (0,1570.27) size 769x1225 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1223 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x1197 - LayoutTableCell {TD} at (0,611) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x1197.27 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 707x18 - text run at (0,0) width 707: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - LayoutBlockFlow {P} at (4,38) size 747x18 - LayoutText {#text} at (0,0) size 190x18 - text run at (0,0) width 190: "This sentence has been set to " - LayoutInline {CODE} at (0,0) size 48x15 - LayoutText {#text} at (189,2) size 48x15 - text run at (189,2) width 48: "medium" - LayoutText {#text} at (236,0) size 368x18 - text run at (236,0) width 368: ", which may or may not be the same size as unstyled text." - LayoutBlockFlow {P} at (4,75.19) size 747x22 - LayoutText {#text} at (0,0) size 380x22 - text run at (0,0) width 380: "This sentence should be larger than unstyled text." - LayoutBlockFlow {P} at (4,116.38) size 747x15 - LayoutText {#text} at (0,0) size 272x15 - text run at (0,0) width 272: "This sentence should be smaller than unstyled text." - LayoutBlockFlow {P} at (4,144.70) size 747x18 - LayoutText {#text} at (0,6) size 286x10 - text run at (0,6) width 286: "This sentence should be very small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 54x18 - LayoutText {#text} at (285,0) size 54x18 - text run at (285,0) width 54: "medium" - LayoutText {#text} at (338,6) size 3x10 - text run at (338,6) width 3: "." - LayoutBlockFlow {P} at (4,172.70) size 747x18 - LayoutText {#text} at (0,4) size 324x13 - text run at (0,4) width 324: "This sentence should be rather small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 53x18 - LayoutText {#text} at (323,0) size 53x18 - text run at (323,0) width 53: "medium" - LayoutText {#text} at (375,4) size 4x13 - text run at (375,4) width 4: "." - LayoutBlockFlow {P} at (4,203.70) size 747x18 - LayoutText {#text} at (0,2) size 387x15 - text run at (0,2) width 387: "This sentence should be small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 54x18 - LayoutText {#text} at (386,0) size 54x18 - text run at (386,0) width 54: "medium" - LayoutText {#text} at (439,2) size 4x15 - text run at (439,2) width 4: "." - LayoutBlockFlow {P} at (4,239.70) size 747x22 - LayoutText {#text} at (0,0) size 533x22 - text run at (0,0) width 533: "This sentence should be large, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 53x18 - LayoutText {#text} at (532,3) size 53x18 - text run at (532,3) width 53: "medium" - LayoutText {#text} at (584,0) size 5x22 - text run at (584,0) width 5: "." - LayoutBlockFlow {P} at (4,285.70) size 747x56 - LayoutText {#text} at (0,0) size 737x56 - text run at (0,0) width 737: "This sentence should be rather large, but the last word in the sentence should" - text run at (0,28) width 29: "be " - LayoutInline {SPAN} at (0,0) size 54x18 - LayoutText {#text} at (28,36) size 54x18 - text run at (28,36) width 54: "medium" - LayoutText {#text} at (81,28) size 7x28 - text run at (81,28) width 7: "." - LayoutBlockFlow {P} at (4,373.70) size 747x74 - LayoutText {#text} at (0,0) size 706x74 - text run at (0,0) width 706: "This sentence should be very large, but the last word in" - text run at (0,37) width 297: "the sentence should be " - LayoutInline {SPAN} at (0,0) size 54x18 - LayoutText {#text} at (296,52) size 54x18 - text run at (296,52) width 54: "medium" - LayoutText {#text} at (349,37) size 9x37 - text run at (349,37) width 9: "." - LayoutBlockFlow {P} at (4,495.70) size 747x110 - LayoutText {#text} at (0,0) size 699x110 - text run at (0,0) width 699: "This sentence should be half an inch" - text run at (0,55) width 74: "tall." - LayoutBlockFlow {P} at (4,653.70) size 747x43 - LayoutText {#text} at (0,0) size 663x43 - text run at (0,0) width 663: "This sentence should be one centimeter tall." - LayoutBlockFlow {P} at (4,734.48) size 747x43 - LayoutText {#text} at (0,0) size 667x43 - text run at (0,0) width 667: "This sentence should be ten millimeters tall." - LayoutBlockFlow {P} at (4,815.27) size 747x28 - LayoutText {#text} at (0,0) size 425x28 - text run at (0,0) width 425: "This sentence should be eighteen points tall." - LayoutBlockFlow {P} at (4,867.27) size 747x28 - LayoutText {#text} at (0,0) size 494x28 - text run at (0,0) width 494: "This sentence should be one and one half picas tall." - LayoutBlockFlow {P} at (4,927.27) size 747x37 - LayoutText {#text} at (0,0) size 467x37 - text run at (0,0) width 467: "This sentence should be two em tall." - LayoutBlockFlow {P} at (4,996.27) size 747x24 - LayoutText {#text} at (0,0) size 319x24 - text run at (0,0) width 319: "This sentence should be three ex tall." - LayoutBlockFlow {P} at (4,1045.27) size 747x29 - LayoutText {#text} at (0,0) size 471x29 - text run at (0,0) width 471: "This sentence should be twenty-five pixels tall." - LayoutBlockFlow {P} at (4,1106.27) size 747x37 - LayoutText {#text} at (0,0) size 549x37 - text run at (0,0) width 549: "This sentence should be twice normal size." - LayoutBlockFlow {P} at (4,1175.27) size 747x18 - LayoutText {#text} at (0,0) size 686x18 - text run at (0,0) width 686: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." -layer at (8,355) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,347) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_style-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_style-expected.png deleted file mode 100644 index eb2d611..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_style-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_style-expected.txt deleted file mode 100644 index c5cd1ea5..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_style-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 242x60 - text run at (0,0) width 203: ".one {font-style: italic;}" - text run at (202,0) width 1: " " - text run at (0,15) width 211: ".two {font-style: oblique;}" - text run at (210,15) width 1: " " - text run at (0,30) width 242: ".three, I {font-style: normal;}" - text run at (241,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x18 - LayoutText {#text} at (0,0) size 510x18 - text run at (0,0) width 510: "This paragraph should be in italics, but the last word of the sentence should be " - LayoutInline {SPAN} at (0,0) size 46x18 - LayoutText {#text} at (509,0) size 46x18 - text run at (509,0) width 46: "normal" - LayoutText {#text} at (554,0) size 5x18 - text run at (554,0) width 5: "." - LayoutBlockFlow {P} at (0,159) size 784x18 - LayoutText {#text} at (0,0) size 222x18 - text run at (0,0) width 222: "This paragraph should be oblique." - LayoutBlockFlow {P} at (0,193) size 784x18 - LayoutInline {I} at (0,0) size 216x18 - LayoutText {#text} at (0,0) size 216x18 - text run at (0,0) width 216: "This paragraph should be normal." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,227) size 581x122 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 579x120 - LayoutTableRow {TR} at (0,0) size 579x26 - LayoutTableCell {TD} at (0,0) size 579x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 579x94 - LayoutTableCell {TD} at (0,60) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 567x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 559x18 - LayoutText {#text} at (0,0) size 510x18 - text run at (0,0) width 510: "This paragraph should be in italics, but the last word of the sentence should be " - LayoutInline {SPAN} at (0,0) size 46x18 - LayoutText {#text} at (509,0) size 46x18 - text run at (509,0) width 46: "normal" - LayoutText {#text} at (554,0) size 5x18 - text run at (554,0) width 5: "." - LayoutBlockFlow {P} at (4,38) size 559x18 - LayoutText {#text} at (0,0) size 222x18 - text run at (0,0) width 222: "This paragraph should be oblique." - LayoutBlockFlow {P} at (4,72) size 559x18 - LayoutInline {I} at (0,0) size 216x18 - LayoutText {#text} at (0,0) size 216x18 - text run at (0,0) width 216: "This paragraph should be normal." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_variant-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_variant-expected.png deleted file mode 100644 index 3789b3d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_variant-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt deleted file mode 100644 index 948bd6c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x45 - LayoutText {#text} at (0,0) size 250x45 - text run at (0,0) width 250: ".one {font-variant: small-caps;}" - text run at (249,0) width 1: " " - text run at (0,15) width 219: ".two {font-variant: normal;}" - text run at (218,15) width 1: " " - text run at (0,30) width 0: " " - LayoutBlockFlow {P} at (0,110) size 784x18 - LayoutText {#text} at (0,0) size 267x18 - text run at (0,0) width 267: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (0,144) size 784x18 - LayoutText {#text} at (0,0) size 570x18 - text run at (0,0) width 570: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 49x18 - LayoutText {#text} at (569,0) size 49x18 - text run at (569,0) width 49: "Normal" - LayoutText {#text} at (617,0) size 5x18 - text run at (617,0) width 5: "." - LayoutTable {TABLE} at (0,178) size 644x88 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 642x86 - LayoutTableRow {TR} at (0,0) size 642x26 - LayoutTableCell {TD} at (0,0) size 642x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 642x60 - LayoutTableCell {TD} at (0,43) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 630x60 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 622x18 - LayoutText {#text} at (0,0) size 267x18 - text run at (0,0) width 267: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (4,38) size 622x18 - LayoutText {#text} at (0,0) size 570x18 - text run at (0,0) width 570: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 49x18 - LayoutText {#text} at (569,0) size 49x18 - text run at (569,0) width 49: "Normal" - LayoutText {#text} at (617,0) size 5x18 - text run at (617,0) width 5: "." -layer at (8,100) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,92) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_weight-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_weight-expected.png deleted file mode 100644 index eef1fe91..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_weight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt deleted file mode 100644 index d35ca88..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt +++ /dev/null
@@ -1,125 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1046 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1046 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1045.80 - LayoutBlockFlow {BODY} at (8,8) size 769x1029.80 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x165 - LayoutText {#text} at (0,0) size 235x165 - text run at (0,0) width 196: ".one {font-weight: bold;}" - text run at (195,0) width 1: " " - text run at (0,15) width 211: ".two {font-weight: bolder;}" - text run at (210,15) width 1: " " - text run at (0,30) width 235: ".three {font-weight: lighter;}" - text run at (234,30) width 1: " " - text run at (0,45) width 196: ".four {font-weight: 100;}" - text run at (195,45) width 1: " " - text run at (0,60) width 196: ".five {font-weight: 300;}" - text run at (195,60) width 1: " " - text run at (0,75) width 188: ".six {font-weight: 500;}" - text run at (187,75) width 1: " " - text run at (0,90) width 203: ".seven {font-weight: 700;}" - text run at (202,90) width 1: " " - text run at (0,105) width 203: ".eight {font-weight: 900;}" - text run at (202,105) width 1: " " - text run at (0,120) width 219: ".nine {font-weight: normal;}" - text run at (218,120) width 1: " " - text run at (0,135) width 196: "B {font-weight: lighter;}" - text run at (195,135) width 1: " " - text run at (0,150) width 0: " " - LayoutBlockFlow {P} at (0,230) size 769x18 - LayoutText {#text} at (0,0) size 200x18 - text run at (0,0) width 200: "This sentence should be bold." - LayoutBlockFlow {P} at (0,264) size 769x18 - LayoutText {#text} at (0,0) size 303x18 - text run at (0,0) width 303: "This sentence should be bolder than normal." - LayoutBlockFlow {H4} at (0,303.27) size 769x18 - LayoutText {#text} at (0,0) size 133x18 - text run at (0,0) width 133: "This is a heading-4." - LayoutBlockFlow {H4} at (0,342.53) size 769x18 - LayoutText {#text} at (0,0) size 181x18 - text run at (0,0) width 181: "This is a bolder heading-4." - LayoutBlockFlow {P} at (0,381.80) size 769x18 - LayoutInline {B} at (0,0) size 361x18 - LayoutText {#text} at (0,0) size 361x18 - text run at (0,0) width 361: "This sentence should be normal (boldface made lighter)." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,415.80) size 769x18 - LayoutText {#text} at (0,0) size 233x18 - text run at (0,0) width 233: "This sentence should be weight 100." - LayoutBlockFlow {P} at (0,449.80) size 769x18 - LayoutText {#text} at (0,0) size 233x18 - text run at (0,0) width 233: "This sentence should be weight 300." - LayoutBlockFlow {P} at (0,483.80) size 769x18 - LayoutText {#text} at (0,0) size 233x18 - text run at (0,0) width 233: "This sentence should be weight 500." - LayoutBlockFlow {P} at (0,517.80) size 769x18 - LayoutText {#text} at (0,0) size 243x18 - text run at (0,0) width 243: "This sentence should be weight 700." - LayoutBlockFlow {P} at (0,551.80) size 769x18 - LayoutText {#text} at (0,0) size 243x18 - text run at (0,0) width 243: "This sentence should be weight 900." - LayoutBlockFlow {P} at (0,585.80) size 769x18 - LayoutText {#text} at (0,0) size 498x18 - text run at (0,0) width 498: "This sentence should be bold, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 46x18 - LayoutText {#text} at (497,0) size 46x18 - text run at (497,0) width 46: "normal" - LayoutText {#text} at (542,0) size 5x18 - text run at (542,0) width 5: "." - LayoutTable {TABLE} at (0,619.80) size 569x410 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 567x408 - LayoutTableRow {TR} at (0,0) size 567x26 - LayoutTableCell {TD} at (0,0) size 567x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 567x382 - LayoutTableCell {TD} at (0,204) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 555x381.80 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 547x18 - LayoutText {#text} at (0,0) size 200x18 - text run at (0,0) width 200: "This sentence should be bold." - LayoutBlockFlow {P} at (4,38) size 547x18 - LayoutText {#text} at (0,0) size 303x18 - text run at (0,0) width 303: "This sentence should be bolder than normal." - LayoutBlockFlow {H4} at (4,77.27) size 547x18 - LayoutText {#text} at (0,0) size 133x18 - text run at (0,0) width 133: "This is a heading-4." - LayoutBlockFlow {H4} at (4,116.53) size 547x18 - LayoutText {#text} at (0,0) size 181x18 - text run at (0,0) width 181: "This is a bolder heading-4." - LayoutBlockFlow {P} at (4,155.80) size 547x18 - LayoutInline {B} at (0,0) size 361x18 - LayoutText {#text} at (0,0) size 361x18 - text run at (0,0) width 361: "This sentence should be normal (boldface made lighter)." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,189.80) size 547x18 - LayoutText {#text} at (0,0) size 233x18 - text run at (0,0) width 233: "This sentence should be weight 100." - LayoutBlockFlow {P} at (4,223.80) size 547x18 - LayoutText {#text} at (0,0) size 233x18 - text run at (0,0) width 233: "This sentence should be weight 300." - LayoutBlockFlow {P} at (4,257.80) size 547x18 - LayoutText {#text} at (0,0) size 233x18 - text run at (0,0) width 233: "This sentence should be weight 500." - LayoutBlockFlow {P} at (4,291.80) size 547x18 - LayoutText {#text} at (0,0) size 243x18 - text run at (0,0) width 243: "This sentence should be weight 700." - LayoutBlockFlow {P} at (4,325.80) size 547x18 - LayoutText {#text} at (0,0) size 243x18 - text run at (0,0) width 243: "This sentence should be weight 900." - LayoutBlockFlow {P} at (4,359.80) size 547x18 - LayoutText {#text} at (0,0) size 498x18 - text run at (0,0) width 498: "This sentence should be bold, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 46x18 - LayoutText {#text} at (497,0) size 46x18 - text run at (497,0) width 46: "normal" - LayoutText {#text} at (542,0) size 5x18 - text run at (542,0) width 5: "." -layer at (8,220) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,212) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt deleted file mode 100644 index af8806a5..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (25,25) size 750x550 [bgcolor=#008000] - LayoutBlockFlow {P} at (0,0) size 750x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 750x30 - LayoutText {#text} at (0,0) size 539x30 - text run at (0,0) width 235: "HTML {background-color: aqua;}" - text run at (234,0) width 1: " " - text run at (0,15) width 539: "BODY {background-color: green; background-image: none; margin: 25px;}" - text run at (538,15) width 1: " " - LayoutBlockFlow {P} at (0,95) size 750x54 - LayoutText {#text} at (0,0) size 747x54 - text run at (0,0) width 392: "The body of this document should have a green background. " - text run at (391,0) width 316: "It also has a margin of 25 pixels, so the light blue" - text run at (0,18) width 434: "background set for the HTML element should surround the BODY. " - text run at (433,18) width 314: "If the BODY content is significantly shorter than" - text run at (0,36) width 528: "the browser's window height, then the bottom border may be larger than 25 pixels." - LayoutTable {TABLE} at (0,165) size 750x90 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 748x88 - LayoutTableRow {TR} at (0,0) size 748x26 - LayoutTableCell {TD} at (0,0) size 748x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 748x62 - LayoutTableCell {TD} at (0,44) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 736x62 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 728x54 - LayoutText {#text} at (0,0) size 715x54 - text run at (0,0) width 392: "The body of this document should have a green background. " - text run at (391,0) width 316: "It also has a margin of 25 pixels, so the light blue" - text run at (0,18) width 434: "background set for the HTML element should surround the BODY. " - text run at (433,18) width 282: "If the BODY content is significantly shorter" - text run at (0,36) width 559: "than the browser's window height, then the bottom border may be larger than 25 pixels." -layer at (25,102) size 750x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,77) size 750x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png deleted file mode 100644 index a3b97f7c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt deleted file mode 100644 index 552b60d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt +++ /dev/null
@@ -1,755 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 6353 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x6353 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x6353 - LayoutBlockFlow {BODY} at (8,8) size 769x6337 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x135 - LayoutText {#text} at (0,0) size 469x135 - text run at (0,0) width 266: "HR.minor {clear: both; width: 5%;}" - text run at (265,0) width 1: " " - text run at (0,15) width 391: "HR.major {clear: both; width: 75%; margin: 1.5em;}" - text run at (390,15) width 1: " " - text run at (0,30) width 469: "DIV {border: 5px solid purple; padding: 0; margin: 0.125em;}" - text run at (468,30) width 1: " " - text run at (0,45) width 422: "P.left, P.right {width: 10em; padding: 1em; margin: 0;" - text run at (421,45) width 1: " " - text run at (0,60) width 414: " border: 1px solid lime; background-color: silver;}" - text run at (413,60) width 1: " " - text run at (0,75) width 445: "IMG.left, IMG.right {margin: 0; border: 3px solid black;}" - text run at (444,75) width 1: " " - text run at (0,90) width 157: ".left {float: left;}" - text run at (156,90) width 1: " " - text run at (0,105) width 172: ".right {float: right;}" - text run at (171,105) width 1: " " - text run at (0,120) width 0: " " - LayoutBlockFlow {P} at (0,200) size 769x54 - LayoutText {#text} at (0,0) size 762x54 - text run at (0,0) width 694: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (693,0) width 69: "Other than" - text run at (0,18) width 728: "the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the" - text run at (0,36) width 39: "floats." - LayoutBlockFlow {DIV} at (2,304) size 765x100 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutBlockFlow (floating) {P} at (566,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,5) size 362x90 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 185: "The floating elements within" - text run at (199,23) width 336: "this DIV should not go beyond the left or right inner" - text run at (199,41) width 342: "edge of this DIV, which means that the borders of the" - text run at (199,59) width 328: "floating elements should not overlap the top or side" - text run at (199,77) width 124: "borders of the DIV." - LayoutBlockFlow {DIV} at (2,422) size 765x64 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 739x54 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 547: "The floating images within this DIV should not go beyond the left or right inner edge" - text run at (20,23) width 721: "of this DIV, which means that the borders of the floating images should not overlap the top or side borders of the" - text run at (5,41) width 31: "DIV." - LayoutBlockFlow {DIV} at (2,536) size 442x226 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 127x36 - text run at (17,17) width 127: "This is the first left-" - text run at (17,35) width 121: "floating paragraph." - LayoutBlockFlow (floating) {P} at (199,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 146x36 - text run at (17,17) width 146: "This is the second left-" - text run at (17,35) width 121: "floating paragraph." - LayoutBlockFlow (floating) {P} at (5,75) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 132x36 - text run at (17,17) width 132: "This is the third left-" - text run at (17,35) width 121: "floating paragraph." - LayoutText {#text} at (393,5) size 432x216 - text run at (393,5) width 44: "This is" - text run at (393,23) width 24: "text" - text run at (393,41) width 41: "within" - text run at (393,59) width 20: "the" - text run at (199,77) width 35: "DIV. " - text run at (233,77) width 184: "The floating elements within" - text run at (199,95) width 222: "this DIV should not go beyond the" - text run at (199,113) width 223: "left or right inner edge of this DIV," - text run at (199,131) width 229: "which means that the borders of the" - text run at (5,149) width 421: "floating elements should not overlap the top or side borders of the" - text run at (5,167) width 110: "DIV in any way. " - text run at (114,167) width 303: "In addition, they should not overlap each other." - text run at (5,185) width 432: "The first two should be side by side, whereas the third should be on" - text run at (5,203) width 97: "the next \"line.\"" - LayoutBlockFlow {DIV} at (2,780) size 360x208 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - LayoutText {#text} at (317,5) size 344x198 - text run at (317,5) width 29: "This" - text run at (317,23) width 11: "is" - text run at (161,41) width 131: "text within the DIV. " - text run at (291,41) width 26: "The" - text run at (161,59) width 171: "floating images within this" - text run at (5,77) width 343: "DIV should not go beyond the left or right inner edge" - text run at (5,95) width 308: "of this DIV, which means that the borders of the" - text run at (5,113) width 317: "floating images should not overlap the top or side" - text run at (5,131) width 203: "borders of the DIV in any way. " - text run at (207,131) width 106: "In addition, they" - text run at (5,149) width 197: "should not overlap each other. " - text run at (201,149) width 148: "The first two should be" - text run at (5,167) width 335: "side by side, whereas the third should be on the next" - text run at (5,185) width 42: "\"line.\"" - LayoutBlockFlow {DIV} at (2,1038) size 314x350 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutBlockFlow (floating) {P} at (115,93) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,5) size 301x340 - text run at (199,5) width 72: "This is text" - text run at (199,23) width 99: "within the DIV." - text run at (199,41) width 78: "The floating" - text run at (199,59) width 102: "elements within" - text run at (5,93) width 103: "this DIV should" - text run at (5,111) width 92: "not go beyond" - text run at (5,129) width 97: "the left or right" - text run at (5,147) width 85: "inner edge of" - text run at (5,165) width 101: "this DIV, which" - text run at (5,183) width 300: "means that the borders of the floating elements" - text run at (5,201) width 284: "should not overlap the top or side borders of" - text run at (5,219) width 134: "the DIV in any way. " - text run at (138,219) width 153: "In addition, they should" - text run at (5,237) width 292: "not overlap each other in any way, nor should" - text run at (5,255) width 301: "the floated elements be overwritten by the DIV" - text run at (5,273) width 32: "text. " - text run at (36,273) width 254: "In addition, the floated elements should" - text run at (5,291) width 299: "not be side-by-side, but instead the first should" - text run at (5,309) width 279: "be floated left, and the second floated to the" - text run at (5,327) width 130: "right below the first." - LayoutBlockFlow {DIV} at (2,1406) size 410x226 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - LayoutText {#text} at (261,5) size 396x216 - text run at (261,5) width 140: "This is text within the" - text run at (261,23) width 35: "DIV. " - text run at (295,23) width 79: "The floating" - text run at (5,41) width 118: "images within this" - text run at (5,59) width 120: "DIV should not go" - text run at (5,77) width 386: "beyond the left or right inner edge of this DIV, which means" - text run at (5,95) width 390: "that the borders of the floating images should not overlap the" - text run at (5,113) width 274: "top or side borders of the DIV in any way. " - text run at (279,113) width 106: "In addition, they" - text run at (5,131) width 362: "should not overlap each other in any way, nor should the" - text run at (5,149) width 314: "floated elements be overwritten by the DIV text. " - text run at (318,149) width 74: "In addition," - text run at (5,167) width 391: "the floated images should not be side-by-side, but instead the" - text run at (5,185) width 389: "first should be floated left, and the second floated to the right" - text run at (5,203) width 96: "below the first." - LayoutBlockFlow {DIV} at (2,1682) size 765x118 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (566,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 135x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,5) size 556x108 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 185: "The floating elements within" - text run at (199,23) width 355: "this DIV should not go beyond the top side of this DIV," - text run at (199,41) width 343: "which means that the borders of the floating elements" - text run at (199,59) width 356: "should not overlap the top or side borders of the DIV in" - text run at (199,77) width 61: "any way. " - text run at (259,77) width 271: "In addition, the top of the left-floating box" - text run at (5,95) width 372: "should not be higher than the top of the right-floating box." - LayoutBlockFlow {DIV} at (2,1818) size 765x64 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 733x54 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 532: "The floating images within this DIV should not go beyond the top side of this DIV," - text run at (20,23) width 718: "which means that the borders of the floating images should not overlap the top or side borders of the DIV in any" - text run at (5,41) width 34: "way. " - text run at (38,41) width 677: "In addition, the top of the left-floating image should not be higher than the top of the right-floating image." - LayoutBlockFlow {DIV} at (2,1932) size 765x136 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 186x18 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (384,5) size 551x36 - text run at (384,5) width 366: " The floating elements within this DIV should not go any" - text run at (199,23) width 487: "higher than the line-box containing the inline content which precedes them. " - text run at (685,23) width 13: "* " - LayoutBlockFlow (floating) {P} at (566,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (697,23) size 722x108 - text run at (697,23) width 30: "This" - text run at (199,41) width 351: "means that the top side of each float can be, at most, as" - text run at (199,59) width 359: "high as the top edge of the inline element containing the" - text run at (199,77) width 336: "content just before the floating elements occur in the" - text run at (5,95) width 50: "source. " - text run at (54,95) width 494: "In order to mark these points clearly, an asterisk has been inserted just before" - text run at (5,113) width 136: "each floated element." - LayoutBlockFlow {DIV} at (2,2086) size 765x82 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 186x18 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (205,5) size 697x36 - text run at (205,5) width 512: " The floating images within this DIV should not go any higher than the line-box" - text run at (20,23) width 330: "containing the inline content which precedes them. " - text run at (349,23) width 13: "* " - LayoutImage (floating) {IMG} at (745,23) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (361,23) size 723x54 - text run at (361,23) width 367: "This means that the top side of each float can be, at most," - text run at (5,41) width 705: "as high as the top edge of the inline element containing the content just before the floating images occur in the" - text run at (5,59) width 50: "source. " - text run at (54,59) width 622: "In order to mark these points clearly, an asterisk has been inserted just before each floated image." - LayoutBlockFlow {DIV} at (2,2218) size 765x262 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 186x18 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (384,5) size 551x36 - text run at (384,5) width 366: " The floating elements within this DIV should not go any" - text run at (199,23) width 487: "higher than the line-box containing the inline content which precedes them. " - text run at (685,23) width 13: "* " - LayoutBlockFlow (floating) {P} at (566,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (697,23) size 528x36 - text run at (697,23) width 30: "This" - text run at (199,41) width 288: "means that the top side of each float can be,*" - LayoutBlockFlow (floating) {P} at (199,59) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 120: "paragraph (third in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (486,41) size 276x108 - text run at (486,41) width 72: " at most, as" - text run at (393,59) width 169: "high as the top edge of the" - text run at (393,77) width 163: "inline element containing" - text run at (393,95) width 167: "the content just before the" - text run at (393,113) width 166: "floating elements occur in" - text run at (587,131) width 74: "the source. " - text run at (660,131) width 9: "*" - LayoutBlockFlow (floating) {P} at (393,131) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 129: "paragraph (fourth in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (668,131) size 746x126 - text run at (668,131) width 72: " In order to" - text run at (587,149) width 164: "mark these points clearly," - text run at (587,167) width 128: "an asterisk has been" - text run at (587,185) width 156: "inserted just before each" - text run at (587,203) width 107: "floated element. " - text run at (693,203) width 50: "If a line" - text run at (5,221) width 739: "has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in" - text run at (5,239) width 177: "which the asterisk appears. " - text run at (181,239) width 411: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (2,2498) size 765x118 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 186x18 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (205,5) size 682x36 - text run at (205,5) width 512: " The floating images within this DIV should not go any higher than the line-box" - text run at (35,23) width 330: "containing the inline content which precedes them. " - text run at (364,23) width 13: "* " - LayoutImage (floating) {IMG} at (745,23) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (376,23) size 325x18 - text run at (376,23) width 317: "This means that the top side of each float can be, " - text run at (692,23) width 9: "*" - LayoutImage (floating) {IMG} at (20,23) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (700,23) size 719x54 - text run at (700,23) width 16: " at" - text run at (35,41) width 704: "most, as high as the top edge of the inline element containing the content just before the floating images occur" - text run at (20,59) width 90: "in the source. " - text run at (109,59) width 9: "*" - LayoutImage (floating) {IMG} at (5,59) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (117,59) size 754x54 - text run at (117,59) width 630: " In order to mark these points clearly, an asterisk has been inserted just before each floated image. " - text run at (746,59) width 12: "If" - text run at (20,77) width 739: "a line has room for a floated image, then the image should float so that its top is aligned with the top of the line-box" - text run at (5,95) width 193: "in which the asterisk appears. " - text run at (197,95) width 411: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (2,2666) size 490x298 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 56x18 - text run at (199,5) width 56: "This is *" - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (254,5) size 13x18 - text run at (254,5) width 13: " *" - LayoutBlockFlow (floating) {P} at (291,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,23) size 479x270 - text run at (199,23) width 69: "text within" - text run at (199,41) width 54: "the DIV." - text run at (199,59) width 85: "Under CSS1," - text run at (199,77) width 45: "the left" - text run at (5,95) width 468: "floating element should be placed in the upper left corner of the DIV, and" - text run at (5,113) width 465: "the purple border of the DIV should abut the green border of the floating" - text run at (5,131) width 59: "element. " - text run at (63,131) width 421: "Similarly, the right floating element should be placed in the upper" - text run at (5,149) width 467: "right corner of the DIV, and the purple border of the DIV should abut the" - text run at (5,167) width 466: "green border of the floating element. The text of the DIV element should" - text run at (5,185) width 433: "flow between and under the two floating elements. The two asterisk" - text run at (5,203) width 477: "characters mark the insertion points of the floating elements. It is expected" - text run at (5,221) width 477: "that, under future specifications, it may be acceptable for the top of floated" - text run at (5,239) width 475: "elements to align with the top of the line-box following the insertion point" - text run at (5,257) width 449: "of the floated element to avoid floating elements appearing before text" - text run at (5,275) width 269: "which precedes it in the source document." - LayoutBlockFlow {DIV} at (2,2982) size 490x226 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 56x18 - text run at (20,5) width 56: "This is *" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (75,5) size 13x18 - text run at (75,5) width 13: " *" - LayoutImage (floating) {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (87,5) size 472x216 - text run at (87,5) width 135: " text within the DIV. " - text run at (221,5) width 231: "Under CSS1, the left floating image" - text run at (20,23) width 429: "should be placed in the upper left corner of the DIV, and the purple" - text run at (5,41) width 443: "border of the DIV should abut the green border of the floating image." - text run at (5,59) width 443: "Similarly, the right floating image should be placed in the upper right" - text run at (5,77) width 472: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,95) width 447: "border of the floating image. The text of the DIV element should flow" - text run at (5,113) width 451: "between and under the two floating image. The two asterisk characters" - text run at (5,131) width 305: "mark the insertion points of the floating image. " - text run at (309,131) width 159: "It is expected that, under" - text run at (5,149) width 465: "future specifications, it may be acceptable for the top of floated elements" - text run at (5,167) width 455: "to align with the top of the line-box following the insertion point of the" - text run at (5,185) width 451: "floated element to avoid floating elements appearing before text which" - text run at (5,203) width 226: "precedes it in the source document." - LayoutTable {TABLE} at (0,3258) size 769x3079 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x3077 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x3051 - LayoutTableCell {TD} at (0,1538) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x3051 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x54 - LayoutText {#text} at (0,0) size 736x54 - text run at (0,0) width 694: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (693,0) width 38: "Other" - text run at (0,18) width 736: "than the substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of" - text run at (0,36) width 63: "the floats." - LayoutBlockFlow {DIV} at (6,108) size 743x100 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutBlockFlow (floating) {P} at (544,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,5) size 344x90 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 140: "The floating elements" - text run at (199,23) width 344: "within this DIV should not go beyond the left or right" - text run at (199,41) width 338: "inner edge of this DIV, which means that the borders" - text run at (199,59) width 340: "of the floating elements should not overlap the top or" - text run at (199,77) width 153: "side borders of the DIV." - LayoutBlockFlow {DIV} at (6,226) size 743x64 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 704x54 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 512: "The floating images within this DIV should not go beyond the left or right inner" - text run at (20,23) width 662: "edge of this DIV, which means that the borders of the floating images should not overlap the top or side" - text run at (5,41) width 124: "borders of the DIV." - LayoutBlockFlow {DIV} at (6,340) size 442x226 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 127x36 - text run at (17,17) width 127: "This is the first left-" - text run at (17,35) width 121: "floating paragraph." - LayoutBlockFlow (floating) {P} at (199,5) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 146x36 - text run at (17,17) width 146: "This is the second left-" - text run at (17,35) width 121: "floating paragraph." - LayoutBlockFlow (floating) {P} at (5,75) size 194x70 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 132x36 - text run at (17,17) width 132: "This is the third left-" - text run at (17,35) width 121: "floating paragraph." - LayoutText {#text} at (393,5) size 432x216 - text run at (393,5) width 44: "This is" - text run at (393,23) width 24: "text" - text run at (393,41) width 41: "within" - text run at (393,59) width 20: "the" - text run at (199,77) width 35: "DIV. " - text run at (233,77) width 184: "The floating elements within" - text run at (199,95) width 222: "this DIV should not go beyond the" - text run at (199,113) width 223: "left or right inner edge of this DIV," - text run at (199,131) width 229: "which means that the borders of the" - text run at (5,149) width 421: "floating elements should not overlap the top or side borders of the" - text run at (5,167) width 110: "DIV in any way. " - text run at (114,167) width 303: "In addition, they should not overlap each other." - text run at (5,185) width 432: "The first two should be side by side, whereas the third should be on" - text run at (5,203) width 97: "the next \"line.\"" - LayoutBlockFlow {DIV} at (6,584) size 360x208 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - LayoutText {#text} at (317,5) size 344x198 - text run at (317,5) width 29: "This" - text run at (317,23) width 11: "is" - text run at (161,41) width 131: "text within the DIV. " - text run at (291,41) width 26: "The" - text run at (161,59) width 171: "floating images within this" - text run at (5,77) width 343: "DIV should not go beyond the left or right inner edge" - text run at (5,95) width 308: "of this DIV, which means that the borders of the" - text run at (5,113) width 317: "floating images should not overlap the top or side" - text run at (5,131) width 203: "borders of the DIV in any way. " - text run at (207,131) width 106: "In addition, they" - text run at (5,149) width 197: "should not overlap each other. " - text run at (201,149) width 148: "The first two should be" - text run at (5,167) width 335: "side by side, whereas the third should be on the next" - text run at (5,185) width 42: "\"line.\"" - LayoutBlockFlow {DIV} at (6,842) size 314x350 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutBlockFlow (floating) {P} at (115,93) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,5) size 301x340 - text run at (199,5) width 72: "This is text" - text run at (199,23) width 99: "within the DIV." - text run at (199,41) width 78: "The floating" - text run at (199,59) width 102: "elements within" - text run at (5,93) width 103: "this DIV should" - text run at (5,111) width 92: "not go beyond" - text run at (5,129) width 97: "the left or right" - text run at (5,147) width 85: "inner edge of" - text run at (5,165) width 101: "this DIV, which" - text run at (5,183) width 300: "means that the borders of the floating elements" - text run at (5,201) width 284: "should not overlap the top or side borders of" - text run at (5,219) width 134: "the DIV in any way. " - text run at (138,219) width 153: "In addition, they should" - text run at (5,237) width 292: "not overlap each other in any way, nor should" - text run at (5,255) width 301: "the floated elements be overwritten by the DIV" - text run at (5,273) width 32: "text. " - text run at (36,273) width 254: "In addition, the floated elements should" - text run at (5,291) width 299: "not be side-by-side, but instead the first should" - text run at (5,309) width 279: "be floated left, and the second floated to the" - text run at (5,327) width 130: "right below the first." - LayoutBlockFlow {DIV} at (6,1210) size 410x226 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - LayoutText {#text} at (261,5) size 396x216 - text run at (261,5) width 140: "This is text within the" - text run at (261,23) width 35: "DIV. " - text run at (295,23) width 79: "The floating" - text run at (5,41) width 118: "images within this" - text run at (5,59) width 120: "DIV should not go" - text run at (5,77) width 386: "beyond the left or right inner edge of this DIV, which means" - text run at (5,95) width 390: "that the borders of the floating images should not overlap the" - text run at (5,113) width 274: "top or side borders of the DIV in any way. " - text run at (279,113) width 106: "In addition, they" - text run at (5,131) width 362: "should not overlap each other in any way, nor should the" - text run at (5,149) width 314: "floated elements be overwritten by the DIV text. " - text run at (318,149) width 74: "In addition," - text run at (5,167) width 391: "the floated images should not be side-by-side, but instead the" - text run at (5,185) width 389: "first should be floated left, and the second floated to the right" - text run at (5,203) width 96: "below the first." - LayoutBlockFlow {DIV} at (6,1486) size 743x118 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (544,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 135x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,5) size 539x108 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 140: "The floating elements" - text run at (199,23) width 338: "within this DIV should not go beyond the top side of" - text run at (199,41) width 343: "this DIV, which means that the borders of the floating" - text run at (199,59) width 345: "elements should not overlap the top or side borders of" - text run at (199,77) width 134: "the DIV in any way. " - text run at (332,77) width 194: "In addition, the top of the left-" - text run at (5,95) width 453: "floating box should not be higher than the top of the right-floating box." - LayoutBlockFlow {DIV} at (6,1622) size 743x82 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 691x72 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 497: "The floating images within this DIV should not go beyond the top side of this" - text run at (20,23) width 676: "DIV, which means that the borders of the floating images should not overlap the top or side borders of the" - text run at (5,41) width 110: "DIV in any way. " - text run at (114,41) width 581: "In addition, the top of the left-floating image should not be higher than the top of the right-" - text run at (5,59) width 96: "floating image." - LayoutBlockFlow {DIV} at (6,1754) size 743x136 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 186x18 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (384,5) size 524x36 - text run at (384,5) width 339: " The floating elements within this DIV should not go" - text run at (199,23) width 515: "any higher than the line-box containing the inline content which precedes them. " - text run at (713,23) width 9: "*" - LayoutBlockFlow (floating) {P} at (544,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,41) size 523x90 - text run at (199,41) width 327: "This means that the top side of each float can be, at" - text run at (199,59) width 321: "most, as high as the top edge of the inline element" - text run at (199,77) width 291: "containing the content just before the floating" - text run at (5,95) width 191: "elements occur in the source. " - text run at (195,95) width 333: "In order to mark these points clearly, an asterisk has" - text run at (5,113) width 297: "been inserted just before each floated element." - LayoutBlockFlow {DIV} at (6,1908) size 743x82 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 186x18 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (205,5) size 697x36 - text run at (205,5) width 512: " The floating images within this DIV should not go any higher than the line-box" - text run at (20,23) width 330: "containing the inline content which precedes them. " - text run at (349,23) width 13: "* " - LayoutImage (floating) {IMG} at (723,23) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (361,23) size 711x54 - text run at (361,23) width 328: "This means that the top side of each float can be, at" - text run at (5,41) width 704: "most, as high as the top edge of the inline element containing the content just before the floating images occur" - text run at (5,59) width 90: "in the source. " - text run at (94,59) width 622: "In order to mark these points clearly, an asterisk has been inserted just before each floated image." - LayoutBlockFlow {DIV} at (6,2040) size 743x226 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 186x18 - text run at (199,5) width 178: "This is text within the DIV. " - text run at (376,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (384,5) size 524x36 - text run at (384,5) width 339: " The floating elements within this DIV should not go" - text run at (199,23) width 515: "any higher than the line-box containing the inline content which precedes them. " - text run at (713,23) width 9: "*" - LayoutBlockFlow (floating) {P} at (544,41) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,41) size 320x18 - text run at (199,41) width 320: "This means that the top side of each float can be,*" - LayoutBlockFlow (floating) {P} at (199,59) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 120: "paragraph (third in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (518,41) size 252x108 - text run at (518,41) width 16: " at" - text run at (393,59) width 151: "most, as high as the top" - text run at (393,77) width 112: "edge of the inline" - text run at (393,95) width 146: "element containing the" - text run at (393,113) width 143: "content just before the" - text run at (393,131) width 244: "floating elements occur in the source. " - text run at (636,131) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,149) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 129: "paragraph (fourth in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (644,131) size 519x90 - text run at (644,131) width 72: " In order to" - text run at (199,149) width 503: "mark these points clearly, an asterisk has been inserted just before each floated" - text run at (199,167) width 59: "element. " - text run at (257,167) width 461: "If a line has room for a floated element, then the element should float so" - text run at (199,185) width 505: "that its top is aligned with the top of the line-box in which the asterisk appears." - text run at (199,203) width 411: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (6,2287) size 743x118 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 186x18 - text run at (20,5) width 178: "This is text within the DIV. " - text run at (197,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (205,5) size 682x36 - text run at (205,5) width 512: " The floating images within this DIV should not go any higher than the line-box" - text run at (35,23) width 330: "containing the inline content which precedes them. " - text run at (364,23) width 13: "* " - LayoutImage (floating) {IMG} at (723,23) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (376,23) size 325x18 - text run at (376,23) width 317: "This means that the top side of each float can be, " - text run at (692,23) width 9: "*" - LayoutImage (floating) {IMG} at (20,23) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (700,23) size 696x54 - text run at (700,23) width 16: " at" - text run at (35,41) width 665: "most, as high as the top edge of the inline element containing the content just before the floating images" - text run at (20,59) width 130: "occur in the source. " - text run at (149,59) width 9: "*" - LayoutImage (floating) {IMG} at (5,59) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (157,59) size 731x54 - text run at (157,59) width 579: " In order to mark these points clearly, an asterisk has been inserted just before each floated" - text run at (20,77) width 48: "image. " - text run at (67,77) width 655: "If a line has room for a floated image, then the image should float so that its top is aligned with the top" - text run at (5,95) width 292: "of the line-box in which the asterisk appears. " - text run at (296,95) width 411: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (6,2455) size 490x298 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 56x18 - text run at (199,5) width 56: "This is *" - LayoutBlockFlow (floating) {P} at (5,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 134x54 - text run at (17,17) width 134: "This is a left-floating" - text run at (17,35) width 115: "paragraph (first in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (254,5) size 13x18 - text run at (254,5) width 13: " *" - LayoutBlockFlow (floating) {P} at (291,5) size 194x88 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 143x54 - text run at (17,17) width 143: "This is a right-floating" - text run at (17,35) width 135: "paragraph (second in" - text run at (17,53) width 52: "source)." - LayoutText {#text} at (199,23) size 479x270 - text run at (199,23) width 69: "text within" - text run at (199,41) width 54: "the DIV." - text run at (199,59) width 85: "Under CSS1," - text run at (199,77) width 45: "the left" - text run at (5,95) width 468: "floating element should be placed in the upper left corner of the DIV, and" - text run at (5,113) width 465: "the purple border of the DIV should abut the green border of the floating" - text run at (5,131) width 59: "element. " - text run at (63,131) width 421: "Similarly, the right floating element should be placed in the upper" - text run at (5,149) width 467: "right corner of the DIV, and the purple border of the DIV should abut the" - text run at (5,167) width 466: "green border of the floating element. The text of the DIV element should" - text run at (5,185) width 433: "flow between and under the two floating elements. The two asterisk" - text run at (5,203) width 477: "characters mark the insertion points of the floating elements. It is expected" - text run at (5,221) width 477: "that, under future specifications, it may be acceptable for the top of floated" - text run at (5,239) width 475: "elements to align with the top of the line-box following the insertion point" - text run at (5,257) width 449: "of the floated element to avoid floating elements appearing before text" - text run at (5,275) width 269: "which precedes it in the source document." - LayoutBlockFlow {DIV} at (6,2771) size 490x226 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 56x18 - text run at (20,5) width 56: "This is *" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (75,5) size 13x18 - text run at (75,5) width 13: " *" - LayoutImage (floating) {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (87,5) size 472x216 - text run at (87,5) width 135: " text within the DIV. " - text run at (221,5) width 231: "Under CSS1, the left floating image" - text run at (20,23) width 429: "should be placed in the upper left corner of the DIV, and the purple" - text run at (5,41) width 443: "border of the DIV should abut the green border of the floating image." - text run at (5,59) width 443: "Similarly, the right floating image should be placed in the upper right" - text run at (5,77) width 472: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,95) width 447: "border of the floating image. The text of the DIV element should flow" - text run at (5,113) width 451: "between and under the two floating image. The two asterisk characters" - text run at (5,131) width 305: "mark the insertion points of the floating image. " - text run at (309,131) width 159: "It is expected that, under" - text run at (5,149) width 465: "future specifications, it may be acceptable for the top of floated elements" - text run at (5,167) width 455: "to align with the top of the line-box following the insertion point of the" - text run at (5,185) width 451: "floated element to avoid floating elements appearing before text which" - text run at (5,203) width 226: "precedes it in the source document." -layer at (8,190) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,182) size 769x2 [border: (1px inset #EEEEEE)] -layer at (32,286) size 579x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,278) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,420) size 41x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,412) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,518) size 579x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,510) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,778) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,770) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1020) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,1012) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,1404) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,1396) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1664) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,1656) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,1816) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,1808) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1914) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,1906) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2084) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2076) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,2200) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,2192) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2496) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2488) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,2648) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,2640) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2980) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2972) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,3240) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,3232) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (49,3375) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,82) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,3509) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,216) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,3607) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,314) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,3867) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,574) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,4109) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,816) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,4493) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1200) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,4753) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,1460) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,4905) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1612) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5021) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,1728) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,5191) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1898) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5307) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,2014) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,5570) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,2277) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5722) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,2429) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,6054) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,2761) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,6314) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,3021) size 562.25x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png deleted file mode 100644 index c3de95d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt deleted file mode 100644 index 89394bd2..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt +++ /dev/null
@@ -1,133 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2299 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2299 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2299 - LayoutBlockFlow {BODY} at (8,8) size 769x2283 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x270 - LayoutText {#text} at (0,0) size 523x270 - text run at (0,0) width 336: "P.one {font-size: 14px; line-height: 20px;}" - text run at (335,0) width 1: " " - text run at (0,15) width 297: "IMG.onea {vertical-align: text-bottom;" - text run at (296,15) width 1: " " - text run at (0,30) width 266: " width: 200px; height: 200px;}" - text run at (265,30) width 1: " " - text run at (0,45) width 508: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}" - text run at (507,45) width 1: " " - text run at (0,60) width 0: " " - text run at (0,75) width 336: "P.two {font-size: 14px; line-height: 20px;}" - text run at (335,75) width 1: " " - text run at (0,90) width 523: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;" - text run at (522,90) width 1: " " - text run at (0,105) width 305: " padding: 5px; border-style: solid;" - text run at (304,105) width 1: " " - text run at (0,120) width 305: " border-width: 10px; margin: 15px;}" - text run at (304,120) width 1: " " - text run at (0,135) width 274: "IMG.twob {vertical-align: text-top;" - text run at (273,135) width 1: " " - text run at (0,150) width 297: " width: 100px; height: 100px;" - text run at (296,150) width 1: " " - text run at (0,165) width 305: " padding: 5px; border-style: solid;" - text run at (304,165) width 1: " " - text run at (0,180) width 305: " border-width: 10px; margin: 15px;}" - text run at (304,180) width 1: " " - text run at (0,195) width 0: " " - text run at (0,210) width 469: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;" - text run at (468,210) width 1: " " - text run at (0,225) width 305: " padding: 5px; border-style: solid;" - text run at (304,225) width 1: " " - text run at (0,240) width 313: " border-width: 10px; margin: -10px;}" - text run at (312,240) width 1: " " - text run at (0,255) width 0: " " - LayoutBlockFlow {P} at (0,333) size 769x443 - LayoutText {#text} at (0,1) size 768x239 - text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (412,1) width 345: "This means that the lines of text within it should be separated" - text run at (0,21) width 367: "by six pixels, three of which are part of the line-box of each line. " - text run at (366,21) width 402: "Any images within the paragraph should increase the height of the line-" - text run at (0,223) width 265: "box so that they fit within the line box, such as " - LayoutImage {IMG} at (264.41,40) size 200x200 - LayoutText {#text} at (464,223) size 28x17 - text run at (464,223) width 28: " and " - LayoutImage {IMG} at (491.61,223) size 200x200 - LayoutText {#text} at (691,223) size 769x218 - text run at (691,223) width 8: ". " - text run at (698,223) width 39: "This is" - text run at (0,424) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned." - LayoutBlockFlow {P} at (0,790) size 769x483 - LayoutText {#text} at (0,1) size 758x199 - text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (412,1) width 345: "This means that the lines of text within it should be separated" - text run at (0,21) width 78: "by six pixels. " - text run at (77,21) width 681: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px)," - text run at (0,183) width 351: "border (10px) and margins (15px) within the line box, such as " - LayoutImage {IMG} at (365.45,55) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (510,183) size 28x17 - text run at (510,183) width 28: " and " - LayoutImage {IMG} at (552.66,198) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (697,183) size 769x257 - text run at (697,183) width 8: ". " - text run at (704,183) width 39: "This is" - text run at (0,344) width 769: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top aligned." - text run at (0,364) width 734: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the bottom" - text run at (0,384) width 753: "border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px below" - text run at (0,423) width 103: "the top of the text " - LayoutImage {IMG} at (92.25,393) size 80x80 [border: (10px solid #000000)] - LayoutText {#text} at (162,423) size 737x58 - text run at (162,423) width 8: ". " - text run at (169,423) width 568: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward the" - text run at (0,464) width 374: "image in the vertical direction, and also in the horizontal direction." - LayoutTable {TABLE} at (0,1287) size 769x996 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x994 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x968 - LayoutTableCell {TD} at (0,497) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x968 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x463 - LayoutText {#text} at (0,1) size 720x239 - text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (412,1) width 288: "This means that the lines of text within it should be" - text run at (0,21) width 423: "separated by six pixels, three of which are part of the line-box of each line. " - text run at (422,21) width 298: "Any images within the paragraph should increase the" - text run at (0,223) width 365: "height of the line-box so that they fit within the line box, such as " - LayoutImage {IMG} at (364.33,40) size 200x200 - LayoutText {#text} at (564,223) size 28x17 - text run at (564,223) width 28: " and " - LayoutImage {IMG} at (0,243) size 200x200 - LayoutText {#text} at (200,243) size 733x218 - text run at (200,243) width 7: ". " - text run at (207,243) width 526: "This is additional text to make sure that there is enough room left below the image so that this" - text run at (0,444) width 281: "line does not hit the image that is text-top aligned." - LayoutBlockFlow {P} at (4,481) size 747x483 - LayoutText {#text} at (0,1) size 729x199 - text run at (0,1) width 413: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (412,1) width 288: "This means that the lines of text within it should be" - text run at (0,21) width 135: "separated by six pixels. " - text run at (134,21) width 595: "Any images within the paragraph should increase the height of the line-box so that they fit, including their" - text run at (0,183) width 437: "padding (5px), border (10px) and margins (15px) within the line box, such as " - LayoutImage {IMG} at (451.38,55) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (596,183) size 28x17 - text run at (596,183) width 28: " and " - LayoutImage {IMG} at (15,218) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (160,203) size 747x237 - text run at (160,203) width 7: ". " - text run at (167,203) width 580: "This is additional text to make sure that there is enough room left below the image so that this line does" - text run at (0,364) width 231: "not hit the image that is text-top aligned. " - text run at (230,364) width 488: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this" - text run at (0,384) width 735: "paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the second" - text run at (0,423) width 367: "image the top border should begin 15px below the top of the text " - LayoutImage {IMG} at (356.64,393) size 80x80 [border: (10px solid #000000)] - LayoutText {#text} at (426,423) size 740x58 - text run at (426,423) width 8: ". " - text run at (433,423) width 307: "The last image in this paragraph has -10px margins set" - text run at (0,464) width 635: "on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction." -layer at (8,325) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,317) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png deleted file mode 100644 index d188969..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png deleted file mode 100644 index b7534125..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt deleted file mode 100644 index c3e467e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt +++ /dev/null
@@ -1,97 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 780 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x779 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x779.33 - LayoutBlockFlow {BODY} at (8,8) size 769x763.33 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x105 - LayoutText {#text} at (0,0) size 547x105 - text run at (0,0) width 203: "P.one {line-height: 200%;}" - text run at (202,0) width 1: " " - text run at (0,15) width 539: "SPAN.two {border-style: solid; border-width: 10px; border-color: red;" - text run at (538,15) width 1: " " - text run at (0,30) width 297: " padding: 2pt; margin: 30pt;}" - text run at (296,30) width 1: " " - text run at (0,45) width 352: "P.three {font-size: 10pt; line-height: 12pt;}" - text run at (351,45) width 1: " " - text run at (0,60) width 547: "SPAN.four {border-style: solid; border-width: 12px; border-color: red;" - text run at (546,60) width 1: " " - text run at (0,75) width 188: " padding: 2pt;}" - text run at (187,75) width 1: " " - text run at (0,90) width 0: " " - LayoutBlockFlow {P} at (0,170) size 769x192 - LayoutText {#text} at (0,7) size 191x18 - text run at (0,7) width 191: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 765x172 [border: (10px solid #FF0000)] - LayoutText {#text} at (242,7) size 765x146 - text run at (242,7) width 512: "very long span in it, and the span has a 10px red border separated from the span" - text run at (0,39) width 190: "by 2pt, and a margin of 30pt. " - text run at (189,39) width 572: "The padding and border should be present on all sides of the span (although vertical lines" - text run at (0,71) width 547: "should appear only at the beginning and the end of the whole span, not on each line). " - text run at (546,71) width 211: "The padding, border, and margin" - text run at (0,103) width 395: "should all be noticeable at the beginning and end of the span. " - text run at (395,103) width 370: "However, the line height should not be changed by any of" - text run at (0,135) width 597: "them, so the margin should be unnoticeable and the border should overlap text on other lines." - LayoutText {#text} at (648,135) size 759x50 - text run at (648,135) width 5: " " - text run at (652,135) width 107: "The line spacing" - text run at (0,167) width 358: "in the whole paragraph should be 200% of the font size." - LayoutBlockFlow {P} at (0,378) size 769x64 - LayoutText {#text} at (0,0) size 159x15 - text run at (0,0) width 159: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 755x93 [border: (12px solid #FF0000)] - LayoutText {#text} at (172,0) size 755x63 - text run at (172,0) width 548: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 755: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the padding" - text run at (0,32) width 237: "and border should not effect the line height. " - text run at (236,32) width 517: "The span's border should have vertical lines only at the beginning and end of the whole span, not" - text run at (0,48) width 68: "on each line." - LayoutText {#text} at (81,48) size 411x15 - text run at (81,48) width 5: " " - text run at (85,48) width 407: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." - LayoutTable {TABLE} at (0,455.33) size 769x308 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x306 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x280 - LayoutTableCell {TD} at (0,153) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x192 - LayoutText {#text} at (0,7) size 191x18 - text run at (0,7) width 191: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 725x204 [border: (10px solid #FF0000)] - LayoutText {#text} at (242,7) size 725x178 - text run at (242,7) width 478: "very long span in it, and the span has a 10px red border separated from the" - text run at (0,39) width 223: "span by 2pt, and a margin of 30pt. " - text run at (222,39) width 486: "The padding and border should be present on all sides of the span (although" - text run at (0,71) width 634: "vertical lines should appear only at the beginning and the end of the whole span, not on each line). " - text run at (633,71) width 85: "The padding," - text run at (0,103) width 521: "border, and margin should all be noticeable at the beginning and end of the span. " - text run at (520,103) width 205: "However, the line height should" - text run at (0,135) width 724: "not be changed by any of them, so the margin should be unnoticeable and the border should overlap text on other" - text run at (0,167) width 35: "lines." - LayoutText {#text} at (86,167) size 472x18 - text run at (86,167) width 5: " " - text run at (90,167) width 468: "The line spacing in the whole paragraph should be 200% of the font size." - LayoutBlockFlow {P} at (4,212) size 747x64 - LayoutText {#text} at (0,0) size 159x15 - text run at (0,0) width 159: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 720x93 [border: (12px solid #FF0000)] - LayoutText {#text} at (172,0) size 720x63 - text run at (172,0) width 548: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 708: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the" - text run at (0,32) width 283: "padding and border should not effect the line height. " - text run at (282,32) width 430: "The span's border should have vertical lines only at the beginning and end of the" - text run at (0,48) width 156: "whole span, not on each line." - LayoutText {#text} at (169,48) size 410x15 - text run at (169,48) width 4: " " - text run at (172,48) width 407: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." -layer at (8,160) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,152) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png deleted file mode 100644 index f0bfa1e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt deleted file mode 100644 index 8d72bab..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt +++ /dev/null
@@ -1,88 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2339 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2339 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2339 - LayoutBlockFlow {BODY} at (8,8) size 769x2323 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x120 - LayoutText {#text} at (0,0) size 492x120 - text run at (0,0) width 203: "IMG.one {display: inline;}" - text run at (202,0) width 1: " " - text run at (0,15) width 196: "IMG.two {display: block;}" - text run at (195,15) width 1: " " - text run at (0,30) width 203: "IMG.three {display: block;" - text run at (202,30) width 1: " " - text run at (0,45) width 492: " margin-right: auto; margin-left: auto; width: auto;}" - text run at (491,45) width 1: " " - text run at (0,60) width 196: "IMG.four {display: block;" - text run at (195,60) width 1: " " - text run at (0,75) width 476: " margin-right: auto; margin-left: auto; width: 50%;}" - text run at (475,75) width 1: " " - text run at (0,90) width 196: "IMG.five {display: block;" - text run at (195,90) width 1: " " - text run at (0,105) width 453: " margin-right: 0; margin-left: auto; width: 50%;}" - text run at (452,105) width 1: " " - LayoutBlockFlow {P} at (0,185) size 769x19 - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,1) size 442x18 - text run at (15,1) width 442: "The image at the beginning of this sentence should be a 15px square." - LayoutImage {IMG} at (0,220) size 15x15 - LayoutBlockFlow {P} at (0,251) size 769x18 - LayoutText {#text} at (0,0) size 498x18 - text run at (0,0) width 498: "The above image should be a 15px square with the same left edge as this text." - LayoutImage {IMG} at (377,285) size 15x15 - LayoutBlockFlow {P} at (0,316) size 769x18 - LayoutText {#text} at (0,0) size 406x18 - text run at (0,0) width 406: "The above image should be a 15px square aligned at the center." - LayoutImage {IMG} at (192.25,350) size 384.50x384.50 - LayoutBlockFlow {P} at (0,750.50) size 769x36 - LayoutText {#text} at (0,0) size 738x36 - text run at (0,0) width 738: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally" - text run at (0,18) width 172: "within the parent element: " - text run at (171,18) width 404: "the document body in the first half, and the table in the second." - LayoutImage {IMG} at (384.50,802.50) size 384.50x384.50 - LayoutBlockFlow {P} at (0,1203) size 769x36 - LayoutText {#text} at (0,0) size 750x36 - text run at (0,0) width 750: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of" - text run at (0,18) width 127: "the parent element: " - text run at (126,18) width 404: "the document body in the first half, and the table in the second." - LayoutTable {TABLE} at (0,1255) size 769x1068 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1066 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x1040 - LayoutTableCell {TD} at (0,533) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x1040 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x19 - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,1) size 442x18 - text run at (15,1) width 442: "The image at the beginning of this sentence should be a 15px square." - LayoutImage {IMG} at (4,39) size 15x15 - LayoutBlockFlow {P} at (4,70) size 747x18 - LayoutText {#text} at (0,0) size 498x18 - text run at (0,0) width 498: "The above image should be a 15px square with the same left edge as this text." - LayoutImage {IMG} at (370,104) size 15x15 - LayoutBlockFlow {P} at (4,135) size 747x18 - LayoutText {#text} at (0,0) size 406x18 - text run at (0,0) width 406: "The above image should be a 15px square aligned at the center." - LayoutImage {IMG} at (190.75,169) size 373.50x373.50 - LayoutBlockFlow {P} at (4,558.50) size 747x36 - LayoutText {#text} at (0,0) size 738x36 - text run at (0,0) width 738: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally" - text run at (0,18) width 172: "within the parent element: " - text run at (171,18) width 404: "the document body in the first half, and the table in the second." - LayoutImage {IMG} at (377.50,610.50) size 373.50x373.50 - LayoutBlockFlow {P} at (4,1000) size 747x36 - LayoutText {#text} at (0,0) size 733x36 - text run at (0,0) width 733: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge" - text run at (0,18) width 144: "of the parent element: " - text run at (143,18) width 404: "the document body in the first half, and the table in the second." -layer at (8,175) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,167) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png deleted file mode 100644 index 3847ef8..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt deleted file mode 100644 index e3e159e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt +++ /dev/null
@@ -1,173 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2487 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2487 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2486.78 - LayoutBlockFlow {BODY} at (8,8) size 769x2470.78 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x300 - LayoutText {#text} at (0,0) size 484x300 - text run at (0,0) width 359: "P.one {margin-bottom: 2cm; padding-bottom: 0;}" - text run at (358,0) width 1: " " - text run at (0,15) width 313: "P.two {margin-top: 2cm; padding-top: 0;}" - text run at (312,15) width 1: " " - text run at (0,30) width 313: "P.three {margin-top: 0; padding-top: 0;}" - text run at (312,30) width 1: " " - text run at (0,45) width 336: "P.four {margin-top: -1cm; margin-bottom: 0;" - text run at (335,45) width 1: " " - text run at (0,60) width 336: " padding-top: 0; padding-bottom: 0;}" - text run at (335,60) width 1: " " - text run at (0,75) width 359: "DIV.five {margin-top: 1cm; margin-bottom: 1cm;" - text run at (358,75) width 1: " " - text run at (0,90) width 367: " padding-top: 1cm; padding-bottom: 0;}" - text run at (366,90) width 1: " " - text run at (0,105) width 336: "P.six {margin-top: 1cm; margin-bottom: 1cm;" - text run at (335,105) width 1: " " - text run at (0,120) width 328: " padding-top: 0; padding-bottom: 0;}" - text run at (327,120) width 1: " " - text run at (0,135) width 328: "P.seven {margin-top: 1cm; padding-top: 0;}" - text run at (327,135) width 1: " " - text run at (0,150) width 398: "P.eight {margin-bottom: -1cm; padding-bottom: 2cm;}" - text run at (397,150) width 1: " " - text run at (0,165) width 336: "P.nine {margin-top: -1cm; padding-top: 1cm;" - text run at (335,165) width 1: " " - text run at (0,180) width 367: " padding-bottom: 0; margin-bottom: 1cm;}" - text run at (366,180) width 1: " " - text run at (0,195) width 297: "P.ten {margin-top: 1cm;padding-top: 0;" - text run at (296,195) width 1: " " - text run at (0,210) width 242: " float: left;width: 50%;}" - text run at (241,210) width 1: " " - text run at (0,225) width 437: "P.eleven {margin-top: 1cm; padding-top: 0; clear: none;}" - text run at (436,225) width 1: " " - text run at (0,240) width 484: "P.twelve {margin-bottom: 0; padding-bottom: 1cm; clear: both;}" - text run at (483,240) width 1: " " - text run at (0,255) width 352: "P.thirteen {margin-top: 0; padding-top: 1cm;}" - text run at (351,255) width 1: " " - text run at (0,270) width 157: "TABLE {clear: both;}" - text run at (156,270) width 1: " " - text run at (0,285) width 0: " " - LayoutBlockFlow {P} at (0,365) size 769x36 - LayoutText {#text} at (0,0) size 769x36 - text run at (0,0) width 769: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" - text run at (0,18) width 262: "collapse to the maximum of the margins." - LayoutBlockFlow {P} at (0,476.58) size 769x18 - LayoutText {#text} at (0,0) size 168x18 - text run at (0,0) width 168: "This is another paragraph." - LayoutBlockFlow {P} at (0,510.58) size 769x18 - LayoutText {#text} at (0,0) size 503x18 - text run at (0,0) width 503: "There should be a two-centimeter margin between this paragraph and the next." - LayoutBlockFlow {P} at (0,604.16) size 769x18 - LayoutText {#text} at (0,0) size 168x18 - text run at (0,0) width 168: "This is another paragraph." - LayoutBlockFlow {P} at (0,638.16) size 769x36 - LayoutText {#text} at (0,0) size 731x36 - text run at (0,0) width 731: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" - text run at (0,18) width 474: "margin, the two margins should be added (the minus sign should be kept)." - LayoutBlockFlow {P} at (0,711.95) size 769x18 - LayoutText {#text} at (0,0) size 168x18 - text run at (0,0) width 168: "This is another paragraph." - LayoutBlockFlow {DIV} at (0,767.73) size 769x129.56 - LayoutBlockFlow {P} at (0,75.56) size 769x54 - LayoutText {#text} at (0,0) size 750x54 - text run at (0,0) width 750: "There should be three centimeters between this text and the text above, but only one centimeter between this text and" - text run at (0,18) width 718: "the text below, because vertical margins of nested elements should collapse only if there is no border or padding" - text run at (0,36) width 137: "between the margins." - LayoutBlockFlow {P} at (0,935.08) size 769x18 - LayoutText {#text} at (0,0) size 112x18 - text run at (0,0) width 112: "This is more text." - LayoutBlockFlow {P} at (0,969.08) size 769x111.58 - LayoutText {#text} at (0,0) size 738x36 - text run at (0,0) width 738: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" - text run at (0,18) width 467: "negative margin with the largest absolute value of the margins collapsed." - LayoutBlockFlow {P} at (0,1042.88) size 769x73.78 - LayoutText {#text} at (0,37) size 754x37 - text run at (0,37) width 754: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and" - text run at (0,55) width 208: "the one below it and to the right." - LayoutBlockFlow (floating) {P} at (0,1192.22) size 384.50x54 - LayoutText {#text} at (0,0) size 362x54 - text run at (0,0) width 362: "There should be two centimeters between this paragraph" - text run at (0,18) width 346: "and the one above it, since margins do not collapse on" - text run at (0,36) width 114: "floating elements." - LayoutBlockFlow {P} at (0,1154.44) size 769x54 - LayoutText {#text} at (384,0) size 382x54 - text run at (384,0) width 382: "There should be one centimeter between this paragraph and" - text run at (384,18) width 364: "the (non-floating) one above it, since the float should not" - text run at (384,36) width 185: "effect the paragraph spacing." - LayoutBlockFlow {P} at (0,1262.22) size 769x73.78 - LayoutText {#text} at (0,0) size 760x36 - text run at (0,0) width 562: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (561,0) width 199: "Padding does not collapse, and" - text run at (0,18) width 239: "there is 1cm of padding on each side." - LayoutBlockFlow {P} at (0,1336) size 769x55.78 - LayoutText {#text} at (0,37) size 171x19 - text run at (0,37) width 171: "This is the next paragraph." - LayoutTable {TABLE} at (0,1407.78) size 769x1063 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1061 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x1035 - LayoutTableCell {TD} at (0,530) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x1034.78 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x36 - LayoutText {#text} at (0,0) size 722x36 - text run at (0,0) width 722: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins" - text run at (0,18) width 309: "should collapse to the maximum of the margins." - LayoutBlockFlow {P} at (4,115.58) size 747x18 - LayoutText {#text} at (0,0) size 168x18 - text run at (0,0) width 168: "This is another paragraph." - LayoutBlockFlow {P} at (4,149.58) size 747x18 - LayoutText {#text} at (0,0) size 503x18 - text run at (0,0) width 503: "There should be a two-centimeter margin between this paragraph and the next." - LayoutBlockFlow {P} at (4,243.16) size 747x18 - LayoutText {#text} at (0,0) size 168x18 - text run at (0,0) width 168: "This is another paragraph." - LayoutBlockFlow {P} at (4,277.16) size 747x36 - LayoutText {#text} at (0,0) size 731x36 - text run at (0,0) width 731: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative" - text run at (0,18) width 474: "margin, the two margins should be added (the minus sign should be kept)." - LayoutBlockFlow {P} at (4,350.95) size 747x18 - LayoutText {#text} at (0,0) size 168x18 - text run at (0,0) width 168: "This is another paragraph." - LayoutBlockFlow {DIV} at (4,406.73) size 747x129.56 - LayoutBlockFlow {P} at (0,75.56) size 747x54 - LayoutText {#text} at (0,0) size 745x54 - text run at (0,0) width 722: "There should be three centimeters between this text and the text above, but only one centimeter between this text" - text run at (0,18) width 745: "and the text below, because vertical margins of nested elements should collapse only if there is no border or padding" - text run at (0,36) width 137: "between the margins." - LayoutBlockFlow {P} at (4,574.08) size 747x18 - LayoutText {#text} at (0,0) size 112x18 - text run at (0,0) width 112: "This is more text." - LayoutBlockFlow {P} at (4,608.08) size 747x111.58 - LayoutText {#text} at (0,0) size 738x36 - text run at (0,0) width 738: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a" - text run at (0,18) width 467: "negative margin with the largest absolute value of the margins collapsed." - LayoutBlockFlow {P} at (4,681.88) size 747x73.78 - LayoutText {#text} at (0,37) size 727x37 - text run at (0,37) width 727: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it" - text run at (0,55) width 236: "and the one below it and to the right." - LayoutBlockFlow (floating) {P} at (4,831.22) size 373.50x54 - LayoutText {#text} at (0,0) size 362x54 - text run at (0,0) width 362: "There should be two centimeters between this paragraph" - text run at (0,18) width 346: "and the one above it, since margins do not collapse on" - text run at (0,36) width 114: "floating elements." - LayoutBlockFlow {P} at (4,793.44) size 747x54 - LayoutText {#text} at (373,0) size 366x54 - text run at (373,0) width 355: "There should be one centimeter between this paragraph" - text run at (373,18) width 366: "and the (non-floating) one above it, since the float should" - text run at (373,36) width 210: "not effect the paragraph spacing." - LayoutBlockFlow {P} at (4,901.22) size 747x73.78 - LayoutText {#text} at (0,0) size 733x36 - text run at (0,0) width 562: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (561,0) width 172: "Padding does not collapse," - text run at (0,18) width 266: "and there is 1cm of padding on each side." - LayoutBlockFlow {P} at (4,975) size 747x55.78 - LayoutText {#text} at (0,37) size 171x19 - text run at (0,37) width 171: "This is the next paragraph." -layer at (8,355) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,347) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/anchor-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/anchor-expected.png deleted file mode 100644 index 057dd50dd..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/anchor-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/anchor-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/anchor-expected.txt deleted file mode 100644 index f05bc76..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/anchor-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 683 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x683 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x683 - LayoutBlockFlow {BODY} at (8,8) size 769x667 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x90 - LayoutText {#text} at (0,0) size 196x90 - text run at (0,0) width 133: "A {color: green;}" - text run at (132,0) width 1: " " - text run at (0,15) width 180: "A:link {color: purple;}" - text run at (179,15) width 1: " " - text run at (0,30) width 188: "A:visited {color: lime;}" - text run at (187,30) width 1: " " - text run at (0,45) width 196: "A:active {color: maroon;}" - text run at (195,45) width 1: " " - text run at (0,60) width 172: "#one {color: #006600;}" - text run at (171,60) width 1: " " - text run at (0,75) width 0: " " - LayoutBlockFlow {P} at (0,155) size 769x18 - LayoutText {#text} at (0,0) size 508x18 - text run at (0,0) width 508: "The following anchors should appear as described; none of them should be red." - LayoutBlockFlow {UL} at (0,189) size 769x144 - LayoutListItem {LI} at (40,0) size 729x108 - LayoutBlockFlow (anonymous) at (0,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 583x18 - text run at (0,0) width 583: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - LayoutBlockFlow {UL} at (0,18) size 729x90 - LayoutListItem {LI} at (40,0) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 110x18 [color=#800080] - LayoutText {#text} at (0,0) size 110x18 - text run at (0,0) width 110: "W3C Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,18) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 112x18 [color=#800080] - LayoutText {#text} at (0,0) size 112x18 - text run at (0,0) width 112: "NIST Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,36) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 125x18 [color=#800080] - LayoutText {#text} at (0,0) size 125x18 - text run at (0,0) width 125: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,54) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 47x18 [color=#800080] - LayoutText {#text} at (0,0) size 47x18 - text run at (0,0) width 47: "Yahoo!" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,72) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 58x18 [color=#800080] - LayoutText {#text} at (0,0) size 58x18 - text run at (0,0) width 58: "Erewhon" - LayoutText {#text} at (57,0) size 225x18 - text run at (57,0) width 225: " (don't click on it, it goes nowhere)" - LayoutListItem {LI} at (40,108) size 729x36 - LayoutBlockFlow (anonymous) at (0,0) size 729x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "Dark green in any circumstance:" - LayoutBlockFlow {UL} at (0,18) size 729x18 - LayoutListItem {LI} at (40,0) size 689x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 125x18 [color=#006600] - LayoutText {#text} at (0,0) size 125x18 - text run at (0,0) width 125: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,349) size 769x36 - LayoutText {#text} at (0,0) size 120x18 - text run at (0,0) width 120: "The quoted word \"" - LayoutInline {A} at (0,0) size 45x18 [color=#008000] - LayoutText {#text} at (119,0) size 45x18 - text run at (119,0) width 45: "anchor" - LayoutText {#text} at (163,0) size 739x36 - text run at (163,0) width 381: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (543,0) width 196: "It's a named anchor, and styles" - text run at (0,18) width 356: "declared for the A tag are applied to them under CSS1. " - text run at (355,18) width 330: "It also should NOT turn orange when clicked upon." - LayoutTable {TABLE} at (0,401) size 769x266 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x264 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x238 - LayoutTableCell {TD} at (0,132) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x238 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 508x18 - text run at (0,0) width 508: "The following anchors should appear as described; none of them should be red." - LayoutBlockFlow {UL} at (4,38) size 747x144 - LayoutListItem {LI} at (40,0) size 707x108 - LayoutBlockFlow (anonymous) at (0,0) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 583x18 - text run at (0,0) width 583: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - LayoutBlockFlow {UL} at (0,18) size 707x90 - LayoutListItem {LI} at (40,0) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 110x18 [color=#800080] - LayoutText {#text} at (0,0) size 110x18 - text run at (0,0) width 110: "W3C Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,18) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 112x18 [color=#800080] - LayoutText {#text} at (0,0) size 112x18 - text run at (0,0) width 112: "NIST Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,36) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 125x18 [color=#800080] - LayoutText {#text} at (0,0) size 125x18 - text run at (0,0) width 125: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,54) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 47x18 [color=#800080] - LayoutText {#text} at (0,0) size 47x18 - text run at (0,0) width 47: "Yahoo!" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,72) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 58x18 [color=#800080] - LayoutText {#text} at (0,0) size 58x18 - text run at (0,0) width 58: "Erewhon" - LayoutText {#text} at (57,0) size 225x18 - text run at (57,0) width 225: " (don't click on it, it goes nowhere)" - LayoutListItem {LI} at (40,108) size 707x36 - LayoutBlockFlow (anonymous) at (0,0) size 707x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: bullet - LayoutText {#text} at (0,0) size 208x18 - text run at (0,0) width 208: "Dark green in any circumstance:" - LayoutBlockFlow {UL} at (0,18) size 707x18 - LayoutListItem {LI} at (40,0) size 667x18 - LayoutListMarker (anonymous) at (-17,0) size 7x18: white bullet - LayoutInline {A} at (0,0) size 125x18 [color=#006600] - LayoutText {#text} at (0,0) size 125x18 - text run at (0,0) width 125: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,198) size 747x36 - LayoutText {#text} at (0,0) size 120x18 - text run at (0,0) width 120: "The quoted word \"" - LayoutInline {A} at (0,0) size 45x18 [color=#008000] - LayoutText {#text} at (119,0) size 45x18 - text run at (119,0) width 45: "anchor" - LayoutText {#text} at (163,0) size 739x36 - text run at (163,0) width 381: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (543,0) width 196: "It's a named anchor, and styles" - text run at (0,18) width 356: "declared for the A tag are applied to them under CSS1. " - text run at (355,18) width 330: "It also should NOT turn orange when clicked upon." -layer at (8,145) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,137) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstletter-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstletter-expected.png deleted file mode 100644 index 4933fce..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstletter-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt deleted file mode 100644 index a1c8a34..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt +++ /dev/null
@@ -1,94 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 711 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x711 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x711 - LayoutBlockFlow {BODY} at (8,8) size 769x695 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x18 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x18 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (9,0) size 354x18 - text run at (9,0) width 354: "he style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x60 - LayoutText {#text} at (0,0) size 305x60 - text run at (0,0) width 242: "P:first-letter {color: maroon;}" - text run at (241,0) width 1: " " - text run at (0,15) width 281: ".two:first-letter {font-size: 200%;}" - text run at (280,15) width 1: " " - text run at (0,30) width 305: "P.three:first-letter {font-size: 350%;}" - text run at (304,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 769x54 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x18 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x18 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (9,0) size 766x54 - text run at (9,0) width 444: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (452,0) width 304: "If this precise combination does not occur, then" - text run at (0,18) width 216: "the user agent has failed this test. " - text run at (215,18) width 551: "Remember that in order to ensure a complete test, the paragraph must be displayed on" - text run at (0,36) width 124: "more than one line." - LayoutBlockFlow {P} at (0,195) size 769x73 - LayoutInline {<pseudo:first-letter>} at (0,0) size 20x37 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 20x37 - text run at (0,0) width 20: "T" - LayoutTextFragment {#text} at (19,15) size 751x58 - text run at (19,15) width 625: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (643,15) width 88: "If this precise" - text run at (0,37) width 433: "combination does not occur, then the user agent has failed this test. " - text run at (432,37) width 319: "Remember that in order to ensure a complete test," - text run at (0,55) width 355: "the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,284) size 769x100 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 76x64 - text run at (0,0) width 76: "\"W" - LayoutTextFragment {#text} at (75,36) size 754x64 - text run at (75,36) width 325: "e should check for quotation support,\" it was said. " - text run at (399,36) width 338: "The first two characters in this paragraph-- a double-" - text run at (0,64) width 628: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (627,64) width 127: "Note that this is not" - text run at (0,82) width 289: "required under CSS1, but it is recommended." - LayoutTable {TABLE} at (0,400) size 769x295 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x293 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x267 - LayoutTableCell {TD} at (0,146) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x267 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x54 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x18 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x18 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (9,0) size 725x54 - text run at (9,0) width 444: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (452,0) width 273: "If this precise combination does not occur," - text run at (0,18) width 248: "then the user agent has failed this test. " - text run at (247,18) width 465: "Remember that in order to ensure a complete test, the paragraph must be" - text run at (0,36) width 209: "displayed on more than one line." - LayoutBlockFlow {P} at (4,74) size 747x73 - LayoutInline {<pseudo:first-letter>} at (0,0) size 20x37 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 20x37 - text run at (0,0) width 20: "T" - LayoutTextFragment {#text} at (19,15) size 731x58 - text run at (19,15) width 625: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (643,15) width 88: "If this precise" - text run at (0,37) width 433: "combination does not occur, then the user agent has failed this test. " - text run at (432,37) width 289: "Remember that in order to ensure a complete" - text run at (0,55) width 385: "test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,163) size 747x100 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 76x64 - text run at (0,0) width 76: "\"W" - LayoutTextFragment {#text} at (75,36) size 737x64 - text run at (75,36) width 325: "e should check for quotation support,\" it was said. " - text run at (399,36) width 338: "The first two characters in this paragraph-- a double-" - text run at (0,64) width 628: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (627,64) width 102: "Note that this is" - text run at (0,82) width 314: "not required under CSS1, but it is recommended." -layer at (8,115) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstline-expected.png deleted file mode 100644 index 34a42c0..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstline-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstline-expected.txt deleted file mode 100644 index 16c84f1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/firstline-expected.txt +++ /dev/null
@@ -1,84 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 655 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x655 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x655 - LayoutBlockFlow {BODY} at (8,8) size 769x639 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x60 - LayoutText {#text} at (0,0) size 352x60 - text run at (0,0) width 219: "P:first-line {color: green;}" - text run at (218,0) width 1: " " - text run at (0,15) width 266: ".two:first-line {font-size: 200%;}" - text run at (265,15) width 1: " " - text run at (0,30) width 352: ".three:first-line {font-variant: small-caps;}" - text run at (351,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 769x54 - LayoutText {#text} at (0,0) size 757x54 - text run at (0,0) width 431: "The first line of this paragraph, and only that one, should be green. " - text run at (430,0) width 327: "If this precise combination does not occur, then the" - text run at (0,18) width 193: "user agent has failed this test. " - text run at (192,18) width 550: "Remember that in order to ensure a complete test, the paragraph must be displayed on" - text run at (0,36) width 124: "more than one line." - LayoutBlockFlow {P} at (0,195) size 769x73 - LayoutText {#text} at (0,0) size 766x73 - text run at (0,0) width 766: "The first line of this paragraph, and only that one, should be" - text run at (0,37) width 221: "a larger font size as well as green. " - text run at (220,37) width 520: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,55) width 678: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,284) size 769x72 - LayoutText {#text} at (0,0) size 750x54 - text run at (0,0) width 599: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (598,0) width 152: "Thus, if the first line is" - text run at (0,18) width 717: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" - text run at (0,36) width 235: "(although the problem might be that " - LayoutInline {CODE} at (0,0) size 79x15 - LayoutText {#text} at (234,38) size 79x15 - text run at (234,38) width 79: "small-caps" - LayoutText {#text} at (312,36) size 754x36 - text run at (312,36) width 230: " is not supported by your browser). " - text run at (541,36) width 213: "This is extra text included for the" - text run at (0,54) width 480: "purposes of making the paragraph long enough to have more than one line." - LayoutTable {TABLE} at (0,372) size 769x267 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x265 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x239 - LayoutTableCell {TD} at (0,132) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x239 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x54 - LayoutText {#text} at (0,0) size 746x54 - text run at (0,0) width 431: "The first line of this paragraph, and only that one, should be green. " - text run at (430,0) width 304: "If this precise combination does not occur, then" - text run at (0,18) width 216: "the user agent has failed this test. " - text run at (215,18) width 531: "Remember that in order to ensure a complete test, the paragraph must be displayed" - text run at (0,36) width 144: "on more than one line." - LayoutBlockFlow {P} at (4,74) size 747x73 - LayoutText {#text} at (0,0) size 729x73 - text run at (0,0) width 727: "The first line of this paragraph, and only that one, should" - text run at (0,37) width 240: "be a larger font size as well as green. " - text run at (239,37) width 490: "If this precise combination does not occur, then the user agent has failed this" - text run at (0,55) width 31: "test. " - text run at (30,55) width 678: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,163) size 747x72 - LayoutText {#text} at (0,0) size 737x54 - text run at (0,0) width 599: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (598,0) width 139: "Thus, if the first line" - text run at (0,18) width 731: "is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" - text run at (0,36) width 235: "(although the problem might be that " - LayoutInline {CODE} at (0,0) size 79x15 - LayoutText {#text} at (234,38) size 79x15 - text run at (234,38) width 79: "small-caps" - LayoutText {#text} at (312,36) size 730x36 - text run at (312,36) width 230: " is not supported by your browser). " - text run at (541,36) width 189: "This is extra text included for" - text run at (0,54) width 503: "the purposes of making the paragraph long enough to have more than one line." -layer at (8,115) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png deleted file mode 100644 index 0d43711e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt deleted file mode 100644 index 6e070d9..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt +++ /dev/null
@@ -1,106 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1030 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1030 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1030 - LayoutBlockFlow {BODY} at (8,8) size 769x1014 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x18 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x18 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (9,0) size 354x18 - text run at (9,0) width 354: "he style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x105 - LayoutText {#text} at (0,0) size 359x105 - text run at (0,0) width 219: "P:first-line {color: green;}" - text run at (218,0) width 1: " " - text run at (0,15) width 242: "P:first-letter {color: maroon;}" - text run at (241,15) width 1: " " - text run at (0,30) width 266: ".two:first-line {font-size: 200%;}" - text run at (265,30) width 1: " " - text run at (0,45) width 281: ".two:first-letter {font-size: 350%;}" - text run at (280,45) width 1: " " - text run at (0,60) width 305: "P.three:first-letter {font-size: 350%;}" - text run at (304,60) width 1: " " - text run at (0,75) width 359: "P.three:first-line {font-variant: small-caps;}" - text run at (358,75) width 1: " " - text run at (0,90) width 0: " " - LayoutBlockFlow {P} at (0,170) size 769x54 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x18 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x18 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (9,0) size 743x54 - text run at (9,0) width 734: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be" - text run at (0,18) width 44: "green. " - text run at (43,18) width 524: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (566,18) width 170: "Remember that in order to" - text run at (0,36) width 505: "ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,240) size 769x183 - LayoutInline {<pseudo:first-letter>} at (0,0) size 69x129 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 69x129 - text run at (0,0) width 69: "T" - LayoutTextFragment {#text} at (68,72) size 766x111 - text run at (68,72) width 633: "he first letter of this paragraph, and only that one," - text run at (0,129) width 753: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line" - text run at (0,147) width 304: "should be 200% bigger than normal and green. " - text run at (303,147) width 463: "If this precise combination does not occur, then the user agent has failed" - text run at (0,165) width 58: "this test. " - text run at (57,165) width 678: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,439) size 769x118 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 76x64 - text run at (0,0) width 76: "\"W" - LayoutTextFragment {#text} at (75,36) size 761x82 - text run at (75,36) width 331: "e should check for quotation support,\" it was said. " - text run at (405,36) width 356: "The first two characters in this paragraph-- a double-" - text run at (0,64) width 696: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (695,64) width 60: "Note that" - text run at (0,82) width 707: "the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is" - text run at (0,100) width 99: "recommended. " - text run at (98,100) width 462: "In addition, the entire first line should be in a small-caps font and green." - LayoutTable {TABLE} at (0,573) size 769x441 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x439 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x413 - LayoutTableCell {TD} at (0,219) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x413 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x54 - LayoutInline {<pseudo:first-letter>} at (0,0) size 10x18 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 10x18 - text run at (0,0) width 10: "T" - LayoutTextFragment {#text} at (9,0) size 743x54 - text run at (9,0) width 734: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be" - text run at (0,18) width 44: "green. " - text run at (43,18) width 524: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (566,18) width 170: "Remember that in order to" - text run at (0,36) width 505: "ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,74) size 747x201 - LayoutInline {<pseudo:first-letter>} at (0,0) size 69x129 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 69x129 - text run at (0,0) width 69: "T" - LayoutTextFragment {#text} at (68,72) size 742x129 - text run at (68,72) width 633: "he first letter of this paragraph, and only that one," - text run at (0,129) width 725: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first" - text run at (0,147) width 332: "line should be 200% bigger than normal and green. " - text run at (331,147) width 397: "If this precise combination does not occur, then the user agent" - text run at (0,165) width 124: "has failed this test. " - text run at (123,165) width 619: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than" - text run at (0,183) width 56: "one line." - LayoutBlockFlow {P} at (4,291) size 747x118 - LayoutInline {<pseudo:first-letter>} at (0,0) size 76x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 76x64 - text run at (0,0) width 76: "\"W" - LayoutTextFragment {#text} at (75,36) size 743x82 - text run at (75,36) width 331: "e should check for quotation support,\" it was said. " - text run at (405,36) width 302: "The first two characters in this paragraph-- a" - text run at (0,64) width 741: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red)." - text run at (0,82) width 743: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but" - text run at (0,100) width 127: "it is recommended. " - text run at (126,100) width 461: "In addition, the entire first line should be in a small-caps font and green." -layer at (8,160) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,152) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png deleted file mode 100644 index fa804307..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt deleted file mode 100644 index 304a115..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 385x18 - text run at (0,0) width 385: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 258x60 - text run at (0,0) width 258: "P:first-line {font-weight: bold;}" - text run at (257,0) width 1: " " - text run at (0,15) width 250: "P.two:first-line {color: green;}" - text run at (249,15) width 1: " " - text run at (0,30) width 250: "P:first-line.three {color: red;}" - text run at (249,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x36 - LayoutText {#text} at (0,0) size 730x36 - text run at (0,0) width 344: "The first line of this sentence should be boldfaced. " - text run at (343,0) width 387: "This test is included simply to establish a baseline for the" - text run at (0,18) width 655: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - LayoutBlockFlow {P} at (0,177) size 784x36 - LayoutText {#text} at (0,0) size 765x36 - text run at (0,0) width 562: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (561,0) width 204: "If this is not the case, then the" - text run at (0,18) width 578: "user agent may have failed to properly parse the selector, or it may simply not support the " - LayoutInline {TT} at (0,0) size 87x15 - LayoutText {#text} at (577,20) size 87x15 - text run at (577,20) width 87: ":first-line" - LayoutText {#text} at (663,18) size 110x18 - text run at (663,18) width 110: " pseudo-element." - LayoutBlockFlow {P} at (0,229) size 784x72 - LayoutText {#text} at (0,0) size 783x72 - text run at (0,0) width 344: "The first line of this sentence should be boldfaced. " - text run at (343,0) width 422: "If it is red, then the user agent has violated the specification in" - text run at (0,18) width 440: "allowing pseudo-elements at a point other than the end of a selector. " - text run at (439,18) width 344: "If neither is the case, then the user agent has correctly" - text run at (0,36) width 766: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have" - text run at (0,54) width 91: "failed the test." - LayoutTable {TABLE} at (0,317) size 784x230 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x228 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x202 - LayoutTableCell {TD} at (0,114) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x202 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x36 - LayoutText {#text} at (0,0) size 730x36 - text run at (0,0) width 344: "The first line of this sentence should be boldfaced. " - text run at (343,0) width 387: "This test is included simply to establish a baseline for the" - text run at (0,18) width 655: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - LayoutBlockFlow {P} at (4,56) size 762x54 - LayoutText {#text} at (0,0) size 739x36 - text run at (0,0) width 562: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (561,0) width 178: "If this is not the case, then" - text run at (0,18) width 602: "the user agent may have failed to properly parse the selector, or it may simply not support the " - LayoutInline {TT} at (0,0) size 87x15 - LayoutText {#text} at (601,20) size 87x15 - text run at (601,20) width 87: ":first-line" - LayoutText {#text} at (687,18) size 742x36 - text run at (687,18) width 55: " pseudo-" - text run at (0,36) width 55: "element." - LayoutBlockFlow {P} at (4,126) size 762x72 - LayoutText {#text} at (0,0) size 748x72 - text run at (0,0) width 344: "The first line of this sentence should be boldfaced. " - text run at (343,0) width 405: "If it is red, then the user agent has violated the specification" - text run at (0,18) width 456: "in allowing pseudo-elements at a point other than the end of a selector. " - text run at (455,18) width 284: "If neither is the case, then the user agent has" - text run at (0,36) width 703: "correctly ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be" - text run at (0,54) width 215: "considered to have failed the test." -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png deleted file mode 100644 index a1516f3..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt deleted file mode 100644 index 5c45e6b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt +++ /dev/null
@@ -1,140 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1378 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1378 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1378 - LayoutBlockFlow {BODY} at (8,8) size 769x1362 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x165 - LayoutText {#text} at (0,0) size 258x165 - text run at (0,0) width 227: ".one {letter-spacing: 0.3in;}" - text run at (226,0) width 1: " " - text run at (0,15) width 227: ".two {letter-spacing: 0.5cm;}" - text run at (226,15) width 1: " " - text run at (0,30) width 227: ".three {letter-spacing: 5mm;}" - text run at (226,30) width 1: " " - text run at (0,45) width 219: ".four {letter-spacing: 3pt;}" - text run at (218,45) width 1: " " - text run at (0,60) width 242: ".five {letter-spacing: 0.25pc;}" - text run at (241,60) width 1: " " - text run at (0,75) width 211: ".six {letter-spacing: 1em;}" - text run at (210,75) width 1: " " - text run at (0,90) width 227: ".seven {letter-spacing: 1ex;}" - text run at (226,90) width 1: " " - text run at (0,105) width 227: ".eight {letter-spacing: 5px;}" - text run at (226,105) width 1: " " - text run at (0,120) width 242: ".nine {letter-spacing: normal;}" - text run at (241,120) width 1: " " - text run at (0,135) width 219: ".ten {letter-spacing: 300%;}" - text run at (218,135) width 1: " " - text run at (0,150) width 258: ".eleven {letter-spacing: -0.1em;}" - text run at (257,150) width 1: " " - LayoutBlockFlow {P} at (0,230) size 769x72 - LayoutText {#text} at (0,0) size 712x72 - text run at (0,0) width 692: "This letters in this" - text run at (0,18) width 712: "sentence should have" - text run at (0,36) width 676: "extra space between" - text run at (0,54) width 180: "them." - LayoutBlockFlow {P} at (0,318) size 769x54 - LayoutText {#text} at (0,0) size 723x54 - text run at (0,0) width 723: "This letters in this sentence" - text run at (0,18) width 588: "should have extra space" - text run at (0,36) width 339: "between them." - LayoutBlockFlow {P} at (0,388) size 769x54 - LayoutText {#text} at (0,0) size 723x54 - text run at (0,0) width 723: "This letters in this sentence" - text run at (0,18) width 588: "should have extra space" - text run at (0,36) width 339: "between them." - LayoutBlockFlow {P} at (0,458) size 769x18 - LayoutText {#text} at (0,0) size 696x18 - text run at (0,0) width 696: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,492) size 769x18 - LayoutText {#text} at (0,0) size 696x18 - text run at (0,0) width 696: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,526) size 769x54 - LayoutText {#text} at (0,0) size 706x54 - text run at (0,0) width 639: "This letters in this sentence" - text run at (0,18) width 706: "should have extra space between" - text run at (0,36) width 116: "them." - LayoutBlockFlow {P} at (0,596) size 769x36 - LayoutText {#text} at (0,0) size 712x36 - text run at (0,0) width 712: "This letters in this sentence should have extra space" - text run at (0,18) width 187: "between them." - LayoutBlockFlow {P} at (0,648) size 769x36 - LayoutText {#text} at (0,0) size 763x36 - text run at (0,0) width 763: "This letters in this sentence should have extra space between them," - text run at (0,18) width 440: "but the last few words in the sentence " - LayoutInline {SPAN} at (0,0) size 184x18 - LayoutText {#text} at (439,18) size 184x18 - text run at (439,18) width 184: "should show normal spacing" - LayoutText {#text} at (622,18) size 10x18 - text run at (622,18) width 10: "." - LayoutBlockFlow {P} at (0,700) size 769x36 - LayoutText {#text} at (0,0) size 746x36 - text run at (0,0) width 746: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" - text run at (0,18) width 58: "property." - LayoutBlockFlow {P} at (0,752) size 769x18 - LayoutText {#text} at (0,0) size 580x18 - text run at (0,0) width 580: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." - LayoutTable {TABLE} at (0,786) size 769x576 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x574 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x548 - LayoutTableCell {TD} at (0,287) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x548 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x72 - LayoutText {#text} at (0,0) size 712x72 - text run at (0,0) width 692: "This letters in this" - text run at (0,18) width 712: "sentence should have" - text run at (0,36) width 676: "extra space between" - text run at (0,54) width 180: "them." - LayoutBlockFlow {P} at (4,92) size 747x54 - LayoutText {#text} at (0,0) size 723x54 - text run at (0,0) width 723: "This letters in this sentence" - text run at (0,18) width 588: "should have extra space" - text run at (0,36) width 339: "between them." - LayoutBlockFlow {P} at (4,162) size 747x54 - LayoutText {#text} at (0,0) size 723x54 - text run at (0,0) width 723: "This letters in this sentence" - text run at (0,18) width 588: "should have extra space" - text run at (0,36) width 339: "between them." - LayoutBlockFlow {P} at (4,232) size 747x18 - LayoutText {#text} at (0,0) size 696x18 - text run at (0,0) width 696: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,266) size 747x18 - LayoutText {#text} at (0,0) size 696x18 - text run at (0,0) width 696: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,300) size 747x54 - LayoutText {#text} at (0,0) size 706x54 - text run at (0,0) width 639: "This letters in this sentence" - text run at (0,18) width 706: "should have extra space between" - text run at (0,36) width 116: "them." - LayoutBlockFlow {P} at (4,370) size 747x36 - LayoutText {#text} at (0,0) size 712x36 - text run at (0,0) width 712: "This letters in this sentence should have extra space" - text run at (0,18) width 187: "between them." - LayoutBlockFlow {P} at (4,422) size 747x36 - LayoutText {#text} at (0,0) size 693x36 - text run at (0,0) width 693: "This letters in this sentence should have extra space between" - text run at (0,18) width 510: "them, but the last few words in the sentence " - LayoutInline {SPAN} at (0,0) size 183x18 - LayoutText {#text} at (509,18) size 183x18 - text run at (509,18) width 183: "should show normal spacing" - LayoutText {#text} at (692,18) size 9x18 - text run at (692,18) width 9: "." - LayoutBlockFlow {P} at (4,474) size 747x36 - LayoutText {#text} at (0,0) size 746x36 - text run at (0,0) width 746: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" - text run at (0,18) width 58: "property." - LayoutBlockFlow {P} at (4,526) size 747x18 - LayoutText {#text} at (0,0) size 580x18 - text run at (0,0) width 580: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." -layer at (8,220) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,212) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/line_height-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/line_height-expected.png deleted file mode 100644 index fefc70f1..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/line_height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/line_height-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/line_height-expected.txt deleted file mode 100644 index c935cad9..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/line_height-expected.txt +++ /dev/null
@@ -1,182 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2619 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2619 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2619 - LayoutBlockFlow {BODY} at (8,8) size 769x2603 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x210 - LayoutText {#text} at (0,0) size 391x210 - text run at (0,0) width 336: ".one {line-height: 0.5in; font-size: 12px;}" - text run at (335,0) width 1: " " - text run at (0,15) width 320: ".two {line-height: 2cm; font-size: 12px;}" - text run at (319,15) width 1: " " - text run at (0,30) width 344: ".three {line-height: 20mm; font-size: 12px;}" - text run at (343,30) width 1: " " - text run at (0,45) width 336: ".four {line-height: 24pt; font-size: 12px;}" - text run at (335,45) width 1: " " - text run at (0,60) width 328: ".five {line-height: 2pc; font-size: 12px;}" - text run at (327,60) width 1: " " - text run at (0,75) width 320: ".six {line-height: 2em; font-size: 12px;}" - text run at (319,75) width 1: " " - text run at (0,90) width 336: ".seven {line-height: 3ex; font-size: 12px;}" - text run at (335,90) width 1: " " - text run at (0,105) width 344: ".eight {line-height: 200%; font-size: 12px;}" - text run at (343,105) width 1: " " - text run at (0,120) width 313: ".nine {line-height: 2; font-size: 12px;}" - text run at (312,120) width 1: " " - text run at (0,135) width 328: ".ten {line-height: 50px; font-size: 12px;}" - text run at (327,135) width 1: " " - text run at (0,150) width 352: ".eleven {line-height: -1em; font-size: 12px;}" - text run at (351,150) width 1: " " - text run at (0,165) width 391: "TABLE .ten {line-height: normal; font-size: 12px;}" - text run at (390,165) width 1: " " - text run at (0,180) width 242: "DIV {background-color: silver;}" - text run at (241,180) width 1: " " - text run at (0,195) width 297: "SPAN.color {background-color: silver;}" - text run at (296,195) width 1: " " - LayoutBlockFlow {P} at (0,271) size 769x48 - LayoutText {#text} at (0,17) size 519x14 - text run at (0,17) width 519: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,331) size 769x75 - LayoutText {#text} at (0,30) size 538x14 - text run at (0,30) width 538: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,418) size 769x75 - LayoutText {#text} at (0,30) size 552x14 - text run at (0,30) width 552: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,505) size 769x32 - LayoutText {#text} at (0,9) size 551x14 - text run at (0,9) width 551: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,549) size 769x32 - LayoutText {#text} at (0,9) size 508x14 - text run at (0,9) width 508: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,593) size 769x24 - LayoutText {#text} at (0,5) size 498x14 - text run at (0,5) width 498: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,629) size 769x16 - LayoutText {#text} at (0,1) size 500x14 - text run at (0,1) width 500: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,657) size 769x24 - LayoutText {#text} at (0,5) size 550x14 - text run at (0,5) width 550: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (0,693) size 769x168 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 769x24 - LayoutText {#text} at (0,5) size 604x14 - text run at (0,5) width 604: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 769x72 - LayoutText {#text} at (0,-2) size 754x76 - text run at (0,-2) width 742: "This sentence should have a line-height of twice the DIV's font size, or 28px;" - text run at (0,22) width 754: "this should not cause extra spacing between the lines, since the line-height and" - text run at (0,46) width 360: "font-size should have the same value." - LayoutBlockFlow (anonymous) at (0,144) size 769x24 - LayoutText {#text} at (0,5) size 618x14 - text run at (0,5) width 618: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,873) size 769x24 - LayoutText {#text} at (0,5) size 550x14 - text run at (0,5) width 550: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (0,909) size 769x240 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 769x24 - LayoutText {#text} at (0,5) size 604x14 - text run at (0,5) width 604: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 769x144 - LayoutText {#text} at (0,10) size 742x124 - text run at (0,10) width 742: "This sentence should have a line-height of twice the font size, which is 200%" - text run at (0,58) width 734: "normal thanks to an inline style; this should cause extra spacing between the" - text run at (0,106) width 647: "lines, as the font-size will be 28px and the line-height will be 56px." - LayoutBlockFlow (anonymous) at (0,216) size 769x24 - LayoutText {#text} at (0,5) size 618x14 - text run at (0,5) width 618: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,1161) size 769x100 - LayoutText {#text} at (0,18) size 760x64 - text run at (0,18) width 604: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (603,18) width 157: "In the second section (within the" - text run at (0,68) width 186: "table) its line-height should be normal." - LayoutBlockFlow {P} at (0,1273) size 769x14 - LayoutText {#text} at (0,0) size 517x14 - text run at (0,0) width 517: "This sentence should have a normal line-height, because negative values are not permitted for this property." - LayoutBlockFlow {P} at (0,1299) size 769x150 - LayoutInline {SPAN} at (0,0) size 759x89 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,30) size 759x89 - text run at (0,30) width 759: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but" - text run at (0,105) width 693: "no padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1461) size 769x1142 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1140 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x1114 - LayoutTableCell {TD} at (0,570) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x1114 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x48 - LayoutText {#text} at (0,17) size 519x14 - text run at (0,17) width 519: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,64) size 747x75 - LayoutText {#text} at (0,30) size 538x14 - text run at (0,30) width 538: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,151) size 747x75 - LayoutText {#text} at (0,30) size 552x14 - text run at (0,30) width 552: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,238) size 747x32 - LayoutText {#text} at (0,9) size 551x14 - text run at (0,9) width 551: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,282) size 747x32 - LayoutText {#text} at (0,9) size 508x14 - text run at (0,9) width 508: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,326) size 747x24 - LayoutText {#text} at (0,5) size 498x14 - text run at (0,5) width 498: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,362) size 747x16 - LayoutText {#text} at (0,1) size 500x14 - text run at (0,1) width 500: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,390) size 747x24 - LayoutText {#text} at (0,5) size 550x14 - text run at (0,5) width 550: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (4,426) size 747x168 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 747x24 - LayoutText {#text} at (0,5) size 604x14 - text run at (0,5) width 604: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 747x72 - LayoutText {#text} at (0,-2) size 742x76 - text run at (0,-2) width 742: "This sentence should have a line-height of twice the DIV's font size, or 28px;" - text run at (0,22) width 714: "this should not cause extra spacing between the lines, since the line-height" - text run at (0,46) width 401: "and font-size should have the same value." - LayoutBlockFlow (anonymous) at (0,144) size 747x24 - LayoutText {#text} at (0,5) size 618x14 - text run at (0,5) width 618: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,606) size 747x24 - LayoutText {#text} at (0,5) size 550x14 - text run at (0,5) width 550: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (4,642) size 747x240 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 747x24 - LayoutText {#text} at (0,5) size 604x14 - text run at (0,5) width 604: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 747x144 - LayoutText {#text} at (0,10) size 742x124 - text run at (0,10) width 742: "This sentence should have a line-height of twice the font size, which is 200%" - text run at (0,58) width 734: "normal thanks to an inline style; this should cause extra spacing between the" - text run at (0,106) width 647: "lines, as the font-size will be 28px and the line-height will be 56px." - LayoutBlockFlow (anonymous) at (0,216) size 747x24 - LayoutText {#text} at (0,5) size 618x14 - text run at (0,5) width 618: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,894) size 747x28 - LayoutText {#text} at (0,0) size 743x28 - text run at (0,0) width 604: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (603,0) width 140: "In the second section (within" - text run at (0,14) width 204: "the table) its line-height should be normal." - LayoutBlockFlow {P} at (4,934) size 747x14 - LayoutText {#text} at (0,0) size 517x14 - text run at (0,0) width 517: "This sentence should have a normal line-height, because negative values are not permitted for this property." - LayoutBlockFlow {P} at (4,960) size 747x150 - LayoutInline {SPAN} at (0,0) size 741x89 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,30) size 741x89 - text run at (0,30) width 741: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver," - text run at (0,105) width 712: "but no padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,265) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,257) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_align-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_align-expected.png deleted file mode 100644 index 55da9bf..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_align-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_align-expected.txt deleted file mode 100644 index a834fc8f..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_align-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x75 - LayoutText {#text} at (0,0) size 219x75 - text run at (0,0) width 188: ".one {text-align: left;}" - text run at (187,0) width 1: " " - text run at (0,15) width 196: ".two {text-align: right;}" - text run at (195,15) width 1: " " - text run at (0,30) width 219: ".three {text-align: center;}" - text run at (218,30) width 1: " " - text run at (0,45) width 219: ".four {text-align: justify;}" - text run at (218,45) width 1: " " - text run at (0,60) width 0: " " - LayoutBlockFlow {P} at (0,140) size 784x18 - LayoutText {#text} at (0,0) size 240x18 - text run at (0,0) width 240: "This sentence should be left-justified." - LayoutBlockFlow {P} at (0,174) size 784x18 - LayoutText {#text} at (535,0) size 249x18 - text run at (535,0) width 249: "This sentence should be right-justified." - LayoutBlockFlow {P} at (0,208) size 784x18 - LayoutText {#text} at (284,0) size 216x18 - text run at (284,0) width 216: "This sentence should be centered." - LayoutBlockFlow {P} at (0,242) size 784x54 - LayoutText {#text} at (0,0) size 784x54 - text run at (0,0) width 784: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" - text run at (0,18) width 784: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western" - text run at (0,36) width 68: "languages." - LayoutTable {TABLE} at (0,312) size 784x192 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x190 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x164 - LayoutTableCell {TD} at (0,95) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x18 - LayoutText {#text} at (0,0) size 240x18 - text run at (0,0) width 240: "This sentence should be left-justified." - LayoutBlockFlow {P} at (4,38) size 762x18 - LayoutText {#text} at (513,0) size 249x18 - text run at (513,0) width 249: "This sentence should be right-justified." - LayoutBlockFlow {P} at (4,72) size 762x18 - LayoutText {#text} at (273,0) size 216x18 - text run at (273,0) width 216: "This sentence should be centered." - LayoutBlockFlow {P} at (4,106) size 762x54 - LayoutText {#text} at (0,0) size 762x54 - text run at (0,0) width 762: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no" - text run at (0,18) width 762: "matter how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in" - text run at (0,36) width 124: "Western languages." -layer at (8,130) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,122) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png deleted file mode 100644 index fe82779..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt deleted file mode 100644 index 2aa3124e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt +++ /dev/null
@@ -1,200 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1151 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1151 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1151 - LayoutBlockFlow {BODY} at (8,8) size 769x1135 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x120 - LayoutText {#text} at (0,0) size 453x120 - text run at (0,0) width 266: ".one {text-decoration: underline;}" - text run at (265,0) width 1: " " - text run at (0,15) width 258: ".two {text-decoration: overline;}" - text run at (257,15) width 1: " " - text run at (0,30) width 305: ".three {text-decoration: line-through;}" - text run at (304,30) width 1: " " - text run at (0,45) width 242: ".four {text-decoration: blink;}" - text run at (241,45) width 1: " " - text run at (0,60) width 242: "B.five {text-decoration: none;}" - text run at (241,60) width 1: " " - text run at (0,75) width 336: ".six {text-decoration: underline overline;}" - text run at (335,75) width 1: " " - text run at (0,90) width 453: ".seven {text-decoration: underline overline line-through;}" - text run at (452,90) width 1: " " - text run at (0,105) width 0: " " - LayoutBlockFlow {P} at (0,185) size 769x18 - LayoutText {#text} at (0,0) size 230x18 - text run at (0,0) width 230: "This sentence should be underlined." - LayoutBlockFlow {P} at (0,219) size 769x18 - LayoutText {#text} at (0,0) size 222x18 - text run at (0,0) width 222: "This sentence should be overlined." - LayoutBlockFlow {P} at (0,253) size 769x18 - LayoutText {#text} at (0,0) size 344x18 - text run at (0,0) width 344: "This sentence should have stricken text (linethrough)." - LayoutBlockFlow {P} at (0,287) size 769x18 - LayoutText {#text} at (0,0) size 602x18 - text run at (0,0) width 215: "This element should be blinking. " - text run at (214,0) width 388: "(It is not required, however, that UAs support this behavior.)" - LayoutBlockFlow {P} at (0,321) size 769x36 - LayoutText {#text} at (0,0) size 520x18 - text run at (0,0) width 298: "The text in this element should be underlined. " - text run at (297,0) width 223: "The boldfaced text in this element " - LayoutInline {B} at (0,0) size 176x18 - LayoutText {#text} at (519,0) size 176x18 - text run at (519,0) width 176: "should also be underlined" - LayoutText {#text} at (694,0) size 746x36 - text run at (694,0) width 9: ". " - text run at (702,0) width 44: "This is" - text run at (0,18) width 731: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - LayoutBlockFlow {P} at (0,373) size 769x18 - LayoutText {#text} at (0,0) size 322x18 - text run at (0,0) width 322: "This sentence should be underlined and overlined." - LayoutBlockFlow {P} at (0,407) size 769x18 - LayoutText {#text} at (0,0) size 384x18 - text run at (0,0) width 384: "This sentence should be underlined, overlined, and stricken." - LayoutBlockFlow {P} at (0,441) size 769x0 - LayoutBlockFlow {P} at (0,441) size 769x36 - LayoutText {#text} at (0,0) size 741x36 - text run at (0,0) width 741: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with" - text run at (0,18) width 99: "class of seven)." - LayoutBlockFlow {P} at (0,493) size 769x55 - LayoutText {#text} at (0,0) size 647x18 - text run at (0,0) width 647: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - LayoutInline {EM} at (0,0) size 21x18 - LayoutText {#text} at (646,0) size 21x18 - text run at (646,0) width 21: "not" - LayoutText {#text} at (666,0) size 93x18 - text run at (666,0) width 93: " be overlined: " - LayoutImage {IMG} at (0,18) size 15x15 - LayoutText {#text} at (15,19) size 766x36 - text run at (15,19) width 8: ". " - text run at (23,19) width 743: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child" - text run at (0,37) width 61: "elements." - LayoutBlockFlow {P} at (0,564) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 107x18 - text run at (0,0) width 107: "The underlining " - LayoutInline {SPAN} at (0,0) size 100x18 [color=#0000FF] - LayoutText {#text} at (106,0) size 100x18 - text run at (106,0) width 100: "in this sentence" - LayoutText {#text} at (205,0) size 238x18 - text run at (205,0) width 238: " should be green, no matter what the " - LayoutInline {SPAN} at (0,0) size 112x18 [color=#000000] - LayoutText {#text} at (442,0) size 112x18 - text run at (442,0) width 112: "text color may be" - LayoutText {#text} at (553,0) size 5x18 - text run at (553,0) width 5: "." - LayoutBlockFlow {P} at (0,598) size 769x36 - LayoutText {#text} at (0,0) size 113x18 - text run at (0,0) width 113: "The colors of the " - LayoutInline {SPAN} at (0,0) size 75x18 [color=#800080] - LayoutText {#text} at (112,0) size 75x18 - text run at (112,0) width 75: "underlining" - LayoutText {#text} at (186,0) size 22x18 - text run at (186,0) width 22: " in " - LayoutInline {SPAN} at (0,0) size 83x18 [color=#0000FF] - LayoutText {#text} at (207,0) size 83x18 - text run at (207,0) width 83: "this sentence" - LayoutText {#text} at (289,0) size 70x18 - text run at (289,0) width 70: " should be " - LayoutInline {SPAN} at (0,0) size 215x18 [color=#808080] - LayoutText {#text} at (359,0) size 215x18 - text run at (359,0) width 215: "the same as that of the parent text" - LayoutText {#text} at (573,0) size 755x36 - text run at (573,0) width 182: " (that is, the first word in the" - text run at (0,18) width 216: "sentence, which should be black)." - LayoutTable {TABLE} at (0,650) size 769x485 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x483 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x457 - LayoutTableCell {TD} at (0,241) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x457 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 230x18 - text run at (0,0) width 230: "This sentence should be underlined." - LayoutBlockFlow {P} at (4,38) size 747x18 - LayoutText {#text} at (0,0) size 222x18 - text run at (0,0) width 222: "This sentence should be overlined." - LayoutBlockFlow {P} at (4,72) size 747x18 - LayoutText {#text} at (0,0) size 344x18 - text run at (0,0) width 344: "This sentence should have stricken text (linethrough)." - LayoutBlockFlow {P} at (4,106) size 747x18 - LayoutText {#text} at (0,0) size 602x18 - text run at (0,0) width 215: "This element should be blinking. " - text run at (214,0) width 388: "(It is not required, however, that UAs support this behavior.)" - LayoutBlockFlow {P} at (4,140) size 747x36 - LayoutText {#text} at (0,0) size 520x18 - text run at (0,0) width 298: "The text in this element should be underlined. " - text run at (297,0) width 223: "The boldfaced text in this element " - LayoutInline {B} at (0,0) size 176x18 - LayoutText {#text} at (519,0) size 176x18 - text run at (519,0) width 176: "should also be underlined" - LayoutText {#text} at (694,0) size 746x36 - text run at (694,0) width 9: ". " - text run at (702,0) width 44: "This is" - text run at (0,18) width 731: "because the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - LayoutBlockFlow {P} at (4,192) size 747x18 - LayoutText {#text} at (0,0) size 322x18 - text run at (0,0) width 322: "This sentence should be underlined and overlined." - LayoutBlockFlow {P} at (4,226) size 747x18 - LayoutText {#text} at (0,0) size 384x18 - text run at (0,0) width 384: "This sentence should be underlined, overlined, and stricken." - LayoutBlockFlow {P} at (4,260) size 747x0 - LayoutBlockFlow {P} at (4,260) size 747x36 - LayoutText {#text} at (0,0) size 741x36 - text run at (0,0) width 741: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with" - text run at (0,18) width 99: "class of seven)." - LayoutBlockFlow {P} at (4,312) size 747x55 - LayoutText {#text} at (0,0) size 647x18 - text run at (0,0) width 647: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - LayoutInline {EM} at (0,0) size 21x18 - LayoutText {#text} at (646,0) size 21x18 - text run at (646,0) width 21: "not" - LayoutText {#text} at (666,0) size 686x37 - text run at (666,0) width 20: " be" - text run at (0,19) width 69: "overlined: " - LayoutImage {IMG} at (68.86,18) size 15x15 - LayoutText {#text} at (83,19) size 686x36 - text run at (83,19) width 9: ". " - text run at (91,19) width 595: "The underline of the parent element should hold true beneath the image, however, since text-" - text run at (0,37) width 214: "decoration 'spans' child elements." - LayoutBlockFlow {P} at (4,383) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 107x18 - text run at (0,0) width 107: "The underlining " - LayoutInline {SPAN} at (0,0) size 100x18 [color=#0000FF] - LayoutText {#text} at (106,0) size 100x18 - text run at (106,0) width 100: "in this sentence" - LayoutText {#text} at (205,0) size 238x18 - text run at (205,0) width 238: " should be green, no matter what the " - LayoutInline {SPAN} at (0,0) size 112x18 [color=#000000] - LayoutText {#text} at (442,0) size 112x18 - text run at (442,0) width 112: "text color may be" - LayoutText {#text} at (553,0) size 5x18 - text run at (553,0) width 5: "." - LayoutBlockFlow {P} at (4,417) size 747x36 - LayoutText {#text} at (0,0) size 113x18 - text run at (0,0) width 113: "The colors of the " - LayoutInline {SPAN} at (0,0) size 75x18 [color=#800080] - LayoutText {#text} at (112,0) size 75x18 - text run at (112,0) width 75: "underlining" - LayoutText {#text} at (186,0) size 22x18 - text run at (186,0) width 22: " in " - LayoutInline {SPAN} at (0,0) size 83x18 [color=#0000FF] - LayoutText {#text} at (207,0) size 83x18 - text run at (207,0) width 83: "this sentence" - LayoutText {#text} at (289,0) size 70x18 - text run at (289,0) width 70: " should be " - LayoutInline {SPAN} at (0,0) size 215x18 [color=#808080] - LayoutText {#text} at (359,0) size 215x18 - text run at (359,0) width 215: "the same as that of the parent text" - LayoutText {#text} at (573,0) size 732x36 - text run at (573,0) width 159: " (that is, the first word in" - text run at (0,18) width 240: "the sentence, which should be black)." -layer at (8,175) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,167) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_indent-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_indent-expected.png deleted file mode 100644 index 1eb345f..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_indent-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt deleted file mode 100644 index 10b7a9e3..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt +++ /dev/null
@@ -1,137 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1246 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1246 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1246 - LayoutBlockFlow {BODY} at (8,8) size 769x1230 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x165 - LayoutText {#text} at (0,0) size 375x165 - text run at (0,0) width 344: ".one {text-indent: 0.5in; background: aqua;}" - text run at (343,0) width 1: " " - text run at (0,15) width 328: ".two {text-indent: 2cm; background: aqua;}" - text run at (327,15) width 1: " " - text run at (0,30) width 352: ".three {text-indent: 20mm; background: aqua;}" - text run at (351,30) width 1: " " - text run at (0,45) width 344: ".four {text-indent: 24pt; background: aqua;}" - text run at (343,45) width 1: " " - text run at (0,60) width 336: ".five {text-indent: 2pc; background: aqua;}" - text run at (335,60) width 1: " " - text run at (0,75) width 328: ".six {text-indent: 2em; background: aqua;}" - text run at (327,75) width 1: " " - text run at (0,90) width 344: ".seven {text-indent: 2ex; background: aqua;}" - text run at (343,90) width 1: " " - text run at (0,105) width 344: ".eight {text-indent: 50%; background: aqua;}" - text run at (343,105) width 1: " " - text run at (0,120) width 344: ".nine {text-indent: 25px; background: aqua;}" - text run at (343,120) width 1: " " - text run at (0,135) width 375: "blockquote {text-indent: 50%; background: aqua;}" - text run at (374,135) width 1: " " - text run at (0,150) width 0: " " - LayoutBlockFlow {P} at (0,230) size 769x18 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 394x18 - text run at (48,0) width 394: "The first line of this sentence should be indented half an inch." - LayoutBlockFlow {P} at (0,264) size 769x18 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 421x18 - text run at (75,0) width 421: "The first line of this sentence should be indented two centimeters." - LayoutBlockFlow {P} at (0,298) size 769x18 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 440x18 - text run at (75,0) width 440: "The first line of this sentence should be indented twenty millimeters." - LayoutBlockFlow {P} at (0,332) size 769x18 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 437x18 - text run at (32,0) width 437: "The first line of this sentence should be indented twenty-four points." - LayoutBlockFlow {P} at (0,366) size 769x18 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 380x18 - text run at (32,0) width 380: "The first line of this sentence should be indented two picas." - LayoutBlockFlow {P} at (0,400) size 769x18 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 366x18 - text run at (32,0) width 366: "The first line of this sentence should be indented two em." - LayoutBlockFlow {P} at (0,434) size 769x18 [bgcolor=#00FFFF] - LayoutText {#text} at (14,0) size 362x18 - text run at (14,0) width 362: "The first line of this sentence should be indented two ex." - LayoutBlockFlow {P} at (0,468) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (384,0) size 751x36 - text run at (384,0) width 367: "The first line of this sentence should be indented halfway" - text run at (0,18) width 567: "across the page, but the rest of it should be flush with the normal left margin of the page." - LayoutBlockFlow {P} at (0,520) size 769x36 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 739x36 - text run at (25,0) width 714: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" - text run at (0,18) width 125: "margin of the page." - LayoutBlockFlow {P} at (0,572) size 769x54 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 425x18 - text run at (48,0) width 425: "Only the first line of this sentence should be indented half an inch," - LayoutBR {BR} at (472,14) size 1x0 - LayoutText {#text} at (0,18) size 266x18 - text run at (0,18) width 266: "no matter where the lines might start, and" - LayoutBR {BR} at (265,32) size 1x0 - LayoutInline {EM} at (0,0) size 201x18 - LayoutText {#text} at (0,36) size 201x18 - text run at (0,36) width 201: "regardless of any other markup" - LayoutText {#text} at (200,36) size 149x18 - text run at (200,36) width 149: " which may be present." - LayoutBlockFlow {BLOCKQUOTE} at (40,642) size 689x54 [bgcolor=#00FFFF] - LayoutText {#text} at (384,0) size 651x54 - text run at (384,0) width 228: "In the first half of the test page, this" - text run at (0,18) width 651: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,36) width 512: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." - LayoutTable {TABLE} at (0,712) size 769x518 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x516 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x490 - LayoutTableCell {TD} at (0,258) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x490 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 394x18 - text run at (48,0) width 394: "The first line of this sentence should be indented half an inch." - LayoutBlockFlow {P} at (4,38) size 747x18 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 421x18 - text run at (75,0) width 421: "The first line of this sentence should be indented two centimeters." - LayoutBlockFlow {P} at (4,72) size 747x18 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 440x18 - text run at (75,0) width 440: "The first line of this sentence should be indented twenty millimeters." - LayoutBlockFlow {P} at (4,106) size 747x18 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 437x18 - text run at (32,0) width 437: "The first line of this sentence should be indented twenty-four points." - LayoutBlockFlow {P} at (4,140) size 747x18 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 380x18 - text run at (32,0) width 380: "The first line of this sentence should be indented two picas." - LayoutBlockFlow {P} at (4,174) size 747x18 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 366x18 - text run at (32,0) width 366: "The first line of this sentence should be indented two em." - LayoutBlockFlow {P} at (4,208) size 747x18 [bgcolor=#00FFFF] - LayoutText {#text} at (14,0) size 362x18 - text run at (14,0) width 362: "The first line of this sentence should be indented two ex." - LayoutBlockFlow {P} at (4,242) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (373,0) size 740x36 - text run at (373,0) width 367: "The first line of this sentence should be indented halfway" - text run at (0,18) width 567: "across the page, but the rest of it should be flush with the normal left margin of the page." - LayoutBlockFlow {P} at (4,294) size 747x36 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 739x36 - text run at (25,0) width 714: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left" - text run at (0,18) width 125: "margin of the page." - LayoutBlockFlow {P} at (4,346) size 747x54 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 425x18 - text run at (48,0) width 425: "Only the first line of this sentence should be indented half an inch," - LayoutBR {BR} at (472,14) size 1x0 - LayoutText {#text} at (0,18) size 266x18 - text run at (0,18) width 266: "no matter where the lines might start, and" - LayoutBR {BR} at (265,32) size 1x0 - LayoutInline {EM} at (0,0) size 201x18 - LayoutText {#text} at (0,36) size 201x18 - text run at (0,36) width 201: "regardless of any other markup" - LayoutText {#text} at (200,36) size 149x18 - text run at (200,36) width 149: " which may be present." - LayoutBlockFlow {BLOCKQUOTE} at (44,416) size 667x54 [bgcolor=#00FFFF] - LayoutText {#text} at (373,0) size 651x54 - text run at (373,0) width 228: "In the first half of the test page, this" - text run at (0,18) width 651: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,36) width 512: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." -layer at (8,220) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,212) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_transform-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_transform-expected.png deleted file mode 100644 index db70e4be..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt deleted file mode 100644 index 66a45ea2..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt +++ /dev/null
@@ -1,107 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 732 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x732 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x732 - LayoutBlockFlow {BODY} at (8,8) size 769x716 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x75 - LayoutText {#text} at (0,0) size 266x75 - text run at (0,0) width 219: ".ttn {text-transform: none;}" - text run at (218,0) width 1: " " - text run at (0,15) width 266: ".cap {text-transform: capitalize;}" - text run at (265,15) width 1: " " - text run at (0,30) width 258: ".upp {text-transform: uppercase;}" - text run at (257,30) width 1: " " - text run at (0,45) width 258: ".low {text-transform: lowercase;}" - text run at (257,45) width 1: " " - text run at (0,60) width 0: " " - LayoutBlockFlow {P} at (0,140) size 769x36 - LayoutText {#text} at (0,0) size 732x36 - text run at (0,0) width 732: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" - text run at (0,18) width 50: "normal." - LayoutBlockFlow {P} at (0,192) size 769x54 - LayoutText {#text} at (0,0) size 758x54 - text run at (0,0) width 758: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That" - text run at (0,18) width 727: "Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-" - text run at (0,36) width 544: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - LayoutBlockFlow {P} at (0,262) size 769x36 - LayoutText {#text} at (0,0) size 743x36 - text run at (0,0) width 743: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in" - text run at (0,18) width 336: "this sentence should have one, and only one, capital " - LayoutInline {SPAN} at (0,0) size 39x18 - LayoutText {#text} at (335,18) size 18x18 - text run at (335,18) width 18: "Le" - LayoutInline {SPAN} at (0,0) size 10x18 - LayoutText {#text} at (352,18) size 10x18 - text run at (352,18) width 10: "tt" - LayoutText {#text} at (361,18) size 13x18 - text run at (361,18) width 13: "er" - LayoutText {#text} at (373,18) size 5x18 - text run at (373,18) width 5: "." - LayoutBlockFlow {P} at (0,314) size 769x54 - LayoutText {#text} at (0,0) size 704x36 - text run at (0,0) width 704: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,18) width 351: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (350,18) width 278: "IN THE LAST SENTENCE, HOWEVER, " - LayoutInline {SPAN} at (0,0) size 753x36 - LayoutText {#text} at (628,18) size 753x36 - text run at (628,18) width 125: "the last eight words" - text run at (0,36) width 155: "should not be uppercase" - LayoutText {#text} at (154,36) size 5x18 - text run at (154,36) width 5: "." - LayoutBlockFlow {P} at (0,384) size 769x18 - LayoutText {#text} at (0,0) size 741x18 - text run at (0,0) width 741: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." - LayoutTable {TABLE} at (0,418) size 769x298 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x296 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x270 - LayoutTableCell {TD} at (0,148) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x270 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x36 - LayoutText {#text} at (0,0) size 732x36 - text run at (0,0) width 732: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear" - text run at (0,18) width 50: "normal." - LayoutBlockFlow {P} at (4,56) size 747x54 - LayoutText {#text} at (0,0) size 724x54 - text run at (0,0) width 724: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words" - text run at (0,18) width 723: "That Are In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A" - text run at (0,36) width 577: "Non-Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - LayoutBlockFlow {P} at (4,126) size 747x36 - LayoutText {#text} at (0,0) size 743x36 - text run at (0,0) width 743: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in" - text run at (0,18) width 336: "this sentence should have one, and only one, capital " - LayoutInline {SPAN} at (0,0) size 39x18 - LayoutText {#text} at (335,18) size 18x18 - text run at (335,18) width 18: "Le" - LayoutInline {SPAN} at (0,0) size 10x18 - LayoutText {#text} at (352,18) size 10x18 - text run at (352,18) width 10: "tt" - LayoutText {#text} at (361,18) size 13x18 - text run at (361,18) width 13: "er" - LayoutText {#text} at (373,18) size 5x18 - text run at (373,18) width 5: "." - LayoutBlockFlow {P} at (4,178) size 747x54 - LayoutText {#text} at (0,0) size 704x36 - text run at (0,0) width 704: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,18) width 351: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (350,18) width 278: "IN THE LAST SENTENCE, HOWEVER, " - LayoutInline {SPAN} at (0,0) size 710x36 - LayoutText {#text} at (628,18) size 710x36 - text run at (628,18) width 82: "the last eight" - text run at (0,36) width 198: "words should not be uppercase" - LayoutText {#text} at (197,36) size 5x18 - text run at (197,36) width 5: "." - LayoutBlockFlow {P} at (4,248) size 747x18 - LayoutText {#text} at (0,0) size 741x18 - text run at (0,0) width 741: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." -layer at (8,130) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,122) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png deleted file mode 100644 index 220af9b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt deleted file mode 100644 index 21e4a624..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt +++ /dev/null
@@ -1,723 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4423 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4423 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4423.31 - LayoutBlockFlow {BODY} at (8,8) size 769x4407.31 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x270 - LayoutText {#text} at (0,0) size 500x270 - text run at (0,0) width 157: "P {font-size: 12pt;}" - text run at (156,0) width 1: " " - text run at (0,15) width 211: ".one {vertical-align: sub;}" - text run at (210,15) width 1: " " - text run at (0,30) width 227: ".two {vertical-align: super;}" - text run at (226,30) width 1: " " - text run at (0,45) width 359: ".three {vertical-align: top; font-size: 12pt;}" - text run at (358,45) width 1: " " - text run at (0,60) width 391: ".four {vertical-align: text-top; font-size: 12pt;}" - text run at (390,60) width 1: " " - text run at (0,75) width 375: ".five {vertical-align: middle; font-size: 12pt;}" - text run at (374,75) width 1: " " - text run at (0,90) width 367: ".six {vertical-align: bottom; font-size: 12pt;}" - text run at (366,90) width 1: " " - text run at (0,105) width 422: ".seven {vertical-align: text-bottom; font-size: 12pt;}" - text run at (421,105) width 1: " " - text run at (0,120) width 398: ".eight {vertical-align: baseline; font-size: 12pt;}" - text run at (397,120) width 1: " " - text run at (0,135) width 500: ".nine {vertical-align: 50%; font-size: 12px; line-height: 16px;}" - text run at (499,135) width 1: " " - text run at (0,150) width 0: " " - text run at (0,165) width 219: "P.example {font-size: 14pt;}" - text run at (218,165) width 1: " " - text run at (0,180) width 172: "BIG {font-size: 16pt;}" - text run at (171,180) width 1: " " - text run at (0,195) width 188: "SMALL {font-size: 12pt;}" - text run at (187,195) width 1: " " - text run at (0,210) width 297: ".ttopalign {vertical-align: text-top;}" - text run at (296,210) width 1: " " - text run at (0,225) width 250: ".topalign {vertical-align: top;}" - text run at (249,225) width 1: " " - text run at (0,240) width 274: ".midalign {vertical-align: middle;}" - text run at (273,240) width 1: " " - text run at (0,255) width 0: " " - LayoutBlockFlow {P} at (0,335) size 769x76 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (15,40) size 128x18 - text run at (15,40) width 128: "The first four words" - LayoutText {#text} at (142,36) size 766x40 - text run at (142,36) width 292: " in this sentence should be subscript-aligned. " - text run at (433,36) width 333: "The font size of the superscripted text should not be" - text run at (0,58) width 262: "different from that of the parent element." - LayoutBlockFlow {P} at (0,427) size 769x72 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (15,30) size 128x18 - text run at (15,30) width 128: "The first four words" - LayoutText {#text} at (142,36) size 766x36 - text run at (142,36) width 304: " in this sentence should be superscript-aligned. " - text run at (445,36) width 321: "The font size of the subscripted text should not be" - text run at (0,54) width 262: "different from that of the parent element." - LayoutBlockFlow {P} at (0,515) size 769x72 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (15,0) size 128x18 - text run at (15,0) width 128: "The first four words" - LayoutText {#text} at (142,36) size 728x36 - text run at (142,36) width 586: " in this sentence should be top-aligned, which will align their tops with the top of the tallest" - text run at (0,54) width 328: "element in the line (probably the orange rectangle)." - LayoutBlockFlow {P} at (0,603) size 769x132 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,36) size 4x18 - text run at (15,36) width 4: " " - LayoutInline {SPAN} at (0,0) size 755x111 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (19,21) size 128x18 - text run at (19,21) width 128: "The first four words" - LayoutText {#text} at (146,21) size 755x111 - text run at (146,21) width 558: " in this sentence should be text-top-aligned," - text run at (0,58) width 755: "which should align their tops with the top of the tallest text" - text run at (0,95) width 136: "in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,751) size 769x68 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,15) size 755x53 - text run at (15,15) width 740: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" - text run at (0,50) width 317: "defined as the text baseline plus half the x-height." - LayoutBlockFlow {P} at (0,835) size 769x124 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,15) size 4x18 - text run at (15,15) width 4: " " - LayoutInline {SPAN} at (0,0) size 733x124 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (19,32) size 128x18 - text run at (19,32) width 128: "The first four words" - LayoutText {#text} at (146,0) size 733x124 - text run at (146,0) width 548: " in this sentence should be 12pt in size and" - text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 518: "bottom of the lowest element in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,975) size 769x161 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,15) size 4x18 - text run at (15,15) width 4: " " - LayoutInline {SPAN} at (0,0) size 751x161 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 297x18 - LayoutText {#text} at (19,19) size 297x18 - text run at (19,19) width 297: "The first eight words (\"eight\" has a descender)" - LayoutText {#text} at (315,0) size 751x161 - text run at (315,0) width 436: " in this sentence should be 12pt in" - text run at (0,50) width 693: "size and text-bottom-aligned, which should align their" - text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 295: "descenders) in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1152) size 769x132 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,36) size 4x18 - text run at (15,36) width 4: " " - LayoutInline {SPAN} at (0,0) size 761x111 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (19,36) size 128x18 - text run at (19,36) width 128: "The first four words" - LayoutText {#text} at (146,21) size 761x111 - text run at (146,21) width 548: " in this sentence should be 12pt in size and" - text run at (0,58) width 761: "baseline-aligned, which should align their baseline with the" - text run at (0,95) width 523: "baseline of the rest of the text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1300) size 769x72 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 96x14 - LayoutText {#text} at (15,31) size 96x14 - text run at (15,31) width 96: "The first four words" - LayoutText {#text} at (110,36) size 763x36 - text run at (110,36) width 653: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," - text run at (0,54) width 385: "which should raise them 8px relative to the natural baseline." - LayoutBlockFlow {P} at (0,1388) size 769x36 - LayoutText {#text} at (0,0) size 759x36 - text run at (0,0) width 759: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" - text run at (0,18) width 676: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (0,1442.66) size 769x324 - LayoutText {#text} at (0,25) size 118x22 - text run at (0,25) width 118: "This paragraph " - LayoutImage {IMG} at (117.09,25) size 9x30 - LayoutText {#text} at (126,25) size 5x22 - text run at (126,25) width 5: " " - LayoutInline {SPAN} at (0,0) size 416x54 - LayoutText {#text} at (130,0) size 416x54 - text run at (130,0) width 416: "contains many images" - LayoutText {#text} at (545,25) size 6x22 - text run at (545,25) width 6: " " - LayoutImage {IMG} at (550.05,25) size 15x50 - LayoutText {#text} at (565,25) size 5x22 - text run at (565,25) width 5: " " - LayoutInline {BIG} at (0,0) size 156x24 - LayoutText {#text} at (569,23) size 156x24 - text run at (569,23) width 156: "of varying heights" - LayoutText {#text} at (724,25) size 6x22 - text run at (724,25) width 6: " " - LayoutImage {IMG} at (729.56,25) size 3x10 - LayoutText {#text} at (732,25) size 6x22 - text run at (732,25) width 6: " " - LayoutInline {SMALL} at (0,0) size 761x115 - LayoutText {#text} at (737,28) size 761x115 - text run at (737,28) width 24: "and" - text run at (0,125) width 43: "widths" - LayoutText {#text} at (42,122) size 6x22 - text run at (42,122) width 6: " " - LayoutImage {IMG} at (47.33,122) size 6x20 - LayoutText {#text} at (53,122) size 99x22 - text run at (53,122) width 99: " all of which " - LayoutImage {IMG} at (151.78,122) size 19.50x65 - LayoutText {#text} at (171,122) size 5x22 - text run at (171,122) width 5: " " - LayoutInline {SPAN} at (0,0) size 265x43 - LayoutText {#text} at (175,105) size 265x43 - text run at (175,105) width 265: "should be aligned" - LayoutText {#text} at (439,122) size 5x22 - text run at (439,122) width 5: " " - LayoutImage {IMG} at (443.92,122) size 10.50x35 - LayoutText {#text} at (454,122) size 120x22 - text run at (454,122) width 120: " with the top of " - LayoutImage {IMG} at (573.09,122) size 9x30 - LayoutText {#text} at (582,122) size 5x22 - text run at (582,122) width 5: " " - LayoutInline {SPAN} at (0,0) size 700x144 - LayoutText {#text} at (586,114) size 21x32 - text run at (586,114) width 21: "a " - LayoutInline {SPAN} at (0,0) size 700x194 - LayoutText {#text} at (606,75) size 700x194 - text run at (606,75) width 94: "14-" - text run at (0,187) width 144: "point" - LayoutText {#text} at (143,226) size 146x32 - text run at (143,226) width 146: " text element" - LayoutText {#text} at (288,234) size 6x22 - text run at (288,234) width 6: " " - LayoutImage {IMG} at (293.14,234) size 15x50 - LayoutText {#text} at (308,234) size 5x22 - text run at (308,234) width 5: " " - LayoutInline {SMALL} at (0,0) size 195x18 - LayoutText {#text} at (312,237) size 195x18 - text run at (312,237) width 195: "regardless of the line in which" - LayoutText {#text} at (506,234) size 5x22 - text run at (506,234) width 5: " " - LayoutImage {IMG} at (510.72,234) size 4.50x15 - LayoutText {#text} at (515,234) size 5x22 - text run at (515,234) width 5: " " - LayoutInline {BIG} at (0,0) size 160x24 - LayoutText {#text} at (519,232) size 160x24 - text run at (519,232) width 160: "the images appear." - LayoutText {#text} at (678,234) size 5x22 - text run at (678,234) width 5: " " - LayoutImage {IMG} at (682.67,234) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1785.31) size 769x36 - LayoutText {#text} at (0,0) size 765x36 - text run at (0,0) width 765: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be" - text run at (0,18) width 371: "aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (0,1837.31) size 769x230 - LayoutText {#text} at (0,22) size 101x18 - text run at (0,22) width 101: "This paragraph " - LayoutImage {IMG} at (100.41,17) size 9x30 - LayoutText {#text} at (109,22) size 5x18 - text run at (109,22) width 5: " " - LayoutInline {SPAN} at (0,0) size 356x46 - LayoutText {#text} at (113,0) size 356x46 - text run at (113,0) width 356: "contains many images" - LayoutText {#text} at (468,22) size 5x18 - text run at (468,22) width 5: " " - LayoutImage {IMG} at (472.88,7) size 15x50 - LayoutText {#text} at (487,22) size 126x18 - text run at (487,22) width 126: " of varying heights " - LayoutImage {IMG} at (612.30,27) size 3x10 - LayoutText {#text} at (615,22) size 5x18 - text run at (615,22) width 5: " " - LayoutInline {SMALL} at (0,0) size 71x18 - LayoutText {#text} at (619,22) size 71x18 - text run at (619,22) width 71: "and widths" - LayoutText {#text} at (689,22) size 5x18 - text run at (689,22) width 5: " " - LayoutImage {IMG} at (693.06,22) size 6x20 - LayoutText {#text} at (699,22) size 737x93 - text run at (699,22) width 38: " all of" - text run at (0,97) width 44: "which " - LayoutImage {IMG} at (43.09,75) size 19.50x65 - LayoutText {#text} at (62,97) size 122x18 - text run at (62,97) width 122: " should be aligned " - LayoutImage {IMG} at (183.45,90) size 10.50x35 - LayoutText {#text} at (193,97) size 5x18 - text run at (193,97) width 5: " " - LayoutInline {SPAN} at (0,0) size 237x37 - LayoutText {#text} at (197,82) size 237x37 - text run at (197,82) width 237: "with the middle of" - LayoutText {#text} at (433,97) size 5x18 - text run at (433,97) width 5: " " - LayoutImage {IMG} at (437.47,82) size 15x50 - LayoutText {#text} at (452,97) size 5x18 - text run at (452,97) width 5: " " - LayoutInline {SPAN} at (0,0) size 719x106 - LayoutText {#text} at (456,89) size 18x28 - text run at (456,89) width 18: "a " - LayoutInline {SPAN} at (0,0) size 204x69 - LayoutText {#text} at (473,57) size 204x69 - text run at (473,57) width 204: "14-point" - LayoutText {#text} at (676,89) size 719x106 - text run at (676,89) width 43: " text" - text run at (0,167) width 76: "element" - LayoutText {#text} at (75,175) size 5x18 - text run at (75,175) width 5: " " - LayoutImage {IMG} at (79.95,160) size 15x50 - LayoutText {#text} at (94,175) size 5x18 - text run at (94,175) width 5: " " - LayoutInline {SMALL} at (0,0) size 195x18 - LayoutText {#text} at (98,175) size 195x18 - text run at (98,175) width 195: "regardless of the line in which" - LayoutText {#text} at (292,175) size 5x18 - text run at (292,175) width 5: " " - LayoutImage {IMG} at (296.22,178) size 4.50x15 - LayoutText {#text} at (300,175) size 5x18 - text run at (300,175) width 5: " " - LayoutInline {BIG} at (0,0) size 159x24 - LayoutText {#text} at (304,170) size 159x24 - text run at (304,170) width 159: "the images appear." - LayoutText {#text} at (462,175) size 5x18 - text run at (462,175) width 5: " " - LayoutImage {IMG} at (466.86,140) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,2083.31) size 769x36 - LayoutText {#text} at (0,0) size 750x36 - text run at (0,0) width 750: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" - text run at (0,18) width 178: "element is an image or not. " - text run at (177,18) width 563: "Each fragment of text has been SPANned appropriately in order to cause this to happen." - LayoutBlockFlow {P} at (0,2135.31) size 769x201 - LayoutInline {SPAN} at (0,0) size 97x18 - LayoutText {#text} at (0,0) size 97x18 - text run at (0,0) width 97: "This paragraph" - LayoutText {#text} at (96,0) size 5x18 - text run at (96,0) width 5: " " - LayoutImage {IMG} at (100.41,0) size 3x10 - LayoutText {#text} at (103,0) size 5x18 - text run at (103,0) width 5: " " - LayoutInline {SPAN} at (0,0) size 356x46 - LayoutText {#text} at (107,0) size 356x46 - text run at (107,0) width 356: "contains many images" - LayoutText {#text} at (462,0) size 5x18 - text run at (462,0) width 5: " " - LayoutImage {IMG} at (466.88,0) size 3x10 - LayoutText {#text} at (469,0) size 5x18 - text run at (469,0) width 5: " " - LayoutInline {SPAN} at (0,0) size 90x18 - LayoutText {#text} at (473,0) size 90x18 - text run at (473,0) width 90: "and some text" - LayoutText {#text} at (562,0) size 5x18 - text run at (562,0) width 5: " " - LayoutImage {IMG} at (566.73,0) size 3x10 - LayoutText {#text} at (569,0) size 5x18 - text run at (569,0) width 5: " " - LayoutInline {SPAN} at (0,0) size 118x18 - LayoutText {#text} at (573,0) size 118x18 - text run at (573,0) width 118: "of varying heights" - LayoutText {#text} at (690,0) size 5x18 - text run at (690,0) width 5: " " - LayoutImage {IMG} at (694.16,0) size 3x10 - LayoutText {#text} at (697,0) size 5x18 - text run at (697,0) width 5: " " - LayoutInline {BIG} at (0,0) size 732x70 - LayoutText {#text} at (701,0) size 732x70 - text run at (701,0) width 31: "and" - text run at (0,46) width 57: "widths" - LayoutText {#text} at (56,46) size 5x18 - text run at (56,46) width 5: " " - LayoutImage {IMG} at (60.88,46) size 6x20 - LayoutText {#text} at (66,46) size 5x18 - text run at (66,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 78x18 - LayoutText {#text} at (70,46) size 78x18 - text run at (70,46) width 78: "all of which" - LayoutText {#text} at (147,46) size 5x18 - text run at (147,46) width 5: " " - LayoutImage {IMG} at (151.30,46) size 19.50x65 - LayoutText {#text} at (170,46) size 5x18 - text run at (170,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 114x18 - LayoutText {#text} at (174,46) size 114x18 - text run at (174,46) width 114: "should be aligned" - LayoutText {#text} at (287,46) size 5x18 - text run at (287,46) width 5: " " - LayoutImage {IMG} at (291.66,46) size 10.50x35 - LayoutText {#text} at (302,46) size 5x18 - text run at (302,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 188x37 - LayoutText {#text} at (306,46) size 188x37 - text run at (306,46) width 188: "with the top of" - LayoutText {#text} at (493,46) size 5x18 - text run at (493,46) width 5: " " - LayoutImage {IMG} at (497.69,46) size 15x50 - LayoutText {#text} at (512,46) size 5x18 - text run at (512,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 134x18 - LayoutText {#text} at (516,46) size 134x18 - text run at (516,46) width 134: "the tallest element in" - LayoutText {#text} at (649,46) size 5x18 - text run at (649,46) width 5: " " - LayoutImage {IMG} at (653.53,46) size 4.50x15 - LayoutText {#text} at (658,46) size 5x18 - text run at (658,46) width 5: " " - LayoutInline {BIG} at (0,0) size 751x89 - LayoutText {#text} at (662,46) size 751x89 - text run at (662,46) width 89: "whichever" - text run at (0,111) width 211: "line the elements appear." - LayoutText {#text} at (210,111) size 5x18 - text run at (210,111) width 5: " " - LayoutImage {IMG} at (214.84,111) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,2352.31) size 769x2055 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2053 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x2027 - LayoutTableCell {TD} at (0,1026) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x2027.31 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x76 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (15,40) size 128x18 - text run at (15,40) width 128: "The first four words" - LayoutText {#text} at (142,36) size 746x40 - text run at (142,36) width 292: " in this sentence should be subscript-aligned. " - text run at (433,36) width 313: "The font size of the superscripted text should not" - text run at (0,58) width 281: "be different from that of the parent element." - LayoutBlockFlow {P} at (4,96) size 747x72 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (15,30) size 128x18 - text run at (15,30) width 128: "The first four words" - LayoutText {#text} at (142,36) size 746x36 - text run at (142,36) width 304: " in this sentence should be superscript-aligned. " - text run at (445,36) width 301: "The font size of the subscripted text should not" - text run at (0,54) width 281: "be different from that of the parent element." - LayoutBlockFlow {P} at (4,184) size 747x72 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (15,0) size 128x18 - text run at (15,0) width 128: "The first four words" - LayoutText {#text} at (142,36) size 728x36 - text run at (142,36) width 586: " in this sentence should be top-aligned, which will align their tops with the top of the tallest" - text run at (0,54) width 328: "element in the line (probably the orange rectangle)." - LayoutBlockFlow {P} at (4,272) size 747x132 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,36) size 4x18 - text run at (15,36) width 4: " " - LayoutInline {SPAN} at (0,0) size 704x111 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (19,21) size 128x18 - text run at (19,21) width 128: "The first four words" - LayoutText {#text} at (146,21) size 704x111 - text run at (146,21) width 558: " in this sentence should be text-top-aligned," - text run at (0,58) width 699: "which should align their tops with the top of the tallest" - text run at (0,95) width 192: "text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,420) size 747x68 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,15) size 718x53 - text run at (15,15) width 703: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the" - text run at (0,50) width 354: "point defined as the text baseline plus half the x-height." - LayoutBlockFlow {P} at (4,504) size 747x124 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,15) size 4x18 - text run at (15,15) width 4: " " - LayoutInline {SPAN} at (0,0) size 733x124 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (19,32) size 128x18 - text run at (19,32) width 128: "The first four words" - LayoutText {#text} at (146,0) size 733x124 - text run at (146,0) width 548: " in this sentence should be 12pt in size and" - text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 518: "bottom of the lowest element in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,644) size 747x161 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,15) size 4x18 - text run at (15,15) width 4: " " - LayoutInline {SPAN} at (0,0) size 726x161 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 297x18 - LayoutText {#text} at (19,19) size 297x18 - text run at (19,19) width 297: "The first eight words (\"eight\" has a descender)" - LayoutText {#text} at (315,0) size 726x161 - text run at (315,0) width 403: " in this sentence should be 12pt" - text run at (0,50) width 726: "in size and text-bottom-aligned, which should align their" - text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 295: "descenders) in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,821) size 747x132 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,36) size 4x18 - text run at (15,36) width 4: " " - LayoutInline {SPAN} at (0,0) size 714x111 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 128x18 - LayoutText {#text} at (19,36) size 128x18 - text run at (19,36) width 128: "The first four words" - LayoutText {#text} at (146,21) size 714x111 - text run at (146,21) width 548: " in this sentence should be 12pt in size and" - text run at (0,58) width 714: "baseline-aligned, which should align their baseline with" - text run at (0,95) width 570: "the baseline of the rest of the text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,969) size 747x72 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 96x14 - LayoutText {#text} at (15,31) size 96x14 - text run at (15,31) width 96: "The first four words" - LayoutText {#text} at (110,36) size 712x36 - text run at (110,36) width 602: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-" - text run at (0,54) width 440: "aligned, which should raise them 8px relative to the natural baseline." - LayoutBlockFlow {P} at (4,1057) size 747x36 - LayoutText {#text} at (0,0) size 730x36 - text run at (0,0) width 730: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the" - text run at (0,18) width 705: "first section of text, whereas any size text should be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (4,1111.66) size 747x324 - LayoutText {#text} at (0,25) size 118x22 - text run at (0,25) width 118: "This paragraph " - LayoutImage {IMG} at (117.09,25) size 9x30 - LayoutText {#text} at (126,25) size 5x22 - text run at (126,25) width 5: " " - LayoutInline {SPAN} at (0,0) size 416x54 - LayoutText {#text} at (130,0) size 416x54 - text run at (130,0) width 416: "contains many images" - LayoutText {#text} at (545,25) size 6x22 - text run at (545,25) width 6: " " - LayoutImage {IMG} at (550.05,25) size 15x50 - LayoutText {#text} at (565,25) size 5x22 - text run at (565,25) width 5: " " - LayoutInline {BIG} at (0,0) size 156x24 - LayoutText {#text} at (569,23) size 156x24 - text run at (569,23) width 156: "of varying heights" - LayoutText {#text} at (724,25) size 6x22 - text run at (724,25) width 6: " " - LayoutImage {IMG} at (729.56,25) size 3x10 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SMALL} at (0,0) size 70x18 - LayoutText {#text} at (0,125) size 70x18 - text run at (0,125) width 70: "and widths" - LayoutText {#text} at (69,122) size 6x22 - text run at (69,122) width 6: " " - LayoutImage {IMG} at (74.42,122) size 6x20 - LayoutText {#text} at (80,122) size 99x22 - text run at (80,122) width 99: " all of which " - LayoutImage {IMG} at (178.88,122) size 19.50x65 - LayoutText {#text} at (198,122) size 6x22 - text run at (198,122) width 6: " " - LayoutInline {SPAN} at (0,0) size 264x43 - LayoutText {#text} at (203,105) size 264x43 - text run at (203,105) width 264: "should be aligned" - LayoutText {#text} at (466,122) size 6x22 - text run at (466,122) width 6: " " - LayoutImage {IMG} at (471.02,122) size 10.50x35 - LayoutText {#text} at (481,122) size 120x22 - text run at (481,122) width 120: " with the top of " - LayoutImage {IMG} at (600.19,122) size 9x30 - LayoutText {#text} at (609,122) size 5x22 - text run at (609,122) width 5: " " - LayoutInline {SPAN} at (0,0) size 727x144 - LayoutText {#text} at (613,114) size 21x32 - text run at (613,114) width 21: "a " - LayoutInline {SPAN} at (0,0) size 727x194 - LayoutText {#text} at (633,75) size 727x194 - text run at (633,75) width 94: "14-" - text run at (0,187) width 144: "point" - LayoutText {#text} at (143,226) size 146x32 - text run at (143,226) width 146: " text element" - LayoutText {#text} at (288,234) size 6x22 - text run at (288,234) width 6: " " - LayoutImage {IMG} at (293.14,234) size 15x50 - LayoutText {#text} at (308,234) size 5x22 - text run at (308,234) width 5: " " - LayoutInline {SMALL} at (0,0) size 195x18 - LayoutText {#text} at (312,237) size 195x18 - text run at (312,237) width 195: "regardless of the line in which" - LayoutText {#text} at (506,234) size 5x22 - text run at (506,234) width 5: " " - LayoutImage {IMG} at (510.72,234) size 4.50x15 - LayoutText {#text} at (515,234) size 5x22 - text run at (515,234) width 5: " " - LayoutInline {BIG} at (0,0) size 160x24 - LayoutText {#text} at (519,232) size 160x24 - text run at (519,232) width 160: "the images appear." - LayoutText {#text} at (678,234) size 5x22 - text run at (678,234) width 5: " " - LayoutImage {IMG} at (682.67,234) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,1454.31) size 747x36 - LayoutText {#text} at (0,0) size 746x36 - text run at (0,0) width 746: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should" - text run at (0,18) width 390: "be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (4,1506.31) size 747x230 - LayoutText {#text} at (0,22) size 101x18 - text run at (0,22) width 101: "This paragraph " - LayoutImage {IMG} at (100.41,17) size 9x30 - LayoutText {#text} at (109,22) size 5x18 - text run at (109,22) width 5: " " - LayoutInline {SPAN} at (0,0) size 356x46 - LayoutText {#text} at (113,0) size 356x46 - text run at (113,0) width 356: "contains many images" - LayoutText {#text} at (468,22) size 5x18 - text run at (468,22) width 5: " " - LayoutImage {IMG} at (472.88,7) size 15x50 - LayoutText {#text} at (487,22) size 126x18 - text run at (487,22) width 126: " of varying heights " - LayoutImage {IMG} at (612.30,27) size 3x10 - LayoutText {#text} at (615,22) size 5x18 - text run at (615,22) width 5: " " - LayoutInline {SMALL} at (0,0) size 71x18 - LayoutText {#text} at (619,22) size 71x18 - text run at (619,22) width 71: "and widths" - LayoutText {#text} at (689,22) size 5x18 - text run at (689,22) width 5: " " - LayoutImage {IMG} at (693.06,22) size 6x20 - LayoutText {#text} at (699,22) size 737x93 - text run at (699,22) width 38: " all of" - text run at (0,97) width 44: "which " - LayoutImage {IMG} at (43.09,75) size 19.50x65 - LayoutText {#text} at (62,97) size 122x18 - text run at (62,97) width 122: " should be aligned " - LayoutImage {IMG} at (183.45,90) size 10.50x35 - LayoutText {#text} at (193,97) size 5x18 - text run at (193,97) width 5: " " - LayoutInline {SPAN} at (0,0) size 237x37 - LayoutText {#text} at (197,82) size 237x37 - text run at (197,82) width 237: "with the middle of" - LayoutText {#text} at (433,97) size 5x18 - text run at (433,97) width 5: " " - LayoutImage {IMG} at (437.47,82) size 15x50 - LayoutText {#text} at (452,97) size 5x18 - text run at (452,97) width 5: " " - LayoutInline {SPAN} at (0,0) size 719x106 - LayoutText {#text} at (456,89) size 18x28 - text run at (456,89) width 18: "a " - LayoutInline {SPAN} at (0,0) size 204x69 - LayoutText {#text} at (473,57) size 204x69 - text run at (473,57) width 204: "14-point" - LayoutText {#text} at (676,89) size 719x106 - text run at (676,89) width 43: " text" - text run at (0,167) width 76: "element" - LayoutText {#text} at (75,175) size 5x18 - text run at (75,175) width 5: " " - LayoutImage {IMG} at (79.95,160) size 15x50 - LayoutText {#text} at (94,175) size 5x18 - text run at (94,175) width 5: " " - LayoutInline {SMALL} at (0,0) size 195x18 - LayoutText {#text} at (98,175) size 195x18 - text run at (98,175) width 195: "regardless of the line in which" - LayoutText {#text} at (292,175) size 5x18 - text run at (292,175) width 5: " " - LayoutImage {IMG} at (296.22,178) size 4.50x15 - LayoutText {#text} at (300,175) size 5x18 - text run at (300,175) width 5: " " - LayoutInline {BIG} at (0,0) size 159x24 - LayoutText {#text} at (304,170) size 159x24 - text run at (304,170) width 159: "the images appear." - LayoutText {#text} at (462,175) size 5x18 - text run at (462,175) width 5: " " - LayoutImage {IMG} at (466.86,140) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,1752.31) size 747x54 - LayoutText {#text} at (0,0) size 723x54 - text run at (0,0) width 723: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether" - text run at (0,18) width 206: "that element is an image or not. " - text run at (205,18) width 509: "Each fragment of text has been SPANned appropriately in order to cause this to" - text run at (0,36) width 51: "happen." - LayoutBlockFlow {P} at (4,1822.31) size 747x201 - LayoutInline {SPAN} at (0,0) size 97x18 - LayoutText {#text} at (0,0) size 97x18 - text run at (0,0) width 97: "This paragraph" - LayoutText {#text} at (96,0) size 5x18 - text run at (96,0) width 5: " " - LayoutImage {IMG} at (100.41,0) size 3x10 - LayoutText {#text} at (103,0) size 5x18 - text run at (103,0) width 5: " " - LayoutInline {SPAN} at (0,0) size 356x46 - LayoutText {#text} at (107,0) size 356x46 - text run at (107,0) width 356: "contains many images" - LayoutText {#text} at (462,0) size 5x18 - text run at (462,0) width 5: " " - LayoutImage {IMG} at (466.88,0) size 3x10 - LayoutText {#text} at (469,0) size 5x18 - text run at (469,0) width 5: " " - LayoutInline {SPAN} at (0,0) size 90x18 - LayoutText {#text} at (473,0) size 90x18 - text run at (473,0) width 90: "and some text" - LayoutText {#text} at (562,0) size 5x18 - text run at (562,0) width 5: " " - LayoutImage {IMG} at (566.73,0) size 3x10 - LayoutText {#text} at (569,0) size 5x18 - text run at (569,0) width 5: " " - LayoutInline {SPAN} at (0,0) size 118x18 - LayoutText {#text} at (573,0) size 118x18 - text run at (573,0) width 118: "of varying heights" - LayoutText {#text} at (690,0) size 5x18 - text run at (690,0) width 5: " " - LayoutImage {IMG} at (694.16,0) size 3x10 - LayoutText {#text} at (697,0) size 5x18 - text run at (697,0) width 5: " " - LayoutInline {BIG} at (0,0) size 732x70 - LayoutText {#text} at (701,0) size 732x70 - text run at (701,0) width 31: "and" - text run at (0,46) width 57: "widths" - LayoutText {#text} at (56,46) size 5x18 - text run at (56,46) width 5: " " - LayoutImage {IMG} at (60.88,46) size 6x20 - LayoutText {#text} at (66,46) size 5x18 - text run at (66,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 78x18 - LayoutText {#text} at (70,46) size 78x18 - text run at (70,46) width 78: "all of which" - LayoutText {#text} at (147,46) size 5x18 - text run at (147,46) width 5: " " - LayoutImage {IMG} at (151.30,46) size 19.50x65 - LayoutText {#text} at (170,46) size 5x18 - text run at (170,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 114x18 - LayoutText {#text} at (174,46) size 114x18 - text run at (174,46) width 114: "should be aligned" - LayoutText {#text} at (287,46) size 5x18 - text run at (287,46) width 5: " " - LayoutImage {IMG} at (291.66,46) size 10.50x35 - LayoutText {#text} at (302,46) size 5x18 - text run at (302,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 188x37 - LayoutText {#text} at (306,46) size 188x37 - text run at (306,46) width 188: "with the top of" - LayoutText {#text} at (493,46) size 5x18 - text run at (493,46) width 5: " " - LayoutImage {IMG} at (497.69,46) size 15x50 - LayoutText {#text} at (512,46) size 5x18 - text run at (512,46) width 5: " " - LayoutInline {SPAN} at (0,0) size 134x18 - LayoutText {#text} at (516,46) size 134x18 - text run at (516,46) width 134: "the tallest element in" - LayoutText {#text} at (649,46) size 5x18 - text run at (649,46) width 5: " " - LayoutImage {IMG} at (653.53,46) size 4.50x15 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {BIG} at (0,0) size 305x24 - LayoutText {#text} at (0,111) size 305x24 - text run at (0,111) width 305: "whichever line the elements appear." - LayoutText {#text} at (305,111) size 4x18 - text run at (305,111) width 4: " " - LayoutImage {IMG} at (309,111) size 27x90 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,325) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,317) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png deleted file mode 100644 index f6f62f63..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt deleted file mode 100644 index 30114dc..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt +++ /dev/null
@@ -1,118 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 997 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x997 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x997 - LayoutBlockFlow {BODY} at (8,8) size 769x981 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x180 - LayoutText {#text} at (0,0) size 242x180 - text run at (0,0) width 211: ".one {word-spacing: 0.3in;}" - text run at (210,0) width 1: " " - text run at (0,15) width 211: ".two {word-spacing: 0.5cm;}" - text run at (210,15) width 1: " " - text run at (0,30) width 211: ".three {word-spacing: 5mm;}" - text run at (210,30) width 1: " " - text run at (0,45) width 203: ".four {word-spacing: 3pt;}" - text run at (202,45) width 1: " " - text run at (0,60) width 227: ".five {word-spacing: 0.25pc;}" - text run at (226,60) width 1: " " - text run at (0,75) width 196: ".six {word-spacing: 1em;}" - text run at (195,75) width 1: " " - text run at (0,90) width 211: ".seven {word-spacing: 1ex;}" - text run at (210,90) width 1: " " - text run at (0,105) width 211: ".eight {word-spacing: 5px;}" - text run at (210,105) width 1: " " - text run at (0,120) width 227: ".nine {word-spacing: normal;}" - text run at (226,120) width 1: " " - text run at (0,135) width 203: ".ten {word-spacing: 300%;}" - text run at (202,135) width 1: " " - text run at (0,150) width 242: ".eleven {word-spacing: -0.2em;}" - text run at (241,150) width 1: " " - text run at (0,165) width 0: " " - LayoutBlockFlow {P} at (0,245) size 769x18 - LayoutText {#text} at (0,0) size 716x18 - text run at (0,0) width 716: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,279) size 769x18 - LayoutText {#text} at (0,0) size 617x18 - text run at (0,0) width 617: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,313) size 769x18 - LayoutText {#text} at (0,0) size 617x18 - text run at (0,0) width 617: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,347) size 769x18 - LayoutText {#text} at (0,0) size 468x18 - text run at (0,0) width 468: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,381) size 769x18 - LayoutText {#text} at (0,0) size 468x18 - text run at (0,0) width 468: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,415) size 769x18 - LayoutText {#text} at (0,0) size 588x18 - text run at (0,0) width 588: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,449) size 769x18 - LayoutText {#text} at (0,0) size 500x18 - text run at (0,0) width 500: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,483) size 769x36 - LayoutText {#text} at (0,0) size 763x18 - text run at (0,0) width 763: "This words in this sentence should have extra space between them, but the last few words in the sentence" - LayoutInline {SPAN} at (0,0) size 180x18 - LayoutText {#text} at (0,18) size 180x18 - text run at (0,18) width 180: "should have normal spacing" - LayoutText {#text} at (179,18) size 5x18 - text run at (179,18) width 5: "." - LayoutBlockFlow {P} at (0,535) size 769x18 - LayoutText {#text} at (0,0) size 679x18 - text run at (0,0) width 679: "This sentence should have normal word-spacing, since percentage values are not allowed on this property." - LayoutBlockFlow {P} at (0,569) size 769x18 - LayoutText {#text} at (0,0) size 716x18 - text run at (0,0) width 716: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." - LayoutTable {TABLE} at (0,603) size 769x378 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x376 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x350 - LayoutTableCell {TD} at (0,188) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x350 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 716x18 - text run at (0,0) width 716: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,38) size 747x18 - LayoutText {#text} at (0,0) size 617x18 - text run at (0,0) width 617: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,72) size 747x18 - LayoutText {#text} at (0,0) size 617x18 - text run at (0,0) width 617: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,106) size 747x18 - LayoutText {#text} at (0,0) size 468x18 - text run at (0,0) width 468: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,140) size 747x18 - LayoutText {#text} at (0,0) size 468x18 - text run at (0,0) width 468: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,174) size 747x18 - LayoutText {#text} at (0,0) size 588x18 - text run at (0,0) width 588: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,208) size 747x18 - LayoutText {#text} at (0,0) size 500x18 - text run at (0,0) width 500: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,242) size 747x36 - LayoutText {#text} at (0,0) size 699x36 - text run at (0,0) width 699: "This words in this sentence should have extra space between them, but the last few words in the" - text run at (0,18) width 65: "sentence " - LayoutInline {SPAN} at (0,0) size 180x18 - LayoutText {#text} at (64,18) size 180x18 - text run at (64,18) width 180: "should have normal spacing" - LayoutText {#text} at (243,18) size 5x18 - text run at (243,18) width 5: "." - LayoutBlockFlow {P} at (4,294) size 747x18 - LayoutText {#text} at (0,0) size 679x18 - text run at (0,0) width 679: "This sentence should have normal word-spacing, since percentage values are not allowed on this property." - LayoutBlockFlow {P} at (4,328) size 747x18 - LayoutText {#text} at (0,0) size 716x18 - text run at (0,0) width 716: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." -layer at (8,235) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,227) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/color_units-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/color_units-expected.png deleted file mode 100644 index a786e8f..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/color_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/color_units-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/color_units-expected.txt deleted file mode 100644 index 9265bd19..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/color_units-expected.txt +++ /dev/null
@@ -1,240 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1717 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1717 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1717 - LayoutBlockFlow {BODY} at (8,8) size 769x1701 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x180 - LayoutText {#text} at (0,0) size 281x180 - text run at (0,0) width 157: "BODY {color: black;}" - text run at (156,0) width 1: " " - text run at (0,15) width 149: ".one {color: #080;}" - text run at (148,15) width 1: " " - text run at (0,30) width 172: ".two {color: #008000;}" - text run at (171,30) width 1: " " - text run at (0,45) width 227: ".three {color: rgb(0,128,0);}" - text run at (226,45) width 1: " " - text run at (0,60) width 235: ".four {color: rgb(0%,50%,0%);}" - text run at (234,60) width 1: " " - text run at (0,75) width 281: ".five {color: rgb(0.0%,50.0%,0.0%);}" - text run at (280,75) width 1: " " - text run at (0,90) width 157: ".six {color: green;}" - text run at (156,90) width 1: " " - text run at (0,105) width 227: ".seven {color: invalidValue;}" - text run at (226,105) width 1: " " - text run at (0,120) width 250: ".eight {color: rgb(0,128,1280);}" - text run at (249,120) width 1: " " - text run at (0,135) width 235: ".nine {color: rgb(0,128,255);}" - text run at (234,135) width 1: " " - text run at (0,150) width 258: ".ten {color: rgb(50%,-500%,60%);}" - text run at (257,150) width 1: " " - text run at (0,165) width 258: ".eleven {color: rgb(50%,0%,60%);}" - text run at (257,165) width 1: " " - LayoutBlockFlow {P} at (0,245) size 769x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (0,279) size 769x18 [color=#008800] - LayoutText {#text} at (0,0) size 518x18 - text run at (0,0) width 518: "This sentence should be green, although slightly different from those that follow." - LayoutBlockFlow {P} at (0,313) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,347) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,381) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,415) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,449) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (0,483) size 769x18 - LayoutText {#text} at (0,0) size 415x18 - text run at (0,0) width 415: "This sentence should be black, because the value given for class " - LayoutInline {CODE} at (0,0) size 47x15 - LayoutText {#text} at (414,2) size 47x15 - text run at (414,2) width 47: ".seven" - LayoutText {#text} at (460,0) size 68x18 - text run at (460,0) width 68: " is invalid." - LayoutBlockFlow {P} at (0,517) size 769x36 [color=#0080FF] - LayoutText {#text} at (0,0) size 737x36 - text run at (0,0) width 737: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,18) width 68: "paragraph." - LayoutBlockFlow {P} at (0,569) size 769x36 [color=#0080FF] - LayoutText {#text} at (0,0) size 765x36 - text run at (0,0) width 765: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" - text run at (0,18) width 68: "paragraph." - LayoutBlockFlow {P} at (0,621) size 769x36 [color=#800099] - LayoutText {#text} at (0,0) size 709x36 - text run at (0,0) width 709: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next" - text run at (0,18) width 68: "paragraph." - LayoutBlockFlow {P} at (0,673) size 769x36 [color=#800099] - LayoutText {#text} at (0,0) size 737x36 - text run at (0,0) width 737: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,18) width 68: "paragraph." - LayoutBlockFlow {P} at (0,725) size 769x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (0,759) size 769x18 [color=#008800] - LayoutText {#text} at (0,0) size 407x18 - text run at (0,0) width 407: "This sentence should be a slightly different green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (406,2) size 40x15 - text run at (406,2) width 40: "style" - LayoutText {#text} at (445,0) size 63x18 - text run at (445,0) width 63: " attribute." - LayoutBlockFlow {P} at (0,793) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (0,827) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (0,861) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (0,895) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (0,929) size 769x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutTable {TABLE} at (0,963) size 769x738 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x736 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x710 - LayoutTableCell {TD} at (0,368) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x710 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (4,38) size 747x18 [color=#008800] - LayoutText {#text} at (0,0) size 518x18 - text run at (0,0) width 518: "This sentence should be green, although slightly different from those that follow." - LayoutBlockFlow {P} at (4,72) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,106) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,140) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,174) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,208) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 197x18 - text run at (0,0) width 197: "This sentence should be green." - LayoutBlockFlow {P} at (4,242) size 747x18 - LayoutText {#text} at (0,0) size 415x18 - text run at (0,0) width 415: "This sentence should be black, because the value given for class " - LayoutInline {CODE} at (0,0) size 47x15 - LayoutText {#text} at (414,2) size 47x15 - text run at (414,2) width 47: ".seven" - LayoutText {#text} at (460,0) size 68x18 - text run at (460,0) width 68: " is invalid." - LayoutBlockFlow {P} at (4,276) size 747x36 [color=#0080FF] - LayoutText {#text} at (0,0) size 737x36 - text run at (0,0) width 737: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,18) width 68: "paragraph." - LayoutBlockFlow {P} at (4,328) size 747x36 [color=#0080FF] - LayoutText {#text} at (0,0) size 705x36 - text run at (0,0) width 705: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the" - text run at (0,18) width 128: "previous paragraph." - LayoutBlockFlow {P} at (4,380) size 747x36 [color=#800099] - LayoutText {#text} at (0,0) size 709x36 - text run at (0,0) width 709: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next" - text run at (0,18) width 68: "paragraph." - LayoutBlockFlow {P} at (4,432) size 747x36 [color=#800099] - LayoutText {#text} at (0,0) size 737x36 - text run at (0,0) width 737: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,18) width 68: "paragraph." - LayoutBlockFlow {P} at (4,484) size 747x18 - LayoutText {#text} at (0,0) size 196x18 - text run at (0,0) width 196: "This sentence should be black." - LayoutBlockFlow {P} at (4,518) size 747x18 [color=#008800] - LayoutText {#text} at (0,0) size 407x18 - text run at (0,0) width 407: "This sentence should be a slightly different green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (406,2) size 40x15 - text run at (406,2) width 40: "style" - LayoutText {#text} at (445,0) size 63x18 - text run at (445,0) width 63: " attribute." - LayoutBlockFlow {P} at (4,552) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (4,586) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (4,620) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (4,654) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." - LayoutBlockFlow {P} at (4,688) size 747x18 [color=#008000] - LayoutText {#text} at (0,0) size 285x18 - text run at (0,0) width 285: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x15 - LayoutText {#text} at (284,2) size 40x15 - text run at (284,2) width 40: "style" - LayoutText {#text} at (323,0) size 63x18 - text run at (323,0) width 63: " attribute." -layer at (8,235) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,227) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/length_units-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/length_units-expected.png deleted file mode 100644 index 2662f69..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/length_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/length_units-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/length_units-expected.txt deleted file mode 100644 index 78e7cec5..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/length_units-expected.txt +++ /dev/null
@@ -1,173 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1592 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1592 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1592 - LayoutBlockFlow {BODY} at (8,8) size 769x1576 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 769x165 - LayoutText {#text} at (0,0) size 609x165 - text run at (0,0) width 180: ".zero {margin-left: 0;}" - text run at (179,0) width 1: " " - text run at (0,15) width 188: ".one {margin-left: 3em;}" - text run at (187,15) width 1: " " - text run at (0,30) width 188: ".two {margin-left: 3ex;}" - text run at (187,30) width 1: " " - text run at (0,45) width 211: ".three {margin-left: 36px;}" - text run at (210,45) width 1: " " - text run at (0,60) width 211: ".four {margin-left: 0.5in;}" - text run at (210,60) width 1: " " - text run at (0,75) width 219: ".five {margin-left: 1.27cm;}" - text run at (218,75) width 1: " " - text run at (0,90) width 211: ".six {margin-left: 12.7mm;}" - text run at (210,90) width 1: " " - text run at (0,105) width 211: ".seven {margin-left: 36pt;}" - text run at (210,105) width 1: " " - text run at (0,120) width 203: ".eight {margin-left: 3pc;}" - text run at (202,120) width 1: " " - text run at (0,135) width 203: ".nine {margin-left: +3pc;}" - text run at (202,135) width 1: " " - text run at (0,150) width 609: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}" - text run at (608,150) width 1: " " - LayoutBlockFlow {P} at (0,230) size 769x36 - LayoutText {#text} at (0,0) size 737x36 - text run at (0,0) width 737: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)" - text run at (0,18) width 397: "edges should therefore be appropriately shifted to the right of " - LayoutInline {EM} at (0,0) size 24x18 - LayoutText {#text} at (396,18) size 24x18 - text run at (396,18) width 24: "this" - LayoutText {#text} at (419,18) size 142x18 - text run at (419,18) width 142: " paragraph's left edge." - LayoutBlockFlow {P} at (48,282) size 721x18 - LayoutText {#text} at (0,0) size 316x18 - text run at (0,0) width 316: "This paragraph should have a left margin of 3em." - LayoutBlockFlow {P} at (21.53,316) size 747.47x18 - LayoutText {#text} at (0,0) size 312x18 - text run at (0,0) width 312: "This paragraph should have a left margin of 3ex." - LayoutBlockFlow {P} at (36,350) size 733x18 - LayoutText {#text} at (0,0) size 347x18 - text run at (0,0) width 347: "This paragraph should have a left margin of 36 pixels." - LayoutBlockFlow {P} at (48,384) size 721x18 - LayoutText {#text} at (0,0) size 364x18 - text run at (0,0) width 364: "This paragraph should have a left margin of half an inch." - LayoutBlockFlow {P} at (48,418) size 721x18 - LayoutText {#text} at (0,0) size 336x18 - text run at (0,0) width 336: "This paragraph should have a left margin of 1.27cm." - LayoutBlockFlow {P} at (48,452) size 721x18 - LayoutText {#text} at (0,0) size 341x18 - text run at (0,0) width 341: "This paragraph should have a left margin of 12.7mm." - LayoutBlockFlow {P} at (48,486) size 721x18 - LayoutText {#text} at (0,0) size 348x18 - text run at (0,0) width 348: "This paragraph should have a left margin of 36 points." - LayoutBlockFlow {P} at (48,520) size 721x18 - LayoutText {#text} at (0,0) size 333x18 - text run at (0,0) width 333: "This paragraph should have a left margin of 3 picas." - LayoutBlockFlow {P} at (48,554) size 721x18 - LayoutText {#text} at (0,0) size 603x18 - text run at (0,0) width 603: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - LayoutBlockFlow {P} at (0,612) size 769x230 [bgcolor=#00FFFF] [border: none (17.94px solid #800080)] - LayoutText {#text} at (17,0) size 310x46 - text run at (17,0) width 310: "This element has a " - LayoutInline {CODE} at (0,0) size 217x46 - LayoutText {#text} at (326,0) size 217x46 - text run at (326,0) width 217: "font-size" - LayoutText {#text} at (542,0) size 55x46 - text run at (542,0) width 55: " of " - LayoutInline {CODE} at (0,0) size 97x46 - LayoutText {#text} at (596,0) size 97x46 - text run at (596,0) width 97: "40px" - LayoutText {#text} at (692,0) size 743x92 - text run at (692,0) width 68: " and" - text run at (17,46) width 29: "a " - LayoutInline {CODE} at (0,0) size 265x46 - LayoutText {#text} at (45,46) size 265x46 - text run at (45,46) width 265: "border-left" - LayoutText {#text} at (309,46) size 55x46 - text run at (309,46) width 55: " of " - LayoutInline {CODE} at (0,0) size 385x46 - LayoutText {#text} at (363,46) size 385x46 - text run at (363,46) width 385: "1ex solid purple" - LayoutText {#text} at (747,46) size 741x184 - text run at (747,46) width 11: "." - text run at (17,92) width 673: "This should make the left border the same" - text run at (17,138) width 710: "number of pixels as the lower-case 'x' in this" - text run at (17,184) width 611: "element's font, as well as solid purple." - LayoutTable {TABLE} at (0,882) size 769x694 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x692 - LayoutTableRow {TR} at (0,0) size 767x26 - LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 767x666 - LayoutTableCell {TD} at (0,346) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 755x666 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x36 - LayoutText {#text} at (0,0) size 737x36 - text run at (0,0) width 737: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)" - text run at (0,18) width 397: "edges should therefore be appropriately shifted to the right of " - LayoutInline {EM} at (0,0) size 24x18 - LayoutText {#text} at (396,18) size 24x18 - text run at (396,18) width 24: "this" - LayoutText {#text} at (419,18) size 142x18 - text run at (419,18) width 142: " paragraph's left edge." - LayoutBlockFlow {P} at (52,56) size 699x18 - LayoutText {#text} at (0,0) size 316x18 - text run at (0,0) width 316: "This paragraph should have a left margin of 3em." - LayoutBlockFlow {P} at (25.53,90) size 725.47x18 - LayoutText {#text} at (0,0) size 312x18 - text run at (0,0) width 312: "This paragraph should have a left margin of 3ex." - LayoutBlockFlow {P} at (40,124) size 711x18 - LayoutText {#text} at (0,0) size 347x18 - text run at (0,0) width 347: "This paragraph should have a left margin of 36 pixels." - LayoutBlockFlow {P} at (52,158) size 699x18 - LayoutText {#text} at (0,0) size 364x18 - text run at (0,0) width 364: "This paragraph should have a left margin of half an inch." - LayoutBlockFlow {P} at (52,192) size 699x18 - LayoutText {#text} at (0,0) size 336x18 - text run at (0,0) width 336: "This paragraph should have a left margin of 1.27cm." - LayoutBlockFlow {P} at (52,226) size 699x18 - LayoutText {#text} at (0,0) size 341x18 - text run at (0,0) width 341: "This paragraph should have a left margin of 12.7mm." - LayoutBlockFlow {P} at (52,260) size 699x18 - LayoutText {#text} at (0,0) size 348x18 - text run at (0,0) width 348: "This paragraph should have a left margin of 36 points." - LayoutBlockFlow {P} at (52,294) size 699x18 - LayoutText {#text} at (0,0) size 333x18 - text run at (0,0) width 333: "This paragraph should have a left margin of 3 picas." - LayoutBlockFlow {P} at (52,328) size 699x18 - LayoutText {#text} at (0,0) size 603x18 - text run at (0,0) width 603: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - LayoutBlockFlow {P} at (4,386) size 747x276 [bgcolor=#00FFFF] [border: none (17.94px solid #800080)] - LayoutText {#text} at (17,0) size 310x46 - text run at (17,0) width 310: "This element has a " - LayoutInline {CODE} at (0,0) size 217x46 - LayoutText {#text} at (326,0) size 217x46 - text run at (326,0) width 217: "font-size" - LayoutText {#text} at (542,0) size 55x46 - text run at (542,0) width 55: " of " - LayoutInline {CODE} at (0,0) size 97x46 - LayoutText {#text} at (596,0) size 97x46 - text run at (596,0) width 97: "40px" - LayoutText {#text} at (17,46) size 97x46 - text run at (17,46) width 97: "and a " - LayoutInline {CODE} at (0,0) size 265x46 - LayoutText {#text} at (113,46) size 265x46 - text run at (113,46) width 265: "border-left" - LayoutText {#text} at (377,46) size 54x46 - text run at (377,46) width 54: " of " - LayoutInline {CODE} at (0,0) size 630x92 - LayoutText {#text} at (430,46) size 630x92 - text run at (430,46) width 217: "1ex solid" - text run at (17,92) width 145: "purple" - LayoutText {#text} at (161,92) size 708x184 - text run at (161,92) width 21: ". " - text run at (181,92) width 522: "This should make the left border" - text run at (17,138) width 708: "the same number of pixels as the lower-case" - text run at (17,184) width 642: "'x' in this element's font, as well as solid" - text run at (17,230) width 114: "purple." -layer at (8,220) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,212) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/percentage_units-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/percentage_units-expected.png deleted file mode 100644 index 26afa66..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/percentage_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/percentage_units-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/percentage_units-expected.txt deleted file mode 100644 index 582540ac..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/percentage_units-expected.txt +++ /dev/null
@@ -1,67 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x75 - LayoutText {#text} at (0,0) size 492x75 - text run at (0,0) width 219: ".zero { background: yellow }" - text run at (218,0) width 1: " " - text run at (0,15) width 492: ".one { margin-left: 25%; margin-right: 25%; background: white }" - text run at (491,15) width 1: " " - text run at (0,30) width 484: ".two { margin-left: 50%; margin-right: 0%; background: white }" - text run at (483,30) width 1: " " - text run at (0,45) width 203: ".three {margin-left: 25%;}" - text run at (202,45) width 1: " " - text run at (0,60) width 0: " " - LayoutBlockFlow {DIV} at (0,140) size 784x124 [bgcolor=#FFFF00] - LayoutBlockFlow {DIV} at (196,0) size 392x54 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 392x54 - LayoutText {#text} at (0,0) size 332x54 - text run at (0,0) width 332: "This paragraph should be centered within its yellow" - text run at (0,18) width 330: "containing block and its width should be half of the" - text run at (0,36) width 112: "containing block." - LayoutBlockFlow {DIV} at (392,70) size 392x54 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 392x54 - LayoutText {#text} at (0,0) size 361x54 - text run at (0,0) width 361: "This paragraph should be right-aligned within its yellow" - text run at (0,18) width 330: "containing block and its width should be half of the" - text run at (0,36) width 112: "containing block." - LayoutBlockFlow {P} at (196,280) size 588x36 - LayoutText {#text} at (0,0) size 560x36 - text run at (0,0) width 560: "This paragraph should have a left margin of 25% the width of its parent element, which" - text run at (0,18) width 366: "should require some extra text in order to test effectively." - LayoutTable {TABLE} at (0,332) size 784x212 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x210 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x184 - LayoutTableCell {TD} at (0,105) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x184 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {DIV} at (4,4) size 762x124 [bgcolor=#FFFF00] - LayoutBlockFlow {DIV} at (190.50,0) size 381x54 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 381x54 - LayoutText {#text} at (0,0) size 332x54 - text run at (0,0) width 332: "This paragraph should be centered within its yellow" - text run at (0,18) width 330: "containing block and its width should be half of the" - text run at (0,36) width 112: "containing block." - LayoutBlockFlow {DIV} at (381,70) size 381x54 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 381x54 - LayoutText {#text} at (0,0) size 361x54 - text run at (0,0) width 361: "This paragraph should be right-aligned within its yellow" - text run at (0,18) width 330: "containing block and its width should be half of the" - text run at (0,36) width 112: "containing block." - LayoutBlockFlow {P} at (194.50,144) size 571.50x36 - LayoutText {#text} at (0,0) size 560x36 - text run at (0,0) width 560: "This paragraph should have a left margin of 25% the width of its parent element, which" - text run at (0,18) width 366: "should require some extra text in order to test effectively." -layer at (8,130) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,122) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/urls-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/urls-expected.txt deleted file mode 100644 index 24cd269c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/css1/units/urls-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutText {#text} at (0,0) size 363x18 - text run at (0,0) width 363: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,34) size 784x60 - LayoutText {#text} at (0,0) size 632x60 - text run at (0,0) width 632: "<LINK rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../resources/bg.gif\">" - text run at (631,0) width 1: " " - text run at (0,15) width 289: "@import url(../resources/sec642.css);" - text run at (288,15) width 1: " " - text run at (0,30) width 344: "BODY {background: url(../resources/bg.gif);}" - text run at (343,30) width 1: " " - text run at (0,45) width 0: " " - LayoutBlockFlow {P} at (0,125) size 784x18 - LayoutText {#text} at (0,0) size 393x18 - text run at (0,0) width 393: "This page should have a green grid pattern as its background." - LayoutBlockFlow {P} at (0,159) size 784x54 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 784x54 - text run at (0,0) width 627: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (626,0) width 153: "If an image, in this case" - text run at (0,18) width 784: "a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,36) width 277: "document's URL, not the stylesheet's URL." - LayoutBlockFlow {P} at (0,229) size 784x54 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 784x54 - text run at (0,0) width 627: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (626,0) width 153: "If an image, in this case" - text run at (0,18) width 784: "a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,36) width 277: "document's URL, not the stylesheet's URL." - LayoutTable {TABLE} at (0,299) size 784x194 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x192 - LayoutTableRow {TR} at (0,0) size 782x26 - LayoutTableCell {TD} at (0,0) size 782x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 161x18 - LayoutText {#text} at (4,4) size 161x18 - text run at (4,4) width 161: "TABLE Testing Section" - LayoutTableRow {TR} at (0,26) size 782x166 - LayoutTableCell {TD} at (0,96) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x18 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,26) size 770x166 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x18 - LayoutText {#text} at (0,0) size 393x18 - text run at (0,0) width 393: "This page should have a green grid pattern as its background." - LayoutBlockFlow {P} at (4,38) size 762x54 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 748x54 - text run at (0,0) width 627: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (626,0) width 122: "If an image, in this" - text run at (0,18) width 722: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in" - text run at (0,36) width 370: "relation to the document's URL, not the stylesheet's URL." - LayoutBlockFlow {P} at (4,108) size 762x54 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 748x54 - text run at (0,0) width 627: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (626,0) width 122: "If an image, in this" - text run at (0,18) width 722: "case a red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in" - text run at (0,36) width 370: "relation to the document's URL, not the stylesheet's URL." -layer at (8,115) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,107) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png deleted file mode 100644 index 6803bb3b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png deleted file mode 100644 index 0603a7b..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/append-cells2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/append-cells2-expected.png deleted file mode 100644 index 7ba7c2d..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/append-cells2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png deleted file mode 100644 index bfbf6d0..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png deleted file mode 100644 index c558c51..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png deleted file mode 100644 index c558c51..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png deleted file mode 100644 index 630872cf..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png deleted file mode 100644 index f1e8b96..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png deleted file mode 100644 index 3636829..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png deleted file mode 100644 index 906421a0..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png deleted file mode 100644 index d22a3a85..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png deleted file mode 100644 index bd923b7..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png deleted file mode 100644 index 2862b412..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png deleted file mode 100644 index 73a24ba..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png deleted file mode 100644 index 5c9cd35..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/edge-offsets-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/edge-offsets-expected.png deleted file mode 100644 index cd65d36..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/edge-offsets-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png deleted file mode 100644 index 4336954..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png deleted file mode 100644 index 29fab50..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/form-with-table-style-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/form-with-table-style-expected.png deleted file mode 100644 index 6f417df..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/form-with-table-style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/generated-caption-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/generated-caption-expected.png deleted file mode 100644 index 5c1a083..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/generated-caption-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png deleted file mode 100644 index 9cb7c77..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png deleted file mode 100644 index 5f1361c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png deleted file mode 100644 index 5f1361c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png deleted file mode 100644 index 40ad4e6..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png deleted file mode 100644 index a34edcc..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png deleted file mode 100644 index 62b588e..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/remove-td-display-none-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/row-height-recalc-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/row-height-recalc-expected.png deleted file mode 100644 index f00dbe78..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/row-height-recalc-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png deleted file mode 100644 index 4eefeea4..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png deleted file mode 100644 index 7a1ab8d7..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/spanOverlapRepaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png deleted file mode 100644 index be5fb1361..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png deleted file mode 100644 index 47a2110..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/tbody-background-image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/tbody-background-image-expected.png deleted file mode 100644 index ab1318c..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/tbody-background-image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png deleted file mode 100644 index 476cc880..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png deleted file mode 100644 index 7ddbaae..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/filesystem/input-display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt deleted file mode 100644 index cd35681..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/filesystem/input-display-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x188 - LayoutBlockFlow {HTML} at (0,0) size 800x188 - LayoutBlockFlow {BODY} at (8,8) size 784x170 - LayoutBlockFlow {DIV} at (0,0) size 102x102 [border: (1px solid #000000)] - LayoutBlockFlow {FORM} at (0,152) size 784x18 - LayoutBlockFlow {P} at (0,0) size 784x18 - LayoutFileUploadControl {INPUT} at (0,0) size 238x18 "hello.txt" - LayoutButton {INPUT} at (0,0) size 77.33x18 [bgcolor=#FFFFFF] - LayoutBlockFlow (anonymous) at (8,2) size 61.33x13 - LayoutText {#text} at (0,0) size 62x13 - text run at (0,0) width 62: "Choose File" - LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/local/file-url-sent-as-referer-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/local/file-url-sent-as-referer-expected.png deleted file mode 100644 index 0ea0d97..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/local/file-url-sent-as-referer-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/acid2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/acid2-expected.png deleted file mode 100644 index 453212bb..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/acid2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/acid3-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/acid3-expected.png deleted file mode 100644 index f54a64f3..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/acid3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/iframe404-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/iframe404-expected.png deleted file mode 100644 index 8b8f61a..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/iframe404-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt deleted file mode 100644 index d20b4ab5..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,8) size 304x154 - LayoutIFrame {IFRAME} at (0,0) size 304x154 [border: (2px inset #EEEEEE)] - layer at (0,0) size 300x150 - LayoutView at (0,0) size 300x150 - layer at (0,0) size 300x150 - LayoutBlockFlow {HTML} at (0,0) size 300x150 - LayoutBlockFlow {BODY} at (8,8) size 284x134 - LayoutText {#text} at (0,0) size 70x18 - text run at (0,0) width 70: "SUCCESS"
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png deleted file mode 100644 index 8f714646..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt deleted file mode 100644 index 46c2304..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt +++ /dev/null
@@ -1,66 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x464 - LayoutBlockFlow {HTML} at (0,0) size 800x463.50 - LayoutBlockFlow {BODY} at (4,4) size 136x451 [border: (0.50px dashed #C0C0C0)] - LayoutBlockFlow {P} at (0.50,9.50) size 135x27 - LayoutText {#text} at (0,-1) size 131x28 - text run at (0,-1) width 125: "The following six blue boxes must" - text run at (0,8) width 131: "be of the same width. There must be" - text run at (0,17) width 25: "no red." - LayoutBlockFlow {P} at (9.50,45.50) size 117x27 [bgcolor=#008000] [border: (9px solid #0000FF)] - LayoutText {#text} at (9,8) size 3x10 - text run at (9,8) width 3: " " - LayoutBlockFlow {P} at (0.50,126.50) size 135x9 - LayoutText {#text} at (0,-1) size 14x10 - text run at (0,-1) width 14: " " - LayoutBlockFlow {P} at (0.50,189.50) size 135x9 - LayoutTable (anonymous) at (0.50,252.50) size 135x45 - LayoutTableSection (anonymous) at (0,0) size 135x45 - LayoutTableRow (anonymous) at (0,0) size 135x45 - LayoutTableCell {P} at (0,0) size 135x44.75 [r=0 c=0 rs=1 cs=1] - LayoutTable {TABLE} at (0.50,351.50) size 135x45 - LayoutTableSection {TBODY} at (0,0) size 135x45 - LayoutTableRow {TR} at (0,0) size 135x45 - LayoutTableCell {TD} at (0,0) size 135x44.75 [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow (floating) {P} at (0.50,450.50) size 135x9 -layer at (14,131) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,194) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,257) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,356) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,455) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png deleted file mode 100644 index 595bdf0..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png deleted file mode 100644 index 5c897cc..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt deleted file mode 100644 index d01cd23..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x52 - LayoutBlockFlow {HTML} at (0,0) size 800x52 - LayoutBlockFlow {BODY} at (8,8) size 784x36 - LayoutText {#text} at (0,0) size 640x18 - text run at (0,0) width 640: "This tests slow loading png images referenced from a image element inside a SVG pattern resource." - LayoutBR {BR} at (639,0) size 1x18 - LayoutText {#text} at (0,18) size 572x18 - text run at (0,18) width 572: "You should see a 400x300 rect containing a tiled rendering of the Acid3 reference image." -layer at (10,50) size 406x306 clip at (13,53) size 400x300 - LayoutSVGRoot (positioned) {svg} at (10,50) size 406x306 - LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 - LayoutSVGResourcePattern {pattern} [id="pattern"] [patternUnits=userSpaceOnUse] [patternContentUnits=userSpaceOnUse] - LayoutSVGImage {image} at (0,0) size 800x600 - LayoutSVGRect {rect} at (0,0) size 400x300 [fill={[type=PATTERN] [id="pattern"]}] [x=0.00] [y=0.00] [width=400.00] [height=300.00]
diff --git a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/uri/css-href-expected.png b/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/uri/css-href-expected.png deleted file mode 100644 index 5e2fdbb..0000000 --- a/third_party/blink/web_tests/platform/mac/virtual/mojo-loading/http/tests/uri/css-href-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/comments-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/comments-expected.png deleted file mode 100644 index aaaaf63..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/comments-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/comments-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/comments-expected.txt deleted file mode 100644 index 28983be..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/comments-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 921 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x921 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x921 - LayoutBlockFlow {BODY} at (8,8) size 769x905 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x240 - LayoutText {#text} at (0,0) size 336x240 - text run at (0,0) width 232: "/* This is a CSS1 comment. */" - text run at (232,0) width 0: " " - text run at (0,16) width 336: ".one {color: green;} /* Another comment */" - text run at (336,16) width 0: " " - text run at (0,32) width 288: "/* The following should not be used:" - text run at (288,32) width 0: " " - text run at (0,48) width 168: ".two {color: red;} */" - text run at (168,48) width 0: " " - text run at (0,64) width 320: ".three {color: green; /* color: red; */}" - text run at (320,64) width 0: " " - text run at (0,80) width 24: "/**" - text run at (24,80) width 0: " " - text run at (0,96) width 176: ".four {color: red;} */" - text run at (176,96) width 0: " " - text run at (0,112) width 168: ".five {color: green;}" - text run at (168,112) width 0: " " - text run at (0,128) width 32: "/**/" - text run at (32,128) width 0: " " - text run at (0,144) width 160: ".six {color: green;}" - text run at (160,144) width 0: " " - text run at (0,160) width 88: "/*********/" - text run at (88,160) width 0: " " - text run at (0,176) width 176: ".seven {color: green;}" - text run at (176,176) width 0: " " - text run at (0,192) width 128: "/* a comment **/" - text run at (128,192) width 0: " " - text run at (0,208) width 176: ".eight {color: green;}" - text run at (176,208) width 0: " " - text run at (0,224) width 0: " " - LayoutBlockFlow {P} at (0,307) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,343) size 769x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (0,379) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,415) size 769x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (0,451) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,487) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,523) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,559) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutTable {TABLE} at (0,595) size 206x310 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 204x308 - LayoutTableRow {TR} at (0,0) size 204x28 - LayoutTableCell {TD} at (0,0) size 204x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 204x280 - LayoutTableCell {TD} at (0,154) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 192x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 184x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (4,76) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,112) size 184x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (4,148) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,184) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,220) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,256) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." -layer at (8,297) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,289) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/containment-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/containment-expected.png deleted file mode 100644 index 8586981e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/containment-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/containment-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/containment-expected.txt deleted file mode 100644 index ec868c63..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/containment-expected.txt +++ /dev/null
@@ -1,210 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1009 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1009 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1009 - LayoutBlockFlow {BODY} at (8,8) size 769x993 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x160 - LayoutText {#text} at (0,0) size 728x160 - text run at (0,0) width 624: "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"linktest.css\" title=\"Default SS\">" - text run at (624,0) width 0: " " - text run at (0,16) width 728: "<LINK rel=\"alternate stylesheet\" type=\"text/css\" href=\"linktest2.css\" title=\"Alternate SS\">" - text run at (728,16) width 0: " " - text run at (0,32) width 208: "@import url(imptest1.css);" - text run at (208,32) width 0: " " - text run at (0,48) width 192: "@import \"imptest1a.css\";" - text run at (192,48) width 0: " " - text run at (0,64) width 128: "UL {color: red;}" - text run at (128,64) width 0: " " - text run at (0,80) width 176: ".four {color: purple;}" - text run at (176,80) width 0: " " - text run at (0,96) width 208: "@import url(imptest2.css);" - text run at (208,96) width 0: " " - text run at (0,112) width 32: "<!--" - text run at (32,112) width 0: " " - text run at (0,128) width 168: "P.six {color: green;}" - text run at (168,128) width 0: " " - text run at (0,144) width 24: "-->" - text run at (24,144) width 0: " " - LayoutBlockFlow {P} at (0,227) size 769x20 - LayoutText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "This sentence should be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (383,3) size 96x16 - text run at (383,3) width 96: "linktest.css" - LayoutText {#text} at (479,0) size 242x19 - text run at (479,0) width 242: ", the reference to which is shown above." - LayoutBlockFlow {P} at (0,263) size 769x40 - LayoutText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "This sentence should NOT be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 104x16 - LayoutText {#text} at (420,3) size 104x16 - text run at (420,3) width 104: "linktest2.css" - LayoutText {#text} at (524,0) size 8x19 - text run at (524,0) width 8: ", " - LayoutInline {STRONG} at (0,0) size 42x19 - LayoutText {#text} at (532,0) size 42x19 - text run at (532,0) width 42: "unless" - LayoutText {#text} at (574,0) size 713x39 - text run at (574,0) width 139: " the external style sheet" - text run at (0,20) width 309: "\"Alternate SS\" has been selected via the user agent." - LayoutBlockFlow {UL} at (0,319) size 769x60 [color=#FF0000] - LayoutListItem {LI} at (40,0) size 729x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 373x19 - text run at (0,0) width 373: "This sentence should be green due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 208x16 - LayoutText {#text} at (373,3) size 208x16 - text run at (373,3) width 208: "@import url(imptest1.css);" - LayoutText {#text} at (581,0) size 9x19 - text run at (581,0) width 9: "]." - LayoutListItem {LI} at (40,20) size 729x20 [color=#800080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 378x19 - text run at (0,0) width 378: "This sentence should be purple due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 184x16 - LayoutText {#text} at (378,3) size 184x16 - text run at (378,3) width 184: "@import \"imptest1a.css\"" - LayoutText {#text} at (562,0) size 9x19 - text run at (562,0) width 9: "]." - LayoutListItem {LI} at (40,40) size 729x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 374x19 - text run at (0,0) width 374: "This sentence should be green thanks to the STYLE attribute [" - LayoutInline {CODE} at (0,0) size 168x16 - LayoutText {#text} at (374,3) size 168x16 - text run at (374,3) width 168: "STYLE=\"color: green;\"" - LayoutText {#text} at (542,0) size 9x19 - text run at (542,0) width 9: "]." - LayoutBlockFlow {P} at (0,395) size 769x20 [color=#800080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 476: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - LayoutBlockFlow {OL} at (0,431) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This list should NOT be purple." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "2" - LayoutText {#text} at (0,0) size 166x19 - text run at (0,0) width 166: "It should, instead, be black." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 483x19 - text run at (0,0) width 483: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - LayoutBlockFlow {P} at (0,507) size 769x40 - LayoutText {#text} at (0,0) size 668x19 - text run at (0,0) width 188: "This sentence should be black. " - text run at (188,0) width 480: "If it is red, then the browser has inappropriately imported the styles from the file " - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (668,3) size 96x16 - text run at (668,3) width 96: "imptest2.css" - LayoutText {#text} at (0,20) size 29x19 - text run at (0,20) width 29: "(see " - LayoutInline {A} at (0,0) size 66x19 [color=#0000FF] - LayoutText {#text} at (29,20) size 66x19 - text run at (29,20) width 66: "section 3.0" - LayoutText {#text} at (95,20) size 264x19 - text run at (95,20) width 264: " of the CSS1 specification for more details)." - LayoutBlockFlow {P} at (0,563) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This paragraph should be green." - LayoutTable {TABLE} at (0,599) size 769x394 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x392 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x364 - LayoutTableCell {TD} at (0,196) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x364 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "This sentence should be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (383,3) size 96x16 - text run at (383,3) width 96: "linktest.css" - LayoutText {#text} at (479,0) size 242x19 - text run at (479,0) width 242: ", the reference to which is shown above." - LayoutBlockFlow {P} at (4,40) size 747x40 - LayoutText {#text} at (0,0) size 420x19 - text run at (0,0) width 420: "This sentence should NOT be underlined due to the linked style sheet " - LayoutInline {CODE} at (0,0) size 104x16 - LayoutText {#text} at (420,3) size 104x16 - text run at (420,3) width 104: "linktest2.css" - LayoutText {#text} at (524,0) size 8x19 - text run at (524,0) width 8: ", " - LayoutInline {STRONG} at (0,0) size 42x19 - LayoutText {#text} at (532,0) size 42x19 - text run at (532,0) width 42: "unless" - LayoutText {#text} at (574,0) size 713x39 - text run at (574,0) width 139: " the external style sheet" - text run at (0,20) width 309: "\"Alternate SS\" has been selected via the user agent." - LayoutBlockFlow {UL} at (4,96) size 747x60 [color=#FF0000] - LayoutListItem {LI} at (40,0) size 707x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 373x19 - text run at (0,0) width 373: "This sentence should be green due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 208x16 - LayoutText {#text} at (373,3) size 208x16 - text run at (373,3) width 208: "@import url(imptest1.css);" - LayoutText {#text} at (581,0) size 9x19 - text run at (581,0) width 9: "]." - LayoutListItem {LI} at (40,20) size 707x20 [color=#800080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 378x19 - text run at (0,0) width 378: "This sentence should be purple due to an imported style sheet [" - LayoutInline {CODE} at (0,0) size 184x16 - LayoutText {#text} at (378,3) size 184x16 - text run at (378,3) width 184: "@import \"imptest1a.css\"" - LayoutText {#text} at (562,0) size 9x19 - text run at (562,0) width 9: "]." - LayoutListItem {LI} at (40,40) size 707x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 374x19 - text run at (0,0) width 374: "This sentence should be green thanks to the STYLE attribute [" - LayoutInline {CODE} at (0,0) size 168x16 - LayoutText {#text} at (374,3) size 168x16 - text run at (374,3) width 168: "STYLE=\"color: green;\"" - LayoutText {#text} at (542,0) size 9x19 - text run at (542,0) width 9: "]." - LayoutBlockFlow {P} at (4,172) size 747x20 [color=#800080] - LayoutText {#text} at (0,0) size 476x19 - text run at (0,0) width 476: "This sentence should be purple, and it doesn't have a terminating paragraph tag." - LayoutBlockFlow {OL} at (4,208) size 747x60 - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This list should NOT be purple." - LayoutListItem {LI} at (40,20) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "2" - LayoutText {#text} at (0,0) size 166x19 - text run at (0,0) width 166: "It should, instead, be black." - LayoutListItem {LI} at (40,40) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 483x19 - text run at (0,0) width 483: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." - LayoutBlockFlow {P} at (4,284) size 747x40 - LayoutText {#text} at (0,0) size 664x19 - text run at (0,0) width 188: "This sentence should be black. " - text run at (188,0) width 476: "If it is red, then the browser has inappropriately imported the styles from the file" - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (0,23) size 96x16 - text run at (0,23) width 96: "imptest2.css" - LayoutText {#text} at (96,20) size 33x19 - text run at (96,20) width 33: " (see " - LayoutInline {A} at (0,0) size 66x19 [color=#0000FF] - LayoutText {#text} at (129,20) size 66x19 - text run at (129,20) width 66: "section 3.0" - LayoutText {#text} at (195,20) size 264x19 - text run at (195,20) width 264: " of the CSS1 specification for more details)." - LayoutBlockFlow {P} at (4,340) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This paragraph should be green." -layer at (8,217) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,209) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png deleted file mode 100644 index 493438e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/contextual_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt deleted file mode 100644 index 3f3e59a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/contextual_selectors-expected.txt +++ /dev/null
@@ -1,83 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 472x64 - text run at (0,0) width 288: "P {color: navy; font-family: serif;}" - text run at (288,0) width 0: " " - text run at (0,16) width 472: "HTML BODY TABLE P {color: purple; font-family: sans-serif;}" - text run at (472,16) width 0: " " - text run at (0,32) width 224: "EM, UL LI LI {color: green;}" - text run at (224,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - LayoutBlockFlow {P} at (0,167) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 532x19 - text run at (0,0) width 532: "This sentence should be normal for its section, except for the last word, which should be " - LayoutInline {EM} at (0,0) size 36x19 [color=#008000] - LayoutText {#text} at (532,0) size 36x19 - text run at (532,0) width 36: "green" - LayoutText {#text} at (567,0) size 5x19 - text run at (567,0) width 5: "." - LayoutBlockFlow {UL} at (0,203) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutBlockFlow (anonymous) at (0,0) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutInline {EM} at (0,0) size 38x19 [color=#008000] - LayoutText {#text} at (0,0) size 38x19 - text run at (0,0) width 38: "Hello." - LayoutText {#text} at (38,0) size 376x19 - text run at (38,0) width 4: " " - text run at (42,0) width 372: "The first \"hello\" should be green, but this part should be black." - LayoutBlockFlow {UL} at (0,20) size 744x20 - LayoutListItem {LI} at (40,0) size 704x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." - LayoutTable {TABLE} at (0,259) size 699x165 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 697x163 - LayoutTableRow {TR} at (0,0) size 697x28 - LayoutTableCell {TD} at (0,0) size 697x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 697x135 - LayoutTableCell {TD} at (0,81) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 685x135 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 677x19 [color=#800080] - LayoutText {#text} at (0,0) size 677x18 - text run at (0,0) width 677: "This sentence should be navy serif in the first half of the page, but purple and sans-serif in the table." - LayoutBlockFlow {P} at (4,39) size 677x20 [color=#800080] - LayoutText {#text} at (0,1) size 603x18 - text run at (0,1) width 603: "This sentence should be normal for its section, except for the last word, which should be " - LayoutInline {EM} at (0,0) size 41x19 [color=#008000] - LayoutText {#text} at (603,0) size 41x19 - text run at (603,0) width 41: "green" - LayoutText {#text} at (644,1) size 4x18 - text run at (644,1) width 4: "." - LayoutBlockFlow {UL} at (4,75) size 677x40 - LayoutListItem {LI} at (40,0) size 637x40 - LayoutBlockFlow (anonymous) at (0,0) size 637x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutInline {EM} at (0,0) size 38x19 [color=#008000] - LayoutText {#text} at (0,0) size 38x19 - text run at (0,0) width 38: "Hello." - LayoutText {#text} at (38,0) size 376x19 - text run at (38,0) width 4: " " - text run at (42,0) width 372: "The first \"hello\" should be green, but this part should be black." - LayoutBlockFlow {UL} at (0,20) size 637x20 - LayoutListItem {LI} at (40,0) size 597x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "This should be green." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/grouping-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/grouping-expected.png deleted file mode 100644 index fc148325..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/grouping-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/grouping-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/grouping-expected.txt deleted file mode 100644 index a83001a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/grouping-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 272x32 - text run at (0,0) width 272: ".one, .two, .three {color: green;}" - text run at (272,0) width 0: " " - text run at (0,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,135) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,171) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutTable {TABLE} at (0,207) size 206x130 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 204x128 - LayoutTableRow {TR} at (0,0) size 204x28 - LayoutTableCell {TD} at (0,0) size 204x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 204x100 - LayoutTableCell {TD} at (0,64) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 192x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,76) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/id_as_selector-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/id_as_selector-expected.png deleted file mode 100644 index 9596269..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/id_as_selector-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt deleted file mode 100644 index c5af05d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/id_as_selector-expected.txt +++ /dev/null
@@ -1,93 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 659 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x659 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x659 - LayoutBlockFlow {BODY} at (8,8) size 769x643 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x128 - LayoutText {#text} at (0,0) size 272x128 - text run at (0,0) width 160: "#one {color: green;}" - text run at (160,0) width 0: " " - text run at (0,16) width 152: "#a1 {color: green;}" - text run at (152,16) width 0: " " - text run at (0,32) width 224: "P#two, P#two2 {color: blue;}" - text run at (224,32) width 0: " " - text run at (0,48) width 272: "P#three, P#three2 {color: purple;}" - text run at (272,48) width 0: " " - text run at (0,64) width 168: "#four {color: green;}" - text run at (168,64) width 0: " " - text run at (0,80) width 152: "#a2 {color: green;}" - text run at (152,80) width 0: " " - text run at (0,96) width 240: "P#five, P#five2 {color: blue;}" - text run at (240,96) width 0: " " - text run at (0,112) width 240: "P#six, P#six2 {color: purple;}" - LayoutBlockFlow {P} at (0,195) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,231) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,267) size 769x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This paragraph should be blue [" - LayoutInline {TT} at (0,0) size 64x16 - LayoutText {#text} at (190,3) size 64x16 - text run at (190,3) width 64: "ID=\"two\"" - LayoutText {#text} at (254,0) size 9x19 - text run at (254,0) width 9: "]." - LayoutBlockFlow {PRE} at (0,303) size 769x16 - LayoutText {#text} at (0,0) size 392x16 - text run at (0,0) width 392: "This sentence should NOT be blue [PRE ID=\"two2\"]." - text run at (392,0) width 0: " " - LayoutBlockFlow {PRE} at (0,332) size 769x16 - LayoutText {#text} at (0,0) size 472x16 - text run at (0,0) width 472: "This sentence should be black, not purple [PRE ID=\"three\"]." - text run at (472,0) width 0: " " - LayoutBlockFlow {UL} at (0,364) size 769x20 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This sentence should NOT be purple." - LayoutTable {TABLE} at (0,400) size 422x243 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 420x241 - LayoutTableRow {TR} at (0,0) size 420x28 - LayoutTableCell {TD} at (0,0) size 420x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 420x213 - LayoutTableCell {TD} at (0,120) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 408x213 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 400x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 400x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,76) size 400x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 190x19 - text run at (0,0) width 190: "This paragraph should be blue [" - LayoutInline {TT} at (0,0) size 72x16 - LayoutText {#text} at (190,3) size 72x16 - text run at (190,3) width 72: "ID=\"five\"" - LayoutText {#text} at (262,0) size 9x19 - text run at (262,0) width 9: "]." - LayoutBlockFlow {PRE} at (4,112) size 400x16 - LayoutText {#text} at (0,0) size 400x16 - text run at (0,0) width 400: "This sentence should NOT be blue [PRE ID=\"five2\"]." - text run at (400,0) width 0: " " - LayoutBlockFlow {PRE} at (4,141) size 400x16 - LayoutText {#text} at (0,0) size 360x16 - text run at (0,0) width 360: "This sentence should be black [PRE ID=\"six\"]." - text run at (360,0) width 0: " " - LayoutBlockFlow {UL} at (4,173) size 400x20 - LayoutListItem {LI} at (40,0) size 360x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 226x19 - text run at (0,0) width 226: "This sentence should NOT be purple." -layer at (8,185) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,177) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/inheritance-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/inheritance-expected.png deleted file mode 100644 index 70520bcf..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/inheritance-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/inheritance-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/inheritance-expected.txt deleted file mode 100644 index 317647e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/basic/inheritance-expected.txt +++ /dev/null
@@ -1,190 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 768 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x768 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x767.59 - LayoutBlockFlow {BODY} at (8,8) size 784x751.59 [color=#008000] [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x112 - LayoutText {#text} at (0,0) size 272x112 - text run at (0,0) width 160: "BODY {color: green;}" - text run at (160,0) width 0: " " - text run at (0,16) width 136: "H3 {color: blue;}" - text run at (136,16) width 0: " " - text run at (0,32) width 152: "EM {color: purple;}" - text run at (152,32) width 0: " " - text run at (0,48) width 208: ".one {font-style: italic;}" - text run at (208,48) width 0: " " - text run at (0,64) width 272: ".two {text-decoration: underline;}" - text run at (272,64) width 0: " " - text run at (0,80) width 152: "#two {color: navy;}" - text run at (152,80) width 0: " " - text run at (0,96) width 184: ".three {color: purple;}" - text run at (184,96) width 0: " " - LayoutBlockFlow {H3} at (0,181.72) size 784x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 221x22 - text run at (0,0) width 221: "This sentence should show " - LayoutInline {STRONG} at (0,0) size 34x22 - LayoutText {#text} at (221,0) size 34x22 - text run at (221,0) width 34: "blue" - LayoutText {#text} at (255,0) size 40x22 - text run at (255,0) width 40: " and " - LayoutInline {EM} at (0,0) size 52x22 [color=#800080] - LayoutText {#text} at (295,1) size 52x22 - text run at (295,1) width 52: "purple" - LayoutText {#text} at (347,0) size 5x22 - text run at (347,0) width 5: "." - LayoutBlockFlow {H3} at (0,224.44) size 784x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 198x22 - text run at (0,0) width 198: "This sentence should be " - LayoutInline {SPAN} at (0,0) size 35x22 - LayoutText {#text} at (198,1) size 35x22 - text run at (198,1) width 35: "blue" - LayoutText {#text} at (233,0) size 100x22 - text run at (233,0) width 100: " throughout." - LayoutBlockFlow {P} at (0,267.16) size 784x20 - LayoutText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "This should be green except for the " - LayoutInline {EM} at (0,0) size 117x19 [color=#800080] - LayoutText {#text} at (215,0) size 117x19 - text run at (215,0) width 117: "emphasized words" - LayoutText {#text} at (331,0) size 152x19 - text run at (331,0) width 152: ", which should be purple." - LayoutBlockFlow {H3} at (0,305.88) size 784x23 [color=#0000FF] - LayoutText {#text} at (0,0) size 288x22 - text run at (0,0) width 288: "This should be blue and underlined." - LayoutBlockFlow {P} at (0,347.59) size 784x20 - LayoutText {#text} at (0,0) size 273x19 - text run at (0,0) width 273: "This sentence should be underlined, including " - LayoutInline {TT} at (0,0) size 72x16 - LayoutText {#text} at (273,3) size 72x16 - text run at (273,3) width 72: "this part" - LayoutText {#text} at (345,0) size 8x19 - text run at (345,0) width 8: ", " - LayoutInline {I} at (0,0) size 54x19 - LayoutText {#text} at (353,0) size 54x19 - text run at (353,0) width 54: "this part" - LayoutText {#text} at (407,0) size 8x19 - text run at (407,0) width 8: ", " - LayoutInline {EM} at (0,0) size 54x19 [color=#800080] - LayoutText {#text} at (415,0) size 54x19 - text run at (415,0) width 54: "this part" - LayoutText {#text} at (469,0) size 34x19 - text run at (469,0) width 34: ", and " - LayoutInline {STRONG} at (0,0) size 55x19 - LayoutText {#text} at (503,0) size 55x19 - text run at (503,0) width 55: "this part" - LayoutText {#text} at (558,0) size 4x19 - text run at (558,0) width 4: "." - LayoutBlockFlow {P} at (0,383.59) size 784x20 [color=#000080] - LayoutText {#text} at (0,0) size 414x19 - text run at (0,0) width 414: "This sentence should also be underlined, as well as dark blue (navy), " - LayoutInline {TT} at (0,0) size 152x16 - LayoutText {#text} at (414,3) size 152x16 - text run at (414,3) width 152: "including this part" - LayoutText {#text} at (566,0) size 4x19 - text run at (566,0) width 4: "." - LayoutBlockFlow {P} at (0,419.59) size 784x20 [color=#800080] - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "This sentence should be purple, including " - LayoutInline {STRONG} at (0,0) size 55x19 - LayoutText {#text} at (249,0) size 55x19 - text run at (249,0) width 55: "this part" - LayoutText {#text} at (304,0) size 30x19 - text run at (304,0) width 30: " and " - LayoutInline {SPAN} at (0,0) size 164x19 - LayoutText {#text} at (334,0) size 164x19 - text run at (334,0) width 164: "this part (which is spanned)" - LayoutText {#text} at (498,0) size 4x19 - text run at (498,0) width 4: "." - LayoutTable {TABLE} at (0,455.59) size 592x296 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 590x294 - LayoutTableRow {TR} at (0,0) size 590x28 - LayoutTableCell {TD} at (0,0) size 590x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 590x266 - LayoutTableCell {TD} at (0,147) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 578x265.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {H3} at (4,4) size 570x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 221x22 - text run at (0,0) width 221: "This sentence should show " - LayoutInline {STRONG} at (0,0) size 34x22 - LayoutText {#text} at (221,0) size 34x22 - text run at (221,0) width 34: "blue" - LayoutText {#text} at (255,0) size 40x22 - text run at (255,0) width 40: " and " - LayoutInline {EM} at (0,0) size 52x22 [color=#800080] - LayoutText {#text} at (295,1) size 52x22 - text run at (295,1) width 52: "purple" - LayoutText {#text} at (347,0) size 5x22 - text run at (347,0) width 5: "." - LayoutBlockFlow {H3} at (4,46.72) size 570x24 [color=#0000FF] - LayoutText {#text} at (0,0) size 198x22 - text run at (0,0) width 198: "This sentence should be " - LayoutInline {SPAN} at (0,0) size 35x22 - LayoutText {#text} at (198,1) size 35x22 - text run at (198,1) width 35: "blue" - LayoutText {#text} at (233,0) size 100x22 - text run at (233,0) width 100: " throughout." - LayoutBlockFlow {P} at (4,89.44) size 570x20 - LayoutText {#text} at (0,0) size 215x19 - text run at (0,0) width 215: "This should be green except for the " - LayoutInline {EM} at (0,0) size 117x19 [color=#800080] - LayoutText {#text} at (215,0) size 117x19 - text run at (215,0) width 117: "emphasized words" - LayoutText {#text} at (331,0) size 152x19 - text run at (331,0) width 152: ", which should be purple." - LayoutBlockFlow {H3} at (4,128.16) size 570x23 [color=#0000FF] - LayoutText {#text} at (0,0) size 288x22 - text run at (0,0) width 288: "This should be blue and underlined." - LayoutBlockFlow {P} at (4,169.88) size 570x20 - LayoutText {#text} at (0,0) size 273x19 - text run at (0,0) width 273: "This sentence should be underlined, including " - LayoutInline {TT} at (0,0) size 72x16 - LayoutText {#text} at (273,3) size 72x16 - text run at (273,3) width 72: "this part" - LayoutText {#text} at (345,0) size 8x19 - text run at (345,0) width 8: ", " - LayoutInline {I} at (0,0) size 54x19 - LayoutText {#text} at (353,0) size 54x19 - text run at (353,0) width 54: "this part" - LayoutText {#text} at (407,0) size 8x19 - text run at (407,0) width 8: ", " - LayoutInline {EM} at (0,0) size 54x19 [color=#800080] - LayoutText {#text} at (415,0) size 54x19 - text run at (415,0) width 54: "this part" - LayoutText {#text} at (469,0) size 34x19 - text run at (469,0) width 34: ", and " - LayoutInline {STRONG} at (0,0) size 55x19 - LayoutText {#text} at (503,0) size 55x19 - text run at (503,0) width 55: "this part" - LayoutText {#text} at (558,0) size 4x19 - text run at (558,0) width 4: "." - LayoutBlockFlow {P} at (4,205.88) size 570x20 [color=#000080] - LayoutText {#text} at (0,0) size 414x19 - text run at (0,0) width 414: "This sentence should also be underlined, as well as dark blue (navy), " - LayoutInline {TT} at (0,0) size 152x16 - LayoutText {#text} at (414,3) size 152x16 - text run at (414,3) width 152: "including this part" - LayoutText {#text} at (566,0) size 4x19 - text run at (566,0) width 4: "." - LayoutBlockFlow {P} at (4,241.88) size 570x20 [color=#800080] - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "This sentence should be purple, including " - LayoutInline {STRONG} at (0,0) size 55x19 - LayoutText {#text} at (249,0) size 55x19 - text run at (249,0) width 55: "this part" - LayoutText {#text} at (304,0) size 30x19 - text run at (304,0) width 30: " and " - LayoutInline {SPAN} at (0,0) size 164x19 - LayoutText {#text} at (334,0) size 164x19 - text run at (334,0) width 164: "this part (which is spanned)" - LayoutText {#text} at (498,0) size 4x19 - text run at (498,0) width 4: "." -layer at (8,169) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/acid_test-expected.png deleted file mode 100644 index 85557e7..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/acid_test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border-expected.png deleted file mode 100644 index ded3379..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border-expected.txt deleted file mode 100644 index a10a4aea..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border-expected.txt +++ /dev/null
@@ -1,184 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1395 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1395 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1395 - LayoutBlockFlow {BODY} at (8,8) size 769x1379 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 272x144 - text run at (0,0) width 272: ".one {border: medium black solid;}" - text run at (272,0) width 0: " " - text run at (0,16) width 264: ".two {border: thin maroon ridge;}" - text run at (264,16) width 0: " " - text run at (0,32) width 272: ".three {border: 10px teal outset;}" - text run at (272,32) width 0: " " - text run at (0,48) width 264: ".four {border: 10px olive inset;}" - text run at (264,48) width 0: " " - text run at (0,64) width 224: ".five {border: 10px maroon;}" - text run at (224,64) width 0: " " - text run at (0,80) width 232: ".six {border: maroon double;}" - text run at (232,80) width 0: " " - text run at (0,96) width 256: ".seven {border: left red solid;}" - text run at (256,96) width 0: " " - text run at (0,112) width 168: ".eight {border: 0px;}" - text run at (168,112) width 0: " " - text run at (0,128) width 232: "TD {border: 2px solid green;}" - text run at (232,128) width 0: " " - LayoutBlockFlow {P} at (0,211) size 769x40 - LayoutText {#text} at (0,0) size 758x39 - text run at (0,0) width 597: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (597,0) width 161: "This border applies only to" - text run at (0,20) width 254: "the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,267) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 459x19 - text run at (3,3) width 459: "This paragraph should have a medium black solid border all the way around." - LayoutBlockFlow {P} at (0,309) size 769x22 [border: (1px ridge #800000)] - LayoutText {#text} at (1,1) size 456x19 - text run at (1,1) width 456: "This paragraph should have a thin maroon ridged border all the way around." - LayoutBlockFlow {P} at (0,347) size 769x40 [border: (10px outset #008080)] - LayoutText {#text} at (10,10) size 495x19 - text run at (10,10) width 495: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - LayoutBlockFlow {P} at (0,403) size 769x40 [border: (10px inset #808000)] - LayoutText {#text} at (10,10) size 493x19 - text run at (10,10) width 493: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - LayoutBlockFlow {P} at (0,459) size 769x20 - LayoutText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have no border around it, as the " - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (333,3) size 96x16 - text run at (333,3) width 96: "border-style" - LayoutText {#text} at (429,0) size 306x19 - text run at (429,0) width 306: " was not set, and it should not be offset in any way." - LayoutBlockFlow {P} at (0,495) size 769x26 [border: (3px double #800000)] - LayoutText {#text} at (3,3) size 508x19 - text run at (3,3) width 508: "This paragraph should have a medium maroon double border around it, even though " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (511,6) size 96x16 - text run at (511,6) width 96: "border-width" - LayoutText {#text} at (607,3) size 132x19 - text run at (607,3) width 132: " was not explicitly set." - LayoutBlockFlow {P} at (0,537) size 769x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - LayoutBlockFlow {P} at (0,573) size 769x20 - LayoutInline {A} at (0,0) size 23x19 - LayoutText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "The" - LayoutText {#text} at (23,0) size 677x19 - text run at (23,0) width 677: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " - LayoutInline {A} at (0,0) size 16x19 [color=#0000FF] - LayoutImage {IMG} at (699.70,0) size 15x15 - LayoutText {#text} at (714,0) size 5x19 - text run at (714,0) width 5: "." - LayoutTable {TABLE} at (0,609) size 769x121 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x119 - LayoutTableRow {TR} at (0,5) size 767x46 - LayoutTableCell {TD} at (5,5) size 757x46 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,3) size 746x39 - text run at (3,3) width 384: "Every cell in this table should have a 2-pixel solid green border. " - text run at (386,3) width 363: "This is also true of the table-testing section in the second half" - text run at (3,23) width 96: "of the test page." - LayoutTableRow {TR} at (0,56) size 767x58 - LayoutTableCell {TD} at (5,72) size 191x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 50x19 - text run at (3,3) width 50: "Cell one" - LayoutTableCell {TD} at (201,56) size 561x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,3) size 555x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (3,23) size 157x32 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 155x30 - LayoutTableRow {TR} at (0,2) size 155x26 - LayoutTableCell {TD} at (2,2) size 151x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 145x19 - text run at (3,3) width 145: "Nested single-cell table!" - LayoutBlockFlow {P} at (0,746) size 769x20 - LayoutText {#text} at (0,0) size 163x19 - text run at (0,0) width 163: "This is an unstyled element." - LayoutTable {TABLE} at (0,782) size 769x597 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x595 - LayoutTableRow {TR} at (0,0) size 767x30 - LayoutTableCell {TD} at (0,0) size 767x30 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (5,5) size 157x19 - text run at (5,5) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,30) size 767x565 - LayoutTableCell {TD} at (0,297) size 14x30 [bgcolor=#C0C0C0] [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (5,5) size 4x19 - text run at (5,5) width 4: " " - LayoutTableCell {TD} at (14,30) size 753x565 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (5,5) size 743x40 - LayoutText {#text} at (0,0) size 742x39 - text run at (0,0) width 597: "Note that all table cells on this page should have a two-pixel solid green border along all four sides. " - text run at (597,0) width 145: "This border applies only" - text run at (0,20) width 270: "to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (5,61) size 743x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 459x19 - text run at (3,3) width 459: "This paragraph should have a medium black solid border all the way around." - LayoutBlockFlow {P} at (5,103) size 743x22 [border: (1px ridge #800000)] - LayoutText {#text} at (1,1) size 456x19 - text run at (1,1) width 456: "This paragraph should have a thin maroon ridged border all the way around." - LayoutBlockFlow {P} at (5,141) size 743x40 [border: (10px outset #008080)] - LayoutText {#text} at (10,10) size 495x19 - text run at (10,10) width 495: "This paragraph should have a ten-pixel-wide teal outset border all the way around." - LayoutBlockFlow {P} at (5,197) size 743x40 [border: (10px inset #808000)] - LayoutText {#text} at (10,10) size 493x19 - text run at (10,10) width 493: "This paragraph should have a ten-pixel-wide olive inset border all the way around." - LayoutBlockFlow {P} at (5,253) size 743x20 - LayoutText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have no border around it, as the " - LayoutInline {TT} at (0,0) size 96x16 - LayoutText {#text} at (333,3) size 96x16 - text run at (333,3) width 96: "border-style" - LayoutText {#text} at (429,0) size 306x19 - text run at (429,0) width 306: " was not set, and it should not be offset in any way." - LayoutBlockFlow {P} at (5,289) size 743x26 [border: (3px double #800000)] - LayoutText {#text} at (3,3) size 508x19 - text run at (3,3) width 508: "This paragraph should have a medium maroon double border around it, even though " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (511,6) size 96x16 - text run at (511,6) width 96: "border-width" - LayoutText {#text} at (607,3) size 132x19 - text run at (607,3) width 132: " was not explicitly set." - LayoutBlockFlow {P} at (5,331) size 743x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This paragraph should have no border around it, as its declaration is invalid and should be ignored." - LayoutBlockFlow {P} at (5,367) size 743x20 - LayoutInline {A} at (0,0) size 23x19 - LayoutText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "The" - LayoutText {#text} at (23,0) size 677x19 - text run at (23,0) width 677: " following image is also an anchor which points to a target on this page, but it should not have a border around it: " - LayoutInline {A} at (0,0) size 16x19 [color=#0000FF] - LayoutImage {IMG} at (699.70,0) size 15x15 - LayoutText {#text} at (714,0) size 5x19 - text run at (714,0) width 5: "." - LayoutTable {TABLE} at (5,403) size 743x121 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 741x119 - LayoutTableRow {TR} at (0,5) size 741x46 - LayoutTableCell {TD} at (5,5) size 731x46 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,3) size 721x39 - text run at (3,3) width 384: "Every cell in this table should have a 2-pixel solid green border. " - text run at (386,3) width 338: "This is also true of the table-testing section in the second" - text run at (3,23) width 121: "half of the test page." - LayoutTableRow {TR} at (0,56) size 741x58 - LayoutTableCell {TD} at (5,72) size 185x26 [border: (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 50x19 - text run at (3,3) width 50: "Cell one" - LayoutTableCell {TD} at (195,56) size 541x58 [border: (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,3) size 535x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (3,23) size 157x32 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 155x30 - LayoutTableRow {TR} at (0,2) size 155x26 - LayoutTableCell {TD} at (2,2) size 151x26 [border: (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,3) size 145x19 - text run at (3,3) width 145: "Nested single-cell table!" - LayoutBlockFlow {P} at (5,540) size 743x20 - LayoutText {#text} at (0,0) size 163x19 - text run at (0,0) width 163: "This is an unstyled element." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png deleted file mode 100644 index 9eb228c..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt deleted file mode 100644 index a25c8da..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom-expected.txt +++ /dev/null
@@ -1,164 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1063 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1063 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1063 - LayoutBlockFlow {BODY} at (8,8) size 769x1047 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 344x64 - text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" - text run at (328,0) width 0: " " - text run at (0,16) width 320: ".two {border-bottom: purple thin solid;}" - text run at (320,16) width 0: " " - text run at (0,32) width 344: ".three {border-bottom: black medium solid;}" - text run at (344,32) width 0: " " - text run at (0,48) width 288: "TD {border-bottom: green 2px solid;}" - text run at (288,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x40 - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 629: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (629,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,187) size 769x30 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 421x19 - text run at (0,0) width 421: "This paragraph should have a purple, double, 10-pixel bottom border." - LayoutBlockFlow {P} at (0,233) size 769x21 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 339x19 - text run at (0,0) width 339: "This paragraph should have a thin purple bottom border." - LayoutTable {TABLE} at (0,270) size 769x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x116 - LayoutTableRow {TR} at (0,5) size 767x45 - LayoutTableCell {TD} at (5,5) size 757x45 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 721x39 - text run at (2,2) width 431: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (432,2) width 291: "This is also true of the table-testing section in the" - text run at (2,22) width 168: "second half of the test page." - LayoutTableRow {TR} at (0,55) size 767x56 - LayoutTableCell {TD} at (5,70) size 190x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 50x19 - text run at (2,2) width 50: "Cell one" - LayoutTableCell {TD} at (200,55) size 562x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 558x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (2,22) size 155x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 153x29 - LayoutTableRow {TR} at (0,2) size 153x25 - LayoutTableCell {TD} at (2,2) size 149x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,404) size 769x149 - LayoutListItem {LI} at (40,0) size 729x83 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 729x60 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 729x23 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." - LayoutListItem {LI} at (40,106) size 729x43 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 694x39 - text run at (0,0) width 694: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means that it" - text run at (0,20) width 89: "should appear " - LayoutInline {EM} at (0,0) size 51x19 - LayoutText {#text} at (89,20) size 51x19 - text run at (89,20) width 51: "beneath" - LayoutText {#text} at (140,20) size 365x19 - text run at (140,20) width 365: " the nested list (below the line \"...nested within the list item.\")." - LayoutTable {TABLE} at (0,569) size 769x478 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x476 - LayoutTableRow {TR} at (0,0) size 767x29 - LayoutTableCell {TD} at (0,0) size 767x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,29) size 767x447 - LayoutTableCell {TD} at (0,238) size 12x29 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,29) size 755x447 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 629: "Note that all table cells on this page should have a two-pixel solid green border along their bottom sides. " - text run at (629,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,60) size 747x30 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 421x19 - text run at (0,0) width 421: "This paragraph should have a purple, double, 10-pixel bottom border." - LayoutBlockFlow {P} at (4,106) size 747x21 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 339x19 - text run at (0,0) width 339: "This paragraph should have a thin purple bottom border." - LayoutTable {TABLE} at (4,143) size 747x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 745x116 - LayoutTableRow {TR} at (0,5) size 745x45 - LayoutTableCell {TD} at (5,5) size 735x45 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 721x39 - text run at (2,2) width 431: "Every cell in this table should have a 2-pixel solid green bottom border. " - text run at (432,2) width 291: "This is also true of the table-testing section in the" - text run at (2,22) width 168: "second half of the test page." - LayoutTableRow {TR} at (0,55) size 745x56 - LayoutTableCell {TD} at (5,70) size 184x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 50x19 - text run at (2,2) width 50: "Cell one" - LayoutTableCell {TD} at (194,55) size 546x56 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 542x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (2,22) size 155x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 153x29 - LayoutTableRow {TR} at (0,2) size 153x25 - LayoutTableCell {TD} at (2,2) size 149x25 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,277) size 747x149 - LayoutListItem {LI} at (40,0) size 707x83 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 707x60 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 707x23 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." - LayoutListItem {LI} at (40,106) size 707x43 [border: none (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 694x39 - text run at (0,0) width 694: "Each list item in this list should have a medium-width black border at its bottom, which for the first item means that it" - text run at (0,20) width 89: "should appear " - LayoutInline {EM} at (0,0) size 51x19 - LayoutText {#text} at (89,20) size 51x19 - text run at (89,20) width 51: "beneath" - LayoutText {#text} at (140,20) size 365x19 - text run at (140,20) width 365: " the nested list (below the line \"...nested within the list item.\")." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png deleted file mode 100644 index 89d03be..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt deleted file mode 100644 index 0e68cf7a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_inline-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 328x48 - text run at (0,0) width 328: ".one {border-bottom: purple double 10px;}" - text run at (328,0) width 0: " " - text run at (0,16) width 320: ".two {border-bottom: purple thin solid;}" - text run at (320,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 56x29 [border: none (10px double #800080) none] - LayoutText {#text} at (626,0) size 56x19 - text run at (626,0) width 56: "class one" - LayoutText {#text} at (681,0) size 768x39 - text run at (681,0) width 87: ", which should" - text run at (0,20) width 306: "have a 10-pixel purple double bottom border; and " - LayoutInline {SPAN} at (0,0) size 56x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (306,20) size 56x19 - text run at (306,20) width 56: "class two" - LayoutText {#text} at (362,20) size 778x39 - text run at (362,20) width 328: ", which should have a thin solid purple bottom border. " - text run at (689,20) width 89: "The line-height" - text run at (0,40) width 310: "of the parent element should not change on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 56x29 [border: none (10px double #800080) none] - LayoutText {#text} at (626,0) size 56x19 - text run at (626,0) width 56: "class one" - LayoutText {#text} at (681,0) size 725x39 - text run at (681,0) width 44: ", which" - text run at (0,20) width 349: "should have a 10-pixel purple double bottom border; and " - LayoutInline {SPAN} at (0,0) size 56x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (349,20) size 56x19 - text run at (349,20) width 56: "class two" - LayoutText {#text} at (405,20) size 756x39 - text run at (405,20) width 328: ", which should have a thin solid purple bottom border. " - text run at (732,20) width 24: "The" - text run at (0,40) width 375: "line-height of the parent element should not change on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png deleted file mode 100644 index cdeb031f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt deleted file mode 100644 index 9eadb20..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width-expected.txt +++ /dev/null
@@ -1,104 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 919 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x919 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x919 - LayoutBlockFlow {BODY} at (8,8) size 769x903 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 464x96 - text run at (0,0) width 456: ".zero {background-color: silver; border-bottom-width: 0;}" - text run at (456,0) width 0: " " - text run at (0,16) width 432: ".one {border-bottom-width: 50px; border-style: solid;}" - text run at (432,16) width 0: " " - text run at (0,32) width 440: ".two {border-bottom-width: thick; border-style: solid;}" - text run at (440,32) width 0: " " - text run at (0,48) width 464: ".three {border-bottom-width: medium; border-style: solid;}" - text run at (464,48) width 0: " " - text run at (0,64) width 440: ".four {border-bottom-width: thin; border-style: solid;}" - text run at (440,64) width 0: " " - text run at (0,80) width 272: ".five {border-bottom-width: 25px;}" - text run at (272,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x73 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 368x19 - text run at (3,3) width 368: "This element should have a bottom border width of 50 pixels." - LayoutBlockFlow {P} at (0,324) size 769x28 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 327x19 - text run at (3,3) width 327: "This element should have a thick bottom border width." - LayoutBlockFlow {P} at (0,368) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 345x19 - text run at (3,3) width 345: "This element should have a medium bottom border width." - LayoutBlockFlow {P} at (0,410) size 769x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 319x19 - text run at (3,3) width 319: "This element should have a thin bottom border width." - LayoutBlockFlow {P} at (0,450) size 769x20 - LayoutText {#text} at (0,0) size 510x19 - text run at (0,0) width 510: "This element should have no border and no extra \"padding\" on its bottom side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (510,3) size 96x16 - text run at (510,3) width 96: "border-style" - LayoutText {#text} at (606,0) size 53x19 - text run at (606,0) width 53: " was set." - LayoutBlockFlow {P} at (0,486) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutTable {TABLE} at (0,522) size 681x381 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 679x379 - LayoutTableRow {TR} at (0,0) size 679x28 - LayoutTableCell {TD} at (0,0) size 679x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 679x351 - LayoutTableCell {TD} at (0,189) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 667x351 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 659x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 659x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 659x73 [border: (3px solid #000000) (50px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 368x19 - text run at (3,3) width 368: "This element should have a bottom border width of 50 pixels." - LayoutBlockFlow {P} at (4,165) size 659x28 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 327x19 - text run at (3,3) width 327: "This element should have a thick bottom border width." - LayoutBlockFlow {P} at (4,209) size 659x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 345x19 - text run at (3,3) width 345: "This element should have a medium bottom border width." - LayoutBlockFlow {P} at (4,251) size 659x24 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 319x19 - text run at (3,3) width 319: "This element should have a thin bottom border width." - LayoutBlockFlow {P} at (4,291) size 659x20 - LayoutText {#text} at (0,0) size 510x19 - text run at (0,0) width 510: "This element should have no border and no extra \"padding\" on its bottom side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (510,3) size 96x16 - text run at (510,3) width 96: "border-style" - LayoutText {#text} at (606,0) size 53x19 - text run at (606,0) width 53: " was set." - LayoutBlockFlow {P} at (4,327) size 659x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png deleted file mode 100644 index 86f0fae..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt deleted file mode 100644 index 65b10a0..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_bottom_width_inline-expected.txt +++ /dev/null
@@ -1,85 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 432x48 - text run at (0,0) width 432: ".one {border-bottom-width: 25px; border-style: solid;}" - text run at (432,0) width 0: " " - text run at (0,16) width 432: ".two {border-bottom-width: thin; border-style: solid;}" - text run at (432,16) width 0: " " - text run at (0,32) width 280: ".three {border-bottom-width: 25px;}" - text run at (280,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x88 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - LayoutText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 164x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (346,3) size 134x19 - text run at (346,3) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (479,6) size 25x16 - text run at (479,6) width 25: "two" - LayoutText {#text} at (506,3) size 772x39 - text run at (506,3) width 269: ", which should result in a thin solid border on" - text run at (3,23) width 622: "the bottom side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (625,23) width 98: "There is also an " - LayoutInline {SPAN} at (0,0) size 750x39 - LayoutText {#text} at (723,23) size 750x39 - text run at (723,23) width 30: "inline" - text run at (3,43) width 99: "element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (102,46) size 40x16 - text run at (102,46) width 40: "three" - LayoutText {#text} at (142,43) size 570x19 - text run at (142,43) width 570: ", which should have no bottom border width or visible border because no border style was set." - LayoutTable {TABLE} at (0,219) size 784x126 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x124 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x96 - LayoutTableCell {TD} at (0,62) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x88 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - LayoutText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 164x23 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (346,3) size 134x19 - text run at (346,3) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (479,6) size 25x16 - text run at (479,6) width 25: "two" - LayoutText {#text} at (506,3) size 753x39 - text run at (506,3) width 250: ", which should result in a thin solid border" - text run at (3,23) width 641: "on the bottom side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (644,23) width 94: "There is also an" - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (3,43) size 133x19 - text run at (3,43) width 133: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (136,46) size 40x16 - text run at (136,46) width 40: "three" - LayoutText {#text} at (176,43) size 570x19 - text run at (176,43) width 570: ", which should have no bottom border width or visible border because no border style was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color-expected.png deleted file mode 100644 index 5eff7ff..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color-expected.txt deleted file mode 100644 index c93704a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 728x48 - text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" - text run at (392,0) width 0: " " - text run at (0,16) width 568: ".two {border-color: purple; border-width: medium; border-style: solid;}" - text run at (568,16) width 0: " " - text run at (0,32) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - text run at (728,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This element should have a purple border surrounding it." - LayoutBlockFlow {P} at (0,157) size 784x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 427x19 - text run at (3,3) width 427: "This element should have a medium-width purple border surrounding it." - LayoutBlockFlow {P} at (0,199) size 784x46 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (3,3) size 774x39 - text run at (3,3) width 774: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the bottom," - text run at (3,23) width 160: "and yellow on the left side." - LayoutTable {TABLE} at (0,261) size 784x168 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x166 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x138 - LayoutTableCell {TD} at (0,83) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x138 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This element should have a purple border surrounding it." - LayoutBlockFlow {P} at (4,46) size 762x26 [border: (3px solid #800080)] - LayoutText {#text} at (3,3) size 427x19 - text run at (3,3) width 427: "This element should have a medium-width purple border surrounding it." - LayoutBlockFlow {P} at (4,88) size 762x46 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (3,3) size 723x39 - text run at (3,3) width 723: "This element should be surrounded by a medium width border which is purple on top, green on the right side, blue on the" - text run at (3,23) width 211: "bottom, and yellow on the left side." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png deleted file mode 100644 index fbaeed1..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt deleted file mode 100644 index fc1a040b9..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_color_inline-expected.txt +++ /dev/null
@@ -1,76 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 728x48 - text run at (0,0) width 392: ".one {border-color: purple; border-style: solid;}" - text run at (392,0) width 0: " " - text run at (0,16) width 568: ".two {border-color: purple; border-width: medium; border-style: solid;}" - text run at (568,16) width 0: " " - text run at (0,32) width 728: ".three {border-color: purple green blue yellow; border-width: medium; border-style: solid;}" - text run at (728,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x80 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 62x25 [border: (3px solid #800080)] - LayoutText {#text} at (640,0) size 56x19 - text run at (640,0) width 56: "class one" - LayoutText {#text} at (698,0) size 9x19 - text run at (698,0) width 9: ", " - LayoutInline {SPAN} at (0,0) size 63x25 [border: (3px solid #800080)] - LayoutText {#text} at (709,0) size 57x19 - text run at (709,0) width 57: "class two" - LayoutText {#text} at (768,0) size 773x39 - text run at (768,0) width 5: "," - text run at (0,20) width 26: "and " - LayoutInline {SPAN} at (0,0) size 69x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (29,20) size 63x19 - text run at (29,20) width 63: "class three" - LayoutText {#text} at (95,20) size 765x59 - text run at (95,20) width 8: ". " - text run at (103,20) width 662: "The effect for each inline element should be to have a purple medium-width solid border in the first and second" - text run at (0,40) width 473: "cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (473,40) width 284: "The line-height of the parent element should not" - text run at (0,60) width 150: "change at all, on any line." - LayoutTable {TABLE} at (0,211) size 784x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x116 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x88 - LayoutTableCell {TD} at (0,58) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x80 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 62x25 [border: (3px solid #800080)] - LayoutText {#text} at (640,0) size 56x19 - text run at (640,0) width 56: "class one" - LayoutText {#text} at (698,0) size 9x19 - text run at (698,0) width 9: ", " - LayoutInline {SPAN} at (0,0) size 739x45 [border: (3px solid #800080)] - LayoutText {#text} at (709,0) size 739x39 - text run at (709,0) width 30: "class" - text run at (0,20) width 23: "two" - LayoutText {#text} at (26,20) size 34x19 - text run at (26,20) width 34: ", and " - LayoutInline {SPAN} at (0,0) size 69x25 [border: (3px solid #800080) (3px solid #008000) (3px solid #0000FF) (3px solid #FFFF00)] - LayoutText {#text} at (63,20) size 63x19 - text run at (63,20) width 63: "class three" - LayoutText {#text} at (129,20) size 752x59 - text run at (129,20) width 8: ". " - text run at (137,20) width 615: "The effect for each inline element should be to have a purple medium-width solid border in the first and" - text run at (0,40) width 520: "second cases, and a purple-green-blue-yellow medium-width solid border in the third. " - text run at (520,40) width 218: "The line-height of the parent element" - text run at (0,60) width 216: "should not change at all, on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_inline-expected.png deleted file mode 100644 index 074aca728..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt deleted file mode 100644 index 054adaa..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_inline-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 256x48 - text run at (0,0) width 256: ".one {border: 10px teal outset;}" - text run at (256,0) width 0: " " - text run at (0,16) width 256: ".two {border: 10px olive inset;}" - text run at (256,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 76x39 [border: (10px outset #008080)] - LayoutText {#text} at (647,0) size 56x19 - text run at (647,0) width 56: "class one" - LayoutText {#text} at (712,0) size 756x39 - text run at (712,0) width 44: ", which" - text run at (0,20) width 298: "should result in a 10-pixel outset teal border; and " - LayoutInline {SPAN} at (0,0) size 76x39 [border: (10px inset #808000)] - LayoutText {#text} at (308,20) size 56x19 - text run at (308,20) width 56: "class two" - LayoutText {#text} at (374,20) size 779x39 - text run at (374,20) width 317: ", which should result in a 10-pixel inset olive border. " - text run at (690,20) width 89: "The line-height" - text run at (0,40) width 310: "of the parent element should not change on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This is an unstyled element, save for the background color, and containing inline elements with a classes of " - LayoutInline {SPAN} at (0,0) size 76x39 [border: (10px outset #008080)] - LayoutText {#text} at (647,0) size 56x19 - text run at (647,0) width 56: "class one" - LayoutText {#text} at (712,0) size 756x39 - text run at (712,0) width 44: ", which" - text run at (0,20) width 298: "should result in a 10-pixel outset teal border; and " - LayoutInline {SPAN} at (0,0) size 76x39 [border: (10px inset #808000)] - LayoutText {#text} at (308,20) size 56x19 - text run at (308,20) width 56: "class two" - LayoutText {#text} at (374,20) size 744x39 - text run at (374,20) width 317: ", which should result in a 10-pixel inset olive border. " - text run at (690,20) width 54: "The line-" - text run at (0,40) width 349: "height of the parent element should not change on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left-expected.png deleted file mode 100644 index 7046381..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left-expected.txt deleted file mode 100644 index a1397d64..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left-expected.txt +++ /dev/null
@@ -1,164 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1103 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1103 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1103 - LayoutBlockFlow {BODY} at (8,8) size 769x1087 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (20,0) size 749x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 344x112 - text run at (0,0) width 176: "P {margin-left: 20px;}" - text run at (176,0) width 0: " " - text run at (0,16) width 312: ".one {border-left: purple double 10px;}" - text run at (312,16) width 0: " " - text run at (0,32) width 304: ".two {border-left: purple thin solid;}" - text run at (304,32) width 0: " " - text run at (0,48) width 336: ".threea {border-left: black medium solid;}" - text run at (336,48) width 0: " " - text run at (0,64) width 344: ".threeb {border-left: purple medium solid;}" - text run at (344,64) width 0: " " - text run at (0,80) width 328: ".threec {border-left: blue medium solid;}" - text run at (328,80) width 0: " " - text run at (0,96) width 272: "TD {border-left: green 2px solid;}" - text run at (272,96) width 0: " " - LayoutBlockFlow {P} at (20,179) size 749x40 - LayoutText {#text} at (0,0) size 749x39 - text run at (0,0) width 604: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (604,0) width 145: "This border applies only" - text run at (0,20) width 270: "to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (20,235) size 749x20 [border: none (10px double #800080)] - LayoutText {#text} at (10,0) size 396x19 - text run at (10,0) width 396: "This paragraph should have a purple, double, 10-pixel left border." - LayoutBlockFlow {P} at (20,271) size 749x20 [border: none (1px solid #800080)] - LayoutText {#text} at (1,0) size 314x19 - text run at (1,0) width 314: "This paragraph should have a thin purple left border." - LayoutTable {TABLE} at (0,307) size 769x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x113 - LayoutTableRow {TR} at (0,5) size 767x44 - LayoutTableCell {TD} at (5,5) size 757x44 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,2) size 743x39 - text run at (3,2) width 406: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (408,2) width 338: "This is also true of the table-testing section in the second" - text run at (3,22) width 121: "half of the test page." - LayoutTableRow {TR} at (0,54) size 767x54 - LayoutTableCell {TD} at (5,69) size 191x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 50x19 - text run at (3,2) width 50: "Cell one" - LayoutTableCell {TD} at (201,54) size 561x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,2) size 556x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (3,22) size 156x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 154x28 - LayoutTableRow {TR} at (0,2) size 154x24 - LayoutTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 145x19 - text run at (3,2) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,438) size 769x160 - LayoutListItem {LI} at (40,0) size 729x80 [border: none (3px solid #000000)] - LayoutBlockFlow (anonymous) at (3,0) size 726x20 - LayoutListMarker (anonymous) at (-21,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (3,20) size 726x60 - LayoutListItem {LI} at (40,0) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 729x20 [border: none (3px solid #800080)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 149x19 - text run at (3,0) width 149: "This is a second list item." - LayoutListItem {LI} at (40,100) size 729x60 [border: none (3px solid #0000FF)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 707x59 - text run at (3,0) width 658: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors. " - text run at (661,0) width 49: "The first" - text run at (3,20) width 696: "item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the list" - text run at (3,40) width 424: "item.\"), even though the nested list does not have any border styles set." - LayoutTable {TABLE} at (0,614) size 769x473 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x471 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (5,4) size 157x19 - text run at (5,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x443 - LayoutTableCell {TD} at (0,235) size 13x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (5,4) size 4x19 - text run at (5,4) width 4: " " - LayoutTableCell {TD} at (13,28) size 754x443 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (25,4) size 725x40 - LayoutText {#text} at (0,0) size 720x39 - text run at (0,0) width 604: "Note that all table cells on this page should have a two-pixel solid green border along their left sides. " - text run at (604,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (25,60) size 725x20 [border: none (10px double #800080)] - LayoutText {#text} at (10,0) size 396x19 - text run at (10,0) width 396: "This paragraph should have a purple, double, 10-pixel left border." - LayoutBlockFlow {P} at (25,96) size 725x20 [border: none (1px solid #800080)] - LayoutText {#text} at (1,0) size 314x19 - text run at (1,0) width 314: "This paragraph should have a thin purple left border." - LayoutTable {TABLE} at (5,132) size 745x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 743x113 - LayoutTableRow {TR} at (0,5) size 743x44 - LayoutTableCell {TD} at (5,5) size 733x44 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (3,2) size 696x39 - text run at (3,2) width 406: "Every cell in this table should have a 2-pixel solid green left border. " - text run at (408,2) width 291: "This is also true of the table-testing section in the" - text run at (3,22) width 168: "second half of the test page." - LayoutTableRow {TR} at (0,54) size 743x54 - LayoutTableCell {TD} at (5,69) size 185x24 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 50x19 - text run at (3,2) width 50: "Cell one" - LayoutTableCell {TD} at (195,54) size 543x54 [border: (1px inset #808080) (2px solid #008000)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (3,2) size 538x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (3,22) size 156x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 154x28 - LayoutTableRow {TR} at (0,2) size 154x24 - LayoutTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (3,2) size 145x19 - text run at (3,2) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (5,263) size 745x160 - LayoutListItem {LI} at (40,0) size 705x80 [border: none (3px solid #000000)] - LayoutBlockFlow (anonymous) at (3,0) size 702x20 - LayoutListMarker (anonymous) at (-21,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (3,20) size 702x60 - LayoutListItem {LI} at (40,0) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 705x20 [border: none (3px solid #800080)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 149x19 - text run at (3,0) width 149: "This is a second list item." - LayoutListItem {LI} at (40,100) size 705x60 [border: none (3px solid #0000FF)] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (3,0) size 702x59 - text run at (3,0) width 658: "Each list item in this 'parent' list should have a medium-width border along its left side, in each of three colors. " - text run at (661,0) width 23: "The" - text run at (3,20) width 702: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the" - text run at (3,40) width 444: "list item.\"), even though the nested list does not have any border styles set." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png deleted file mode 100644 index 027a1e36..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt deleted file mode 100644 index b66f762..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_inline-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (20,0) size 764x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 312x64 - text run at (0,0) width 176: "P {margin-left: 20px;}" - text run at (176,0) width 0: " " - text run at (0,16) width 312: ".one {border-left: purple double 10px;}" - text run at (312,16) width 0: " " - text run at (0,32) width 304: ".two {border-left: purple thin solid;}" - text run at (304,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (20,131) size 764x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 723x19 - text run at (0,0) width 723: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 762x39 [border: none (10px double #800080)] - LayoutText {#text} at (732,0) size 762x39 - text run at (732,0) width 30: "class" - text run at (0,20) width 22: "one" - LayoutText {#text} at (22,20) size 371x19 - text run at (22,20) width 371: ", which should have a 10-pixel purple double left border; and " - LayoutInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080)] - LayoutText {#text} at (394,20) size 56x19 - text run at (394,20) width 56: "class two" - LayoutText {#text} at (450,20) size 749x39 - text run at (450,20) width 299: ", which should have a thin solid purple left border." - text run at (0,40) width 402: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,207) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (24,4) size 742x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 719x19 - text run at (0,0) width 719: "This paragraph has a background color of silver and a 20-pixel left margin, and it contains inline elements with classes of" - LayoutInline {SPAN} at (0,0) size 65x19 [border: none (10px double #800080)] - LayoutText {#text} at (10,20) size 55x19 - text run at (10,20) width 55: "class one" - LayoutText {#text} at (65,20) size 371x19 - text run at (65,20) width 371: ", which should have a 10-pixel purple double left border; and " - LayoutInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080)] - LayoutText {#text} at (437,20) size 56x19 - text run at (437,20) width 56: "class two" - LayoutText {#text} at (493,20) size 721x39 - text run at (493,20) width 228: ", which should have a thin solid purple" - text run at (0,40) width 71: "left border. " - text run at (70,40) width 403: "The line-height of the parent element should not change on any line." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png deleted file mode 100644 index 934737d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt deleted file mode 100644 index 263ecab..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 793 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x793 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x793 - LayoutBlockFlow {BODY} at (8,8) size 769x777 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 448x96 - text run at (0,0) width 440: ".zero {background-color: silver; border-left-width: 0;}" - text run at (440,0) width 0: " " - text run at (0,16) width 416: ".one {border-left-width: 50px; border-style: solid;}" - text run at (416,16) width 0: " " - text run at (0,32) width 424: ".two {border-left-width: thick; border-style: solid;}" - text run at (424,32) width 0: " " - text run at (0,48) width 448: ".three {border-left-width: medium; border-style: solid;}" - text run at (448,48) width 0: " " - text run at (0,64) width 424: ".four {border-left-width: thin; border-style: solid;}" - text run at (424,64) width 0: " " - text run at (0,80) width 256: ".five {border-left-width: 25px;}" - text run at (256,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x46 [border: (3px solid #000000) (50px solid #000000)] - LayoutText {#text} at (50,3) size 697x39 - text run at (50,3) width 697: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more than one" - text run at (50,23) width 53: "line long." - LayoutBlockFlow {P} at (0,297) size 769x26 [border: (3px solid #000000) (5px solid #000000)] - LayoutText {#text} at (5,3) size 713x19 - text run at (5,3) width 713: "This element should have a thick left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,339) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 731x19 - text run at (3,3) width 731: "This element should have a medium left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,381) size 769x26 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (1,3) size 705x19 - text run at (1,3) width 705: "This element should have a thin left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,423) size 769x20 - LayoutText {#text} at (0,0) size 485x19 - text run at (0,0) width 485: "This element should have no border and no extra \"padding\" on its left side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (485,3) size 96x16 - text run at (485,3) width 96: "border-style" - LayoutText {#text} at (581,0) size 53x19 - text run at (581,0) width 53: " was set." - LayoutTable {TABLE} at (0,459) size 769x318 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x316 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x288 - LayoutTableCell {TD} at (0,158) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x288 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 747x46 [border: (3px solid #000000) (50px solid #000000)] - LayoutText {#text} at (50,3) size 671x39 - text run at (50,3) width 671: "This element should have a left border width of 50 pixels, which will be more obvious if the element is more than" - text run at (50,23) width 79: "one line long." - LayoutBlockFlow {P} at (4,138) size 747x26 [border: (3px solid #000000) (5px solid #000000)] - LayoutText {#text} at (5,3) size 713x19 - text run at (5,3) width 713: "This element should have a thick left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (4,180) size 747x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 731x19 - text run at (3,3) width 731: "This element should have a medium left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (4,222) size 747x26 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (1,3) size 705x19 - text run at (1,3) width 705: "This element should have a thin left border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (4,264) size 747x20 - LayoutText {#text} at (0,0) size 485x19 - text run at (0,0) width 485: "This element should have no border and no extra \"padding\" on its left side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (485,3) size 96x16 - text run at (485,3) width 96: "border-style" - LayoutText {#text} at (581,0) size 53x19 - text run at (581,0) width 53: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png deleted file mode 100644 index 9918a9d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt deleted file mode 100644 index 2f3ebbd..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_left_width_inline-expected.txt +++ /dev/null
@@ -1,96 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 416x48 - text run at (0,0) width 416: ".one {border-left-width: 25px; border-style: solid;}" - text run at (416,0) width 0: " " - text run at (0,16) width 416: ".two {border-left-width: thin; border-style: solid;}" - text run at (416,16) width 0: " " - text run at (0,32) width 264: ".three {border-left-width: 25px;}" - text run at (264,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x66 [border: (3px solid #000000) (25px solid #000000)] - LayoutText {#text} at (25,3) size 163x19 - text run at (25,3) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (188,6) size 24x16 - text run at (188,6) width 24: "one" - LayoutText {#text} at (212,3) size 154x19 - text run at (212,3) width 8: ". " - text run at (220,3) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 162x25 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (366,3) size 134x19 - text run at (366,3) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (499,6) size 25x16 - text run at (499,6) width 25: "two" - LayoutText {#text} at (526,3) size 751x39 - text run at (526,3) width 250: ", which should result in a thin solid border" - text run at (25,23) width 129: "on the left side of the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (154,23) size 27x19 - text run at (154,23) width 27: "first" - LayoutText {#text} at (181,23) size 575x19 - text run at (181,23) width 481: " box in the inline element (and the UA's default border on the other three sides). " - text run at (662,23) width 94: "There is also an" - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (25,43) size 133x19 - text run at (25,43) width 133: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (158,46) size 40x16 - text run at (158,46) width 40: "three" - LayoutText {#text} at (198,43) size 545x19 - text run at (198,43) width 545: ", which should have no left border width or visible border because no border style was set." - LayoutTable {TABLE} at (0,197) size 784x124 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x122 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x94 - LayoutTableCell {TD} at (0,61) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x86 [border: (3px solid #000000) (25px solid #000000)] - LayoutText {#text} at (25,3) size 163x19 - text run at (25,3) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (188,6) size 24x16 - text run at (188,6) width 24: "one" - LayoutText {#text} at (212,3) size 154x19 - text run at (212,3) width 8: ". " - text run at (220,3) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 162x25 [border: (3px solid #000000) (1px solid #000000)] - LayoutText {#text} at (366,3) size 134x19 - text run at (366,3) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (499,6) size 25x16 - text run at (499,6) width 25: "two" - LayoutText {#text} at (526,3) size 706x39 - text run at (526,3) width 205: ", which should result in a thin solid" - text run at (25,23) width 174: "border on the left side of the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (199,23) size 27x19 - text run at (199,23) width 27: "first" - LayoutText {#text} at (226,23) size 730x39 - text run at (226,23) width 481: " box in the inline element (and the UA's default border on the other three sides). " - text run at (707,23) width 48: "There is" - text run at (25,43) width 46: "also an " - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (71,43) size 133x19 - text run at (71,43) width 133: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (204,46) size 40x16 - text run at (204,46) width 40: "three" - LayoutText {#text} at (244,43) size 711x39 - text run at (244,43) width 492: ", which should have no left border width or visible border because no border style" - text run at (25,63) width 49: "was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right-expected.png deleted file mode 100644 index 9c3c318..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right-expected.txt deleted file mode 100644 index 772d0de..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right-expected.txt +++ /dev/null
@@ -1,62 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 764x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 320x64 - text run at (0,0) width 184: "P {margin-right: 20px;}" - text run at (184,0) width 0: " " - text run at (0,16) width 320: ".one {border-right: purple double 10px;}" - text run at (320,16) width 0: " " - text run at (0,32) width 312: ".two {border-right: purple thin solid;}" - text run at (312,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 764x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 731x19 - text run at (0,0) width 731: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 760x39 [border: none (10px double #800080) none] - LayoutText {#text} at (730,0) size 760x39 - text run at (730,0) width 30: "class" - text run at (0,20) width 22: "one" - LayoutText {#text} at (32,20) size 379x19 - text run at (32,20) width 379: ", which should have a 10-pixel purple double right border; and " - LayoutInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (411,20) size 56x19 - text run at (411,20) width 56: "class two" - LayoutText {#text} at (468,20) size 726x39 - text run at (468,20) width 258: ", which should have a thin solid purple right" - text run at (0,40) width 49: "border. " - text run at (48,40) width 403: "The line-height of the parent element should not change on any line." - LayoutTable {TABLE} at (0,207) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 742x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 727x19 - text run at (0,0) width 727: "This paragraph has a background color of silver and a 20-pixel right margin, and it contains inline elements with classes of" - LayoutInline {SPAN} at (0,0) size 65x19 [border: none (10px double #800080) none] - LayoutText {#text} at (0,20) size 55x19 - text run at (0,20) width 55: "class one" - LayoutText {#text} at (65,20) size 379x19 - text run at (65,20) width 379: ", which should have a 10-pixel purple double right border; and " - LayoutInline {SPAN} at (0,0) size 57x19 [border: none (1px solid #800080) none] - LayoutText {#text} at (444,20) size 56x19 - text run at (444,20) width 56: "class two" - LayoutText {#text} at (501,20) size 729x39 - text run at (501,20) width 228: ", which should have a thin solid purple" - text run at (0,40) width 79: "right border. " - text run at (78,40) width 403: "The line-height of the parent element should not change on any line." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png deleted file mode 100644 index 5c418a3..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt deleted file mode 100644 index e66e7f3..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_inline-expected.txt +++ /dev/null
@@ -1,168 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1143 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1143 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1143 - LayoutBlockFlow {BODY} at (8,8) size 769x1127 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 749x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 352x112 - text run at (0,0) width 184: "P {margin-right: 20px;}" - text run at (184,0) width 0: " " - text run at (0,16) width 320: ".one {border-right: purple double 10px;}" - text run at (320,16) width 0: " " - text run at (0,32) width 312: ".two {border-right: purple thin solid;}" - text run at (312,32) width 0: " " - text run at (0,48) width 344: ".threea {border-right: black medium solid;}" - text run at (344,48) width 0: " " - text run at (0,64) width 352: ".threeb {border-right: purple medium solid;}" - text run at (352,64) width 0: " " - text run at (0,80) width 336: ".threec {border-right: blue medium solid;}" - text run at (336,80) width 0: " " - text run at (0,96) width 280: "TD {border-right: green 2px solid;}" - text run at (280,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 749x40 - LayoutText {#text} at (0,0) size 728x39 - text run at (0,0) width 612: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (612,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,235) size 749x20 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 404x19 - text run at (0,0) width 404: "This paragraph should have a purple, double, 10-pixel right border." - LayoutBlockFlow {P} at (0,271) size 749x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a thin purple right border." - LayoutTable {TABLE} at (0,307) size 769x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x113 - LayoutTableRow {TR} at (0,5) size 767x44 - LayoutTableCell {TD} at (5,5) size 757x44 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 751x39 - text run at (2,2) width 414: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (415,2) width 338: "This is also true of the table-testing section in the second" - text run at (2,22) width 121: "half of the test page." - LayoutTableRow {TR} at (0,54) size 767x54 - LayoutTableCell {TD} at (5,69) size 191x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 50x19 - text run at (2,2) width 50: "Cell one" - LayoutTableCell {TD} at (201,54) size 561x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 556x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (2,22) size 156x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 154x28 - LayoutTableRow {TR} at (0,2) size 154x24 - LayoutTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,438) size 769x180 - LayoutListItem {LI} at (40,0) size 729x80 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 726x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 726x60 - LayoutListItem {LI} at (40,0) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 686x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 729x20 [border: none (3px solid #800080) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." - LayoutListItem {LI} at (40,100) size 729x80 [border: none (3px solid #0000FF) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 715x79 - text run at (0,0) width 666: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors. " - text run at (666,0) width 49: "The first" - text run at (0,20) width 696: "item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the list" - text run at (0,40) width 428: "item.\"), even though the nested list does not have any border styles set. " - text run at (428,40) width 280: "The borders should line up together at the right" - text run at (0,60) width 473: "edge of the document's body, as each list element has a default width of 100%." - LayoutTable {TABLE} at (0,634) size 769x493 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x491 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x463 - LayoutTableCell {TD} at (0,245) size 13x28 [bgcolor=#C0C0C0] [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (13,28) size 754x463 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 725x40 - LayoutText {#text} at (0,0) size 682x39 - text run at (0,0) width 612: "Note that all table cells on this page should have a two-pixel solid green border along their right sides. " - text run at (612,0) width 70: "This border" - text run at (0,20) width 345: "applies only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,60) size 725x20 [border: none (10px double #800080) none] - LayoutText {#text} at (0,0) size 404x19 - text run at (0,0) width 404: "This paragraph should have a purple, double, 10-pixel right border." - LayoutBlockFlow {P} at (4,96) size 725x20 [border: none (1px solid #800080) none] - LayoutText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a thin purple right border." - LayoutTable {TABLE} at (4,132) size 745x115 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 743x113 - LayoutTableRow {TR} at (0,5) size 743x44 - LayoutTableCell {TD} at (5,5) size 733x44 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,2) size 704x39 - text run at (2,2) width 414: "Every cell in this table should have a 2-pixel solid green right border. " - text run at (415,2) width 291: "This is also true of the table-testing section in the" - text run at (2,22) width 168: "second half of the test page." - LayoutTableRow {TR} at (0,54) size 743x54 - LayoutTableCell {TD} at (5,69) size 185x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 50x19 - text run at (2,2) width 50: "Cell one" - LayoutTableCell {TD} at (195,54) size 543x54 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,2) size 538x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (2,22) size 156x30 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 154x28 - LayoutTableRow {TR} at (0,2) size 154x24 - LayoutTableCell {TD} at (2,2) size 150x24 [border: (1px inset #808080) (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,2) size 145x19 - text run at (2,2) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,263) size 745x180 - LayoutListItem {LI} at (40,0) size 705x80 [border: none (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,0) size 702x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (0,20) size 702x60 - LayoutListItem {LI} at (40,0) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 662x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,80) size 705x20 [border: none (3px solid #800080) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 149x19 - text run at (0,0) width 149: "This is a second list item." - LayoutListItem {LI} at (40,100) size 705x80 [border: none (3px solid #0000FF) none] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 702x79 - text run at (0,0) width 666: "Each list item in this 'parent' list should have a medium-width border along its right side, in each of three colors. " - text run at (666,0) width 23: "The" - text run at (0,20) width 702: "first item's border should travel the entire height the nested list (to end near the baseline of the line \"...nested within the" - text run at (0,40) width 448: "list item.\"), even though the nested list does not have any border styles set. " - text run at (448,40) width 250: "The borders should line up together at the" - text run at (0,60) width 503: "right edge of the document's body, as each list element has a default width of 100%." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png deleted file mode 100644 index 6ace20de..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt deleted file mode 100644 index 975e79f4..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 793 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x793 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x793 - LayoutBlockFlow {BODY} at (8,8) size 769x777 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 456x96 - text run at (0,0) width 448: ".zero {background-color: silver; border-right-width: 0;}" - text run at (448,0) width 0: " " - text run at (0,16) width 424: ".one {border-right-width: 25px; border-style: solid;}" - text run at (424,16) width 0: " " - text run at (0,32) width 432: ".two {border-right-width: thick; border-style: solid;}" - text run at (432,32) width 0: " " - text run at (0,48) width 456: ".three {border-right-width: medium; border-style: solid;}" - text run at (456,48) width 0: " " - text run at (0,64) width 432: ".four {border-right-width: thin; border-style: solid;}" - text run at (432,64) width 0: " " - text run at (0,80) width 272: ".five {border-right-width: 100px;}" - text run at (272,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x46 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 729x39 - text run at (3,3) width 729: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than one line" - text run at (3,23) width 29: "long." - LayoutBlockFlow {P} at (0,297) size 769x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 721x19 - text run at (3,3) width 721: "This element should have a thick right border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,339) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 739x19 - text run at (3,3) width 739: "This element should have a medium right border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,381) size 769x26 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 713x19 - text run at (3,3) width 713: "This element should have a thin right border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (0,423) size 769x20 - LayoutText {#text} at (0,0) size 493x19 - text run at (0,0) width 493: "This element should have no border and no extra \"padding\" on its right side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (493,3) size 96x16 - text run at (493,3) width 96: "border-style" - LayoutText {#text} at (589,0) size 53x19 - text run at (589,0) width 53: " was set." - LayoutTable {TABLE} at (0,459) size 769x318 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x316 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x288 - LayoutTableCell {TD} at (0,158) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x288 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 747x46 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 705x39 - text run at (3,3) width 705: "This element should have a right border width of 25 pixels, which will be more obvious if the element is more than one" - text run at (3,23) width 53: "line long." - LayoutBlockFlow {P} at (4,138) size 747x26 [border: (3px solid #000000) (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 721x19 - text run at (3,3) width 721: "This element should have a thick right border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (4,180) size 747x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 739x19 - text run at (3,3) width 739: "This element should have a medium right border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (4,222) size 747x26 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 713x19 - text run at (3,3) width 713: "This element should have a thin right border width, which will be more obvious if the element is more than one line long." - LayoutBlockFlow {P} at (4,264) size 747x20 - LayoutText {#text} at (0,0) size 493x19 - text run at (0,0) width 493: "This element should have no border and no extra \"padding\" on its right side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (493,3) size 96x16 - text run at (493,3) width 96: "border-style" - LayoutText {#text} at (589,0) size 53x19 - text run at (589,0) width 53: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png deleted file mode 100644 index eab4e60..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt deleted file mode 100644 index 400c80bf..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_right_width_inline-expected.txt +++ /dev/null
@@ -1,96 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 424x48 - text run at (0,0) width 424: ".one {border-right-width: 25px; border-style: solid;}" - text run at (424,0) width 0: " " - text run at (0,16) width 424: ".two {border-right-width: thin; border-style: solid;}" - text run at (424,16) width 0: " " - text run at (0,32) width 272: ".three {border-right-width: 25px;}" - text run at (272,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x66 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - LayoutText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 162x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (346,3) size 134x19 - text run at (346,3) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (479,6) size 25x16 - text run at (479,6) width 25: "two" - LayoutText {#text} at (504,3) size 751x39 - text run at (504,3) width 250: ", which should result in a thin solid border" - text run at (3,23) width 137: "on the right side of the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (140,23) size 24x19 - text run at (140,23) width 24: "last" - LayoutText {#text} at (164,23) size 577x19 - text run at (164,23) width 483: " box of the inline element (and the UA's default border on the other three sides). " - text run at (647,23) width 94: "There is also an" - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (3,43) size 133x19 - text run at (3,43) width 133: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (136,46) size 40x16 - text run at (136,46) width 40: "three" - LayoutText {#text} at (176,43) size 553x19 - text run at (176,43) width 553: ", which should have no right border width or visible border because no border style was set." - LayoutTable {TABLE} at (0,197) size 784x124 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x122 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x94 - LayoutTableCell {TD} at (0,61) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x94 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x86 [border: (3px solid #000000) (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,3) size 163x19 - text run at (3,3) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (166,6) size 24x16 - text run at (166,6) width 24: "one" - LayoutText {#text} at (190,3) size 154x19 - text run at (190,3) width 8: ". " - text run at (198,3) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 162x25 [border: (3px solid #000000) (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (346,3) size 134x19 - text run at (346,3) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (479,6) size 25x16 - text run at (479,6) width 25: "two" - LayoutText {#text} at (504,3) size 706x39 - text run at (504,3) width 205: ", which should result in a thin solid" - text run at (3,23) width 182: "border on the right side of the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (185,23) size 24x19 - text run at (185,23) width 24: "last" - LayoutText {#text} at (209,23) size 724x39 - text run at (209,23) width 483: " box of the inline element (and the UA's default border on the other three sides). " - text run at (692,23) width 35: "There" - text run at (3,43) width 59: "is also an " - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (62,43) size 133x19 - text run at (62,43) width 133: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (195,46) size 40x16 - text run at (195,46) width 40: "three" - LayoutText {#text} at (235,43) size 732x39 - text run at (235,43) width 500: ", which should have no right border width or visible border because no border style" - text run at (3,63) width 49: "was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style-expected.png deleted file mode 100644 index 2a49743..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style-expected.txt deleted file mode 100644 index ee8fe41..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style-expected.txt +++ /dev/null
@@ -1,122 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1369 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1369 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1369 - LayoutBlockFlow {BODY} at (8,8) size 769x1353 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x192 - LayoutText {#text} at (0,0) size 632x192 - text run at (0,0) width 560: ".one {border-style: dotted; border-color: black; border-width: thick;}" - text run at (560,0) width 0: " " - text run at (0,16) width 560: ".two {border-style: dashed; border-color: black; border-width: thick;}" - text run at (560,16) width 0: " " - text run at (0,32) width 568: ".three {border-style: solid; border-color: black; border-width: thick;}" - text run at (568,32) width 0: " " - text run at (0,48) width 568: ".four {border-style: double; border-color: black; border-width: thick;}" - text run at (568,48) width 0: " " - text run at (0,64) width 568: ".five {border-style: groove; border-color: olive; border-width: thick;}" - text run at (568,64) width 0: " " - text run at (0,80) width 552: ".six {border-style: ridge; border-color: olive; border-width: thick;}" - text run at (552,80) width 0: " " - text run at (0,96) width 568: ".seven {border-style: inset; border-color: olive; border-width: thick;}" - text run at (568,96) width 0: " " - text run at (0,112) width 576: ".eight {border-style: outset; border-color: olive; border-width: thick;}" - text run at (576,112) width 0: " " - text run at (0,128) width 632: ".nine {border-style: double groove; border-color: purple; border-width: thick;}" - text run at (632,128) width 0: " " - text run at (0,144) width 368: ".ten {border-style: double groove ridge inset;" - text run at (368,144) width 0: " " - text run at (0,160) width 368: " border-color: purple; border-width: thick;}" - text run at (368,160) width 0: " " - text run at (0,176) width 552: ".eleven {border-style: none; border-color: red; border-width: thick;}" - text run at (552,176) width 0: " " - LayoutBlockFlow {P} at (0,259) size 769x30 [border: (5px dotted #000000)] - LayoutText {#text} at (5,5) size 452x19 - text run at (5,5) width 452: "This paragraph should have a thick black dotted border all the way around." - LayoutBlockFlow {P} at (0,305) size 769x30 [border: (5px dashed #000000)] - LayoutText {#text} at (5,5) size 456x19 - text run at (5,5) width 456: "This paragraph should have a thick black dashed border all the way around." - LayoutBlockFlow {P} at (0,351) size 769x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 441x19 - text run at (5,5) width 441: "This paragraph should have a thick black solid border all the way around." - LayoutBlockFlow {P} at (0,397) size 769x30 [border: (5px double #000000)] - LayoutText {#text} at (5,5) size 454x19 - text run at (5,5) width 454: "This paragraph should have a thick black double border all the way around." - LayoutBlockFlow {P} at (0,443) size 769x30 [border: (5px groove #808000)] - LayoutText {#text} at (5,5) size 450x19 - text run at (5,5) width 450: "This paragraph should have a thick olive groove border all the way around." - LayoutBlockFlow {P} at (0,489) size 769x30 [border: (5px ridge #808000)] - LayoutText {#text} at (5,5) size 438x19 - text run at (5,5) width 438: "This paragraph should have a thick olive ridge border all the way around." - LayoutBlockFlow {P} at (0,535) size 769x30 [border: (5px inset #808000)] - LayoutText {#text} at (5,5) size 435x19 - text run at (5,5) width 435: "This paragraph should have a thick olive inset border all the way around." - LayoutBlockFlow {P} at (0,581) size 769x30 [border: (5px outset #808000)] - LayoutText {#text} at (5,5) size 444x19 - text run at (5,5) width 444: "This paragraph should have a thick olive outset border all the way around." - LayoutBlockFlow {P} at (0,627) size 769x50 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - LayoutText {#text} at (5,5) size 748x39 - text run at (5,5) width 595: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (600,5) width 153: "The color of all four sides" - text run at (5,25) width 163: "should be based on purple." - LayoutBlockFlow {P} at (0,693) size 769x50 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - LayoutText {#text} at (5,5) size 747x39 - text run at (5,5) width 673: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " - text run at (677,5) width 75: "The color of" - text run at (5,25) width 242: "all four sides should be based on purple." - LayoutBlockFlow {P} at (0,759) size 769x20 - LayoutText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This paragraph should have no border at all." - LayoutTable {TABLE} at (0,795) size 769x558 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x556 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x528 - LayoutTableCell {TD} at (0,278) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x528 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x30 [border: (5px dotted #000000)] - LayoutText {#text} at (5,5) size 452x19 - text run at (5,5) width 452: "This paragraph should have a thick black dotted border all the way around." - LayoutBlockFlow {P} at (4,50) size 747x30 [border: (5px dashed #000000)] - LayoutText {#text} at (5,5) size 456x19 - text run at (5,5) width 456: "This paragraph should have a thick black dashed border all the way around." - LayoutBlockFlow {P} at (4,96) size 747x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 441x19 - text run at (5,5) width 441: "This paragraph should have a thick black solid border all the way around." - LayoutBlockFlow {P} at (4,142) size 747x30 [border: (5px double #000000)] - LayoutText {#text} at (5,5) size 454x19 - text run at (5,5) width 454: "This paragraph should have a thick black double border all the way around." - LayoutBlockFlow {P} at (4,188) size 747x30 [border: (5px groove #808000)] - LayoutText {#text} at (5,5) size 450x19 - text run at (5,5) width 450: "This paragraph should have a thick olive groove border all the way around." - LayoutBlockFlow {P} at (4,234) size 747x30 [border: (5px ridge #808000)] - LayoutText {#text} at (5,5) size 438x19 - text run at (5,5) width 438: "This paragraph should have a thick olive ridge border all the way around." - LayoutBlockFlow {P} at (4,280) size 747x30 [border: (5px inset #808000)] - LayoutText {#text} at (5,5) size 435x19 - text run at (5,5) width 435: "This paragraph should have a thick olive inset border all the way around." - LayoutBlockFlow {P} at (4,326) size 747x30 [border: (5px outset #808000)] - LayoutText {#text} at (5,5) size 444x19 - text run at (5,5) width 444: "This paragraph should have a thick olive outset border all the way around." - LayoutBlockFlow {P} at (4,372) size 747x50 [border: (5px double #800080) (5px groove #800080) (5px double #800080) (5px groove #800080)] - LayoutText {#text} at (5,5) size 714x39 - text run at (5,5) width 595: "This paragraph should have thick double top and bottom borders, and thick grooved side borders. " - text run at (600,5) width 119: "The color of all four" - text run at (5,25) width 197: "sides should be based on purple." - LayoutBlockFlow {P} at (4,438) size 747x50 [border: (5px double #800080) (5px groove #800080) (5px ridge #800080) (5px inset #800080)] - LayoutText {#text} at (5,5) size 731x39 - text run at (5,5) width 673: "This paragraph should have, in clockwise order from the top, a double, grooved, ridged, and inset thick border. " - text run at (677,5) width 59: "The color" - text run at (5,25) width 258: "of all four sides should be based on purple." - LayoutBlockFlow {P} at (4,504) size 747x20 - LayoutText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This paragraph should have no border at all." -layer at (8,249) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,241) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png deleted file mode 100644 index 637277f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt deleted file mode 100644 index 1edbe6a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_style_inline-expected.txt +++ /dev/null
@@ -1,72 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 568x48 - text run at (0,0) width 560: ".one {border-style: dashed; border-color: black; border-width: thick;}" - text run at (560,0) width 0: " " - text run at (0,16) width 544: ".two {border-style: groove; border-color: red; border-width: thick;}" - text run at (544,16) width 0: " " - text run at (0,32) width 568: ".three {border-style: none; border-color: purple; border-width: thick;}" - text run at (568,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 66x29 [border: (5px dashed #000000)] - LayoutText {#text} at (631,0) size 56x19 - text run at (631,0) width 56: "class one" - LayoutText {#text} at (691,0) size 759x39 - text run at (691,0) width 68: ", which will" - text run at (0,20) width 227: "result in a dashed thick black border; " - LayoutInline {SPAN} at (0,0) size 66x29 [border: (5px groove #FF0000)] - LayoutText {#text} at (232,20) size 56x19 - text run at (232,20) width 56: "class two" - LayoutText {#text} at (293,20) size 355x19 - text run at (293,20) width 355: ", which should result in a grooved thick purple border, and " - LayoutInline {SPAN} at (0,0) size 64x19 - LayoutText {#text} at (647,20) size 64x19 - text run at (647,20) width 64: "class three" - LayoutText {#text} at (710,20) size 754x39 - text run at (710,20) width 44: ", which" - text run at (0,40) width 193: "should result in no border at all. " - text run at (193,40) width 406: "The line-height of the parent element should not change, on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and it contains inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 66x29 [border: (5px dashed #000000)] - LayoutText {#text} at (631,0) size 56x19 - text run at (631,0) width 56: "class one" - LayoutText {#text} at (691,0) size 759x39 - text run at (691,0) width 68: ", which will" - text run at (0,20) width 227: "result in a dashed thick black border; " - LayoutInline {SPAN} at (0,0) size 66x29 [border: (5px groove #FF0000)] - LayoutText {#text} at (232,20) size 56x19 - text run at (232,20) width 56: "class two" - LayoutText {#text} at (293,20) size 355x19 - text run at (293,20) width 355: ", which should result in a grooved thick purple border, and " - LayoutInline {SPAN} at (0,0) size 64x19 - LayoutText {#text} at (647,20) size 64x19 - text run at (647,20) width 64: "class three" - LayoutText {#text} at (710,20) size 754x39 - text run at (710,20) width 44: ", which" - text run at (0,40) width 193: "should result in no border at all. " - text run at (193,40) width 406: "The line-height of the parent element should not change, on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top-expected.png deleted file mode 100644 index 7fae42b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top-expected.txt deleted file mode 100644 index 14b69b4..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top-expected.txt +++ /dev/null
@@ -1,152 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1023 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1023 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1023 - LayoutBlockFlow {BODY} at (8,8) size 769x1007 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 320x64 - text run at (0,0) width 304: ".one {border-top: purple double 10px;}" - text run at (304,0) width 0: " " - text run at (0,16) width 296: ".two {border-top: purple thin solid;}" - text run at (296,16) width 0: " " - text run at (0,32) width 320: ".three {border-top: black medium solid;}" - text run at (320,32) width 0: " " - text run at (0,48) width 264: "TD {border-top: green 2px solid;}" - text run at (264,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x40 - LayoutText {#text} at (0,0) size 767x39 - text run at (0,0) width 606: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (606,0) width 161: "This border applies only to" - text run at (0,20) width 254: "the cells, not the rows which contain them." - LayoutBlockFlow {P} at (0,187) size 769x30 [border: (10px double #800080) none] - LayoutText {#text} at (0,10) size 398x19 - text run at (0,10) width 398: "This paragraph should have a purple, double, 10-pixel top border." - LayoutBlockFlow {P} at (0,233) size 769x21 [border: (1px solid #800080) none] - LayoutText {#text} at (0,1) size 316x19 - text run at (0,1) width 316: "This paragraph should have a thin purple top border." - LayoutTable {TABLE} at (0,270) size 769x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x116 - LayoutTableRow {TR} at (0,5) size 767x45 - LayoutTableCell {TD} at (5,5) size 757x45 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,3) size 745x39 - text run at (2,3) width 408: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (409,3) width 338: "This is also true of the table-testing section in the second" - text run at (2,23) width 121: "half of the test page." - LayoutTableRow {TR} at (0,55) size 767x56 - LayoutTableCell {TD} at (5,70) size 190x25 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 50x19 - text run at (2,3) width 50: "Cell one" - LayoutTableCell {TD} at (200,55) size 562x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,3) size 558x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (2,23) size 155x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 153x29 - LayoutTableRow {TR} at (0,2) size 153x25 - LayoutTableCell {TD} at (2,2) size 149x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 145x19 - text run at (2,3) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (0,404) size 769x129 - LayoutListItem {LI} at (40,0) size 729x83 [border: (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,3) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (0,23) size 729x60 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 729x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 149x19 - text run at (0,3) width 149: "This is a second list item." - LayoutListItem {LI} at (40,106) size 729x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 455x19 - text run at (0,3) width 455: "Each list item in this list should have a medium-width black border at its top." - LayoutTable {TABLE} at (0,549) size 769x458 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x456 - LayoutTableRow {TR} at (0,0) size 767x29 - LayoutTableCell {TD} at (0,0) size 767x29 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,5) size 157x19 - text run at (4,5) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,29) size 767x427 - LayoutTableCell {TD} at (0,228) size 12x29 [bgcolor=#C0C0C0] [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,5) size 4x19 - text run at (4,5) width 4: " " - LayoutTableCell {TD} at (12,29) size 755x427 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,5) size 747x40 - LayoutText {#text} at (0,0) size 722x39 - text run at (0,0) width 606: "Note that all table cells on this page should have a two-pixel solid green border along their top sides. " - text run at (606,0) width 116: "This border applies" - text run at (0,20) width 299: "only to the cells, not the rows which contain them." - LayoutBlockFlow {P} at (4,61) size 747x30 [border: (10px double #800080) none] - LayoutText {#text} at (0,10) size 398x19 - text run at (0,10) width 398: "This paragraph should have a purple, double, 10-pixel top border." - LayoutBlockFlow {P} at (4,107) size 747x21 [border: (1px solid #800080) none] - LayoutText {#text} at (0,1) size 316x19 - text run at (0,1) width 316: "This paragraph should have a thin purple top border." - LayoutTable {TABLE} at (4,144) size 747x118 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 745x116 - LayoutTableRow {TR} at (0,5) size 745x45 - LayoutTableCell {TD} at (5,5) size 735x45 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutText {#text} at (2,3) size 698x39 - text run at (2,3) width 408: "Every cell in this table should have a 2-pixel solid green top border. " - text run at (409,3) width 291: "This is also true of the table-testing section in the" - text run at (2,23) width 168: "second half of the test page." - LayoutTableRow {TR} at (0,55) size 745x56 - LayoutTableCell {TD} at (5,70) size 184x25 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 50x19 - text run at (2,3) width 50: "Cell one" - LayoutTableCell {TD} at (194,55) size 546x56 [border: (2px solid #008000) (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (2,3) size 542x20 - LayoutText {#text} at (0,0) size 51x19 - text run at (0,0) width 51: "Cell two" - LayoutTable {TABLE} at (2,23) size 155x31 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 153x29 - LayoutTableRow {TR} at (0,2) size 153x25 - LayoutTableCell {TD} at (2,2) size 149x25 [border: (2px solid #008000) (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (2,3) size 145x19 - text run at (2,3) width 145: "Nested single-cell table!" - LayoutBlockFlow {UL} at (4,278) size 747x129 - LayoutListItem {LI} at (40,0) size 707x83 [border: (3px solid #000000) none] - LayoutBlockFlow (anonymous) at (0,3) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 110x19 - text run at (0,0) width 110: "This is a list item..." - LayoutBlockFlow {UL} at (0,23) size 707x60 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 70x19 - text run at (0,0) width 70: "...and this..." - LayoutListItem {LI} at (40,20) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "...is a second list..." - LayoutListItem {LI} at (40,40) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "...nested within the list item." - LayoutListItem {LI} at (40,83) size 707x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 149x19 - text run at (0,3) width 149: "This is a second list item." - LayoutListItem {LI} at (40,106) size 707x23 [border: (3px solid #000000) none] - LayoutListMarker (anonymous) at (-18,3) size 7x19: bullet - LayoutText {#text} at (0,3) size 455x19 - text run at (0,3) width 455: "Each list item in this list should have a medium-width black border at its top." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png deleted file mode 100644 index 05a572d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt deleted file mode 100644 index c4cf7b2..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_inline-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 304x48 - text run at (0,0) width 304: ".one {border-top: purple double 10px;}" - text run at (304,0) width 0: " " - text run at (0,16) width 296: ".two {border-top: purple thin solid;}" - text run at (296,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 56x29 [border: (10px double #800080) none] - LayoutText {#text} at (626,0) size 56x19 - text run at (626,0) width 56: "class one" - LayoutText {#text} at (681,0) size 768x39 - text run at (681,0) width 87: ", which should" - text run at (0,20) width 283: "have a 10-pixel purple double top border; and " - LayoutInline {SPAN} at (0,0) size 56x20 [border: (1px solid #800080) none] - LayoutText {#text} at (283,20) size 56x19 - text run at (283,20) width 56: "class two" - LayoutText {#text} at (339,20) size 770x39 - text run at (339,20) width 305: ", which should have a thin solid purple top border. " - text run at (643,20) width 127: "The line-height of the" - text run at (0,40) width 272: "parent element should not change on any line." - LayoutTable {TABLE} at (0,191) size 784x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x96 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This is an unstyled element, save for the background color, and containing inline elements with classes of " - LayoutInline {SPAN} at (0,0) size 56x29 [border: (10px double #800080) none] - LayoutText {#text} at (626,0) size 56x19 - text run at (626,0) width 56: "class one" - LayoutText {#text} at (681,0) size 725x39 - text run at (681,0) width 44: ", which" - text run at (0,20) width 326: "should have a 10-pixel purple double top border; and " - LayoutInline {SPAN} at (0,0) size 56x20 [border: (1px solid #800080) none] - LayoutText {#text} at (326,20) size 56x19 - text run at (326,20) width 56: "class two" - LayoutText {#text} at (382,20) size 740x39 - text run at (382,20) width 305: ", which should have a thin solid purple top border. " - text run at (686,20) width 54: "The line-" - text run at (0,40) width 349: "height of the parent element should not change on any line." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png deleted file mode 100644 index 2bc0c02..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt deleted file mode 100644 index 9ee9b57..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 797 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x797 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x797 - LayoutBlockFlow {BODY} at (8,8) size 769x781 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 440x96 - text run at (0,0) width 432: ".zero {background-color: silver; border-top-width: 0;}" - text run at (432,0) width 0: " " - text run at (0,16) width 408: ".one {border-top-width: 25px; border-style: solid;}" - text run at (408,16) width 0: " " - text run at (0,32) width 416: ".two {border-top-width: thick; border-style: solid;}" - text run at (416,32) width 0: " " - text run at (0,48) width 440: ".three {border-top-width: medium; border-style: solid;}" - text run at (440,48) width 0: " " - text run at (0,64) width 416: ".four {border-top-width: thin; border-style: solid;}" - text run at (416,64) width 0: " " - text run at (0,80) width 248: ".five {border-top-width: 25px;}" - text run at (248,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x48 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 360x19 - text run at (3,25) width 360: "This paragraph should have a top border width of 25 pixels." - LayoutBlockFlow {P} at (0,299) size 769x28 [border: (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,5) size 319x19 - text run at (3,5) width 319: "This paragraph should have a thick top border width." - LayoutBlockFlow {P} at (0,343) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This paragraph should have a medium top border width." - LayoutBlockFlow {P} at (0,385) size 769x24 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,1) size 311x19 - text run at (3,1) width 311: "This paragraph should have a thin top border width." - LayoutBlockFlow {P} at (0,425) size 769x20 - LayoutText {#text} at (0,0) size 502x19 - text run at (0,0) width 502: "This paragraph should have no border and no extra \"padding\" on its top side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (502,3) size 96x16 - text run at (502,3) width 96: "border-style" - LayoutText {#text} at (598,0) size 53x19 - text run at (598,0) width 53: " was set." - LayoutTable {TABLE} at (0,461) size 673x320 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 671x318 - LayoutTableRow {TR} at (0,0) size 671x28 - LayoutTableCell {TD} at (0,0) size 671x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 671x290 - LayoutTableCell {TD} at (0,159) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 659x290 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 651x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 651x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 651x48 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 360x19 - text run at (3,25) width 360: "This paragraph should have a top border width of 25 pixels." - LayoutBlockFlow {P} at (4,140) size 651x28 [border: (5px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,5) size 319x19 - text run at (3,5) width 319: "This paragraph should have a thick top border width." - LayoutBlockFlow {P} at (4,184) size 651x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 337x19 - text run at (3,3) width 337: "This paragraph should have a medium top border width." - LayoutBlockFlow {P} at (4,226) size 651x24 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,1) size 311x19 - text run at (3,1) width 311: "This paragraph should have a thin top border width." - LayoutBlockFlow {P} at (4,266) size 651x20 - LayoutText {#text} at (0,0) size 502x19 - text run at (0,0) width 502: "This paragraph should have no border and no extra \"padding\" on its top side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (502,3) size 96x16 - text run at (502,3) width 96: "border-style" - LayoutText {#text} at (598,0) size 53x19 - text run at (598,0) width 53: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png deleted file mode 100644 index fc1f69a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt deleted file mode 100644 index beb54d6f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_top_width_inline-expected.txt +++ /dev/null
@@ -1,86 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 408x48 - text run at (0,0) width 408: ".one {border-top-width: 25px; border-style: solid;}" - text run at (408,0) width 0: " " - text run at (0,16) width 408: ".two {border-top-width: thin; border-style: solid;}" - text run at (408,16) width 0: " " - text run at (0,32) width 256: ".three {border-top-width: 25px;}" - text run at (256,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x88 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 163x19 - text run at (3,25) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (166,28) size 24x16 - text run at (166,28) width 24: "one" - LayoutText {#text} at (190,25) size 154x19 - text run at (190,25) width 8: ". " - text run at (198,25) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 164x23 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (346,25) size 134x19 - text run at (346,25) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (479,28) size 25x16 - text run at (479,28) width 25: "two" - LayoutText {#text} at (506,25) size 772x39 - text run at (506,25) width 269: ", which should result in a thin solid border on" - text run at (3,45) width 599: "the top side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (602,45) width 98: "There is also an " - LayoutInline {SPAN} at (0,0) size 777x39 - LayoutText {#text} at (700,45) size 777x39 - text run at (700,45) width 80: "inline element" - text run at (3,65) width 49: "of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (52,68) size 40x16 - text run at (52,68) width 40: "three" - LayoutText {#text} at (92,65) size 547x19 - text run at (92,65) width 547: ", which should have no top border width or visible border because no border style was set." - LayoutTable {TABLE} at (0,219) size 784x126 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x124 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x96 - LayoutTableCell {TD} at (0,62) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x96 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x88 [border: (25px solid #000000) (3px solid #000000)] - LayoutText {#text} at (3,25) size 163x19 - text run at (3,25) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (166,28) size 24x16 - text run at (166,28) width 24: "one" - LayoutText {#text} at (190,25) size 154x19 - text run at (190,25) width 8: ". " - text run at (198,25) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 164x23 [border: (1px solid #000000) (3px solid #000000)] - LayoutText {#text} at (346,25) size 134x19 - text run at (346,25) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (479,28) size 25x16 - text run at (479,28) width 25: "two" - LayoutText {#text} at (506,25) size 753x39 - text run at (506,25) width 250: ", which should result in a thin solid border" - text run at (3,45) width 618: "on the top side of each box in the inline element (and the UA's default border on the other three sides). " - text run at (621,45) width 98: "There is also an " - LayoutInline {SPAN} at (0,0) size 746x39 - LayoutText {#text} at (719,45) size 746x39 - text run at (719,45) width 30: "inline" - text run at (3,65) width 99: "element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (102,68) size 40x16 - text run at (102,68) width 40: "three" - LayoutText {#text} at (142,65) size 547x19 - text run at (142,65) width 547: ", which should have no top border width or visible border because no border style was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width-expected.png deleted file mode 100644 index 852dcf53..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width-expected.txt deleted file mode 100644 index bb0a020..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width-expected.txt +++ /dev/null
@@ -1,98 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 941 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x941 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x941 - LayoutBlockFlow {BODY} at (8,8) size 769x925 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 408x96 - text run at (0,0) width 400: ".zero {background-color: silver; border-width: 0;}" - text run at (400,0) width 0: " " - text run at (0,16) width 376: ".one {border-width: 50px; border-style: solid;}" - text run at (376,16) width 0: " " - text run at (0,32) width 384: ".two {border-width: thick; border-style: solid;}" - text run at (384,32) width 0: " " - text run at (0,48) width 408: ".three {border-width: medium; border-style: solid;}" - text run at (408,48) width 0: " " - text run at (0,64) width 384: ".four {border-width: thin; border-style: solid;}" - text run at (384,64) width 0: " " - text run at (0,80) width 216: ".five {border-width: 25px;}" - text run at (216,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (0,199) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,235) size 769x120 [border: (50px solid #000000)] - LayoutText {#text} at (50,50) size 372x19 - text run at (50,50) width 372: "This element should have an overall border width of 50 pixels." - LayoutBlockFlow {P} at (0,371) size 769x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 324x19 - text run at (5,5) width 324: "This element should have a thick overall border width." - LayoutBlockFlow {P} at (0,417) size 769x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 342x19 - text run at (3,3) width 342: "This element should have a medium overall border width." - LayoutBlockFlow {P} at (0,459) size 769x22 [border: (1px solid #000000)] - LayoutText {#text} at (1,1) size 316x19 - text run at (1,1) width 316: "This element should have a thin overall border width." - LayoutBlockFlow {P} at (0,497) size 769x20 - LayoutText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "This element should have no border and no extra \"padding\" on any side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (471,3) size 96x16 - text run at (471,3) width 96: "border-style" - LayoutText {#text} at (567,0) size 53x19 - text run at (567,0) width 53: " was set." - LayoutTable {TABLE} at (0,533) size 642x392 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 640x390 - LayoutTableRow {TR} at (0,0) size 640x28 - LayoutTableCell {TD} at (0,0) size 640x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 640x362 - LayoutTableCell {TD} at (0,195) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 628x362 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 620x20 - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "(These will only work if " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (145,3) size 96x16 - text run at (145,3) width 96: "border-style" - LayoutText {#text} at (241,0) size 87x19 - text run at (241,0) width 87: " is supported.)" - LayoutBlockFlow {P} at (4,40) size 620x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,76) size 620x120 [border: (50px solid #000000)] - LayoutText {#text} at (50,50) size 372x19 - text run at (50,50) width 372: "This element should have an overall border width of 50 pixels." - LayoutBlockFlow {P} at (4,212) size 620x30 [border: (5px solid #000000)] - LayoutText {#text} at (5,5) size 324x19 - text run at (5,5) width 324: "This element should have a thick overall border width." - LayoutBlockFlow {P} at (4,258) size 620x26 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 342x19 - text run at (3,3) width 342: "This element should have a medium overall border width." - LayoutBlockFlow {P} at (4,300) size 620x22 [border: (1px solid #000000)] - LayoutText {#text} at (1,1) size 316x19 - text run at (1,1) width 316: "This element should have a thin overall border width." - LayoutBlockFlow {P} at (4,338) size 620x20 - LayoutText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "This element should have no border and no extra \"padding\" on any side, as no " - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (471,3) size 96x16 - text run at (471,3) width 96: "border-style" - LayoutText {#text} at (567,0) size 53x19 - text run at (567,0) width 53: " was set." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png deleted file mode 100644 index 6b718b1..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt deleted file mode 100644 index 5be22b3..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/border_width_inline-expected.txt +++ /dev/null
@@ -1,86 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 376x48 - text run at (0,0) width 376: ".one {border-width: 25px; border-style: solid;}" - text run at (376,0) width 0: " " - text run at (0,16) width 376: ".two {border-width: thin; border-style: solid;}" - text run at (376,16) width 0: " " - text run at (0,32) width 224: ".three {border-width: 25px;}" - text run at (224,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x110 [border: (25px solid #000000)] - LayoutText {#text} at (25,25) size 163x19 - text run at (25,25) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (188,28) size 24x16 - text run at (188,28) width 24: "one" - LayoutText {#text} at (212,25) size 154x19 - text run at (212,25) width 8: ". " - text run at (220,25) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 160x21 [border: (1px solid #000000)] - LayoutText {#text} at (366,25) size 134x19 - text run at (366,25) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (499,28) size 25x16 - text run at (499,28) width 25: "two" - LayoutText {#text} at (524,25) size 704x39 - text run at (524,25) width 205: ", which should result in a thin solid" - text run at (25,45) width 323: "border on each side of each box in the inline element. " - text run at (348,45) width 98: "There is also an " - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (446,45) size 133x19 - text run at (446,45) width 133: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (579,48) size 40x16 - text run at (579,48) width 40: "three" - LayoutText {#text} at (619,45) size 731x39 - text run at (619,45) width 137: ", which should have no" - text run at (25,65) width 279: "border width because no border style was set." - LayoutTable {TABLE} at (0,241) size 784x148 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x146 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x118 - LayoutTableCell {TD} at (0,73) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x118 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x110 [border: (25px solid #000000)] - LayoutText {#text} at (25,25) size 163x19 - text run at (25,25) width 163: "This element has a class of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (188,28) size 24x16 - text run at (188,28) width 24: "one" - LayoutText {#text} at (212,25) size 154x19 - text run at (212,25) width 8: ". " - text run at (220,25) width 146: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 160x21 [border: (1px solid #000000)] - LayoutText {#text} at (366,25) size 134x19 - text run at (366,25) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (499,28) size 25x16 - text run at (499,28) width 25: "two" - LayoutText {#text} at (524,25) size 704x39 - text run at (524,25) width 205: ", which should result in a thin solid" - text run at (25,45) width 323: "border on each side of each box in the inline element. " - text run at (348,45) width 98: "There is also an " - LayoutInline {SPAN} at (0,0) size 173x19 - LayoutText {#text} at (446,45) size 133x19 - text run at (446,45) width 133: "inline element of class " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (579,48) size 40x16 - text run at (579,48) width 40: "three" - LayoutText {#text} at (619,45) size 712x39 - text run at (619,45) width 118: ", which should have" - text run at (25,65) width 298: "no border width because no border style was set." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear-expected.png deleted file mode 100644 index 7c3d99fb..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear-expected.txt deleted file mode 100644 index e20d83b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear-expected.txt +++ /dev/null
@@ -1,92 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1005 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1005 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1005 - LayoutBlockFlow {BODY} at (8,8) size 769x989 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 168x64 - text run at (0,0) width 152: ".one {clear: left;}" - text run at (152,0) width 0: " " - text run at (0,16) width 160: ".two {clear: right;}" - text run at (160,16) width 0: " " - text run at (0,32) width 168: ".three {clear: both;}" - text run at (168,32) width 0: " " - text run at (0,48) width 160: ".four {clear: none;}" - text run at (160,48) width 0: " " - LayoutImage (floating) {IMG} at (0,123) size 15x50 - LayoutBlockFlow {P} at (0,131) size 769x20 - LayoutText {#text} at (18,0) size 562x19 - text run at (18,0) width 562: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - LayoutBlockFlow (anonymous) at (0,167) size 769x20 - LayoutBR {BR} at (18,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutBlockFlow {P} at (0,237) size 769x20 - LayoutText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - LayoutBlockFlow (anonymous) at (0,273) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (754,20) size 15x50 - LayoutBlockFlow {P} at (0,343) size 769x20 - LayoutText {#text} at (0,0) size 628x19 - text run at (0,0) width 628: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - LayoutBlockFlow (anonymous) at (0,379) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutImage (floating) {IMG} at (754,20) size 15x50 - LayoutBlockFlow {P} at (0,449) size 769x20 - LayoutText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - LayoutImage (floating) {IMG} at (0,485) size 15x50 - LayoutImage (floating) {IMG} at (754,485) size 15x50 - LayoutBlockFlow {P} at (0,485) size 769x20 - LayoutText {#text} at (18,0) size 372x19 - text run at (18,0) width 372: "This paragraph should be between both tall orange rectangles." - LayoutBlockFlow (anonymous) at (0,521) size 769x20 - LayoutBR {BR} at (18,0) size 0x19 - LayoutTable {TABLE} at (0,541) size 650x448 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 648x446 - LayoutTableRow {TR} at (0,0) size 648x28 - LayoutTableCell {TD} at (0,0) size 648x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 648x418 - LayoutTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 636x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutImage (floating) {IMG} at (4,4) size 15x50 - LayoutBlockFlow {P} at (4,4) size 628x20 - LayoutText {#text} at (18,0) size 562x19 - text run at (18,0) width 562: "This text should be flowing past a tall orange rectangle on the left side of the browser window." - LayoutBlockFlow (anonymous) at (4,40) size 628x20 - LayoutBR {BR} at (18,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutBlockFlow {P} at (4,110) size 628x20 - LayoutText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This paragraph should appear below the tall orange rectangle above and to the left, and not flow past it." - LayoutBlockFlow (anonymous) at (4,146) size 628x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (613,20) size 15x50 - LayoutBlockFlow {P} at (4,216) size 628x20 - LayoutText {#text} at (0,0) size 628x19 - text run at (0,0) width 628: "This paragraph should appear below the tall orange rectangle above and to the right, and not flow past it." - LayoutBlockFlow (anonymous) at (4,252) size 628x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (0,20) size 15x50 - LayoutImage (floating) {IMG} at (613,20) size 15x50 - LayoutBlockFlow {P} at (4,322) size 628x20 - LayoutText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This paragraph should appear below the two tall orange rectangles, and not flow between them." - LayoutImage (floating) {IMG} at (4,358) size 15x50 - LayoutImage (floating) {IMG} at (617,358) size 15x50 - LayoutBlockFlow {P} at (4,358) size 628x20 - LayoutText {#text} at (18,0) size 372x19 - text run at (18,0) width 372: "This paragraph should be between both tall orange rectangles." - LayoutBlockFlow (anonymous) at (4,394) size 628x20 - LayoutBR {BR} at (18,0) size 0x19 -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear_float-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear_float-expected.png deleted file mode 100644 index 4dcf105..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear_float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt deleted file mode 100644 index 44659029..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/clear_float-expected.txt +++ /dev/null
@@ -1,160 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 806 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x806 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x805.88 - LayoutBlockFlow {BODY} at (8,8) size 784x789.88 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,33) size 784x144 - LayoutText {#text} at (0,0) size 616x144 - text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" - text run at (392,0) width 0: " " - text run at (0,16) width 0: " " - text run at (0,32) width 384: "DIV.menu {float: left; clear: left; width: 11em;" - text run at (384,32) width 0: " " - text run at (0,48) width 464: " margin: 0; margin-bottom: 10px; padding: 0.5em;}" - text run at (464,48) width 0: " " - text run at (0,64) width 432: "DIV.menu H1 {font-size: 1.2em; margin: 0; padding: 0;}" - text run at (432,64) width 0: " " - text run at (0,80) width 448: "DIV.menu UL {margin: 0.2em 0.3em 0.2em 1em; padding: 0;}" - text run at (448,80) width 0: " " - text run at (0,96) width 616: "DIV.article {padding: 0.5em; margin: 0; margin-left: 14em; margin-right: 2em;" - text run at (616,96) width 0: " " - text run at (0,112) width 480: " color: black; background: yellow; clear: none;}" - text run at (480,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow (floating) {DIV} at (0,200) size 192x125.38 [color=#FFFFFF] [bgcolor=#008000] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 81x22 - text run at (0,0) width 81: "Top menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 33x19 - text run at (0,0) width 33: "green" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" - LayoutBlockFlow (floating) {DIV} at (0,335.38) size 192x125.38 [color=#FFFFFF] [bgcolor=#0000FF] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 109x22 - text run at (0,0) width 109: "Bottom menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 101x19 - text run at (0,0) width 101: "blue background" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" - LayoutBlockFlow {DIV} at (224,200) size 528x235.88 [bgcolor=#FFFF00] - LayoutBlockFlow {H1} at (8,29.44) size 512x37 - LayoutText {#text} at (0,0) size 274x36 - text run at (0,0) width 274: "The 'clear' property" - LayoutBlockFlow {P} at (8,87.88) size 512x100 - LayoutText {#text} at (0,0) size 512x99 - text run at (0,0) width 512: "This page has two floating \"menus\" on the side; one has a green background, and the" - text run at (0,20) width 157: "other a blue background. " - text run at (157,20) width 355: "Due to settings on the 'float' and 'clear' properties, the two" - text run at (0,40) width 512: "menus should appear on the left side of the page, the blue below the green. There" - text run at (0,60) width 512: "should be a 10px gap between the two menus. There should also be a 10px gap" - text run at (0,80) width 280: "between the top menu and the top of the page." - LayoutBlockFlow {P} at (8,187.88) size 512x40 - LayoutText {#text} at (0,0) size 512x39 - text run at (0,0) width 512: "The top of the yellow rectangle (to which this paragraph belongs) should be vertically" - text run at (0,20) width 254: "aligned with the top of the green rectangle." - LayoutTable {TABLE} at (192,435.88) size 592x354 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 590x352 - LayoutTableRow {TR} at (0,0) size 590x28 - LayoutTableCell {TD} at (0,0) size 590x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 590x324 - LayoutTableCell {TD} at (0,176) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 578x323.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (floating) {DIV} at (4,4) size 192x125.38 [color=#FFFFFF] [bgcolor=#008000] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 81x22 - text run at (0,0) width 81: "Top menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 33x19 - text run at (0,0) width 33: "green" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" - LayoutBlockFlow (floating) {DIV} at (4,139.38) size 192x125.38 [color=#FFFFFF] [bgcolor=#0000FF] - LayoutBlockFlow {H1} at (8,8) size 176x23 - LayoutText {#text} at (0,0) size 109x22 - text run at (0,0) width 109: "Bottom menu" - LayoutBlockFlow {UL} at (24,34.19) size 155.20x80 - LayoutListItem {LI} at (0,0) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 101x19 - text run at (0,0) width 101: "blue background" - LayoutListItem {LI} at (0,20) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 58x19 - text run at (0,0) width 58: "white text" - LayoutListItem {LI} at (0,40) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "0.5em padding" - LayoutListItem {LI} at (0,60) size 155.20x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 82x19 - text run at (0,0) width 82: "0.5em margin" - LayoutBlockFlow {DIV} at (228,4) size 314x315.88 [bgcolor=#FFFF00] - LayoutBlockFlow {H1} at (8,29.44) size 298x37 - LayoutText {#text} at (0,0) size 274x36 - text run at (0,0) width 274: "The 'clear' property" - LayoutBlockFlow {P} at (8,87.88) size 298x160 - LayoutText {#text} at (0,0) size 298x159 - text run at (0,0) width 298: "This page has two floating \"menus\" on the side;" - text run at (0,20) width 298: "one has a green background, and the other a blue" - text run at (0,40) width 83: "background. " - text run at (83,40) width 215: "Due to settings on the 'float' and" - text run at (0,60) width 298: "'clear' properties, the two menus should appear" - text run at (0,80) width 298: "on the left side of the page, the blue below the" - text run at (0,100) width 298: "green. There should be a 10px gap between the" - text run at (0,120) width 298: "two menus. There should also be a 10px gap" - text run at (0,140) width 280: "between the top menu and the top of the page." - LayoutBlockFlow {P} at (8,247.88) size 298x60 - LayoutText {#text} at (0,0) size 298x59 - text run at (0,0) width 298: "The top of the yellow rectangle (to which this" - text run at (0,20) width 298: "paragraph belongs) should be vertically aligned" - text run at (0,40) width 208: "with the top of the green rectangle." -layer at (8,198) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,190) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float-expected.png deleted file mode 100644 index 706ff9c8..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float-expected.txt deleted file mode 100644 index 84cd1d5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 160x48 - text run at (0,0) width 152: ".one {float: left;}" - text run at (152,0) width 0: " " - text run at (0,16) width 160: ".two {float: right;}" - text run at (160,16) width 0: " " - text run at (0,32) width 0: " " - LayoutImage (floating) {IMG} at (0,107) size 15x50 - LayoutBlockFlow {P} at (0,115) size 784x40 - LayoutText {#text} at (15,0) size 761x39 - text run at (15,0) width 566: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (580,0) width 196: "In this case, it is the image which" - text run at (15,20) width 162: "has been floated to the left." - LayoutBlockFlow (anonymous) at (0,171) size 784x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (769,209) size 15x50 - LayoutBlockFlow {P} at (0,217) size 784x40 - LayoutText {#text} at (0,0) size 769x39 - text run at (0,0) width 574: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (573,0) width 196: "In this case, it is the image which" - text run at (0,20) width 170: "has been floated to the right." - LayoutTable {TABLE} at (0,273) size 784x182 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x180 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x152 - LayoutTableCell {TD} at (0,90) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x152 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutImage (floating) {IMG} at (4,4) size 15x50 - LayoutBlockFlow {P} at (4,4) size 762x40 - LayoutText {#text} at (15,0) size 722x39 - text run at (15,0) width 566: "This text should be flowing past a tall orange rectangle on the left side of the browser window. " - text run at (580,0) width 157: "In this case, it is the image" - text run at (15,20) width 201: "which has been floated to the left." - LayoutBlockFlow (anonymous) at (4,60) size 762x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutImage (floating) {IMG} at (751,98) size 15x50 - LayoutBlockFlow {P} at (4,106) size 762x40 - LayoutText {#text} at (0,0) size 730x39 - text run at (0,0) width 574: "This text should be flowing past a tall orange rectangle on the right side of the browser window. " - text run at (573,0) width 157: "In this case, it is the image" - text run at (0,20) width 209: "which has been floated to the right." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,207) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,199) size 784x2 [border: (1px inset #EEEEEE)] -layer at (25,398) size 762x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,88) size 762x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png deleted file mode 100644 index cb8a9a2..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt deleted file mode 100644 index c0dfb24..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_elements_in_series-expected.txt +++ /dev/null
@@ -1,244 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 732 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x732 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x732 - LayoutBlockFlow {BODY} at (8,8) size 769x704 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,33) size 769x208 - LayoutText {#text} at (0,0) size 512x208 - text run at (0,0) width 392: "P { margin: 0; padding: 0; text-align: justify;}" - text run at (392,0) width 0: " " - text run at (0,16) width 0: " " - text run at (0,32) width 336: "DIV.yellow, DIV.blue, DIV.red, DIV.green {" - text run at (336,32) width 0: " " - text run at (0,48) width 336: " width: 60px; padding: 20px; margin: 10px;" - text run at (336,48) width 0: " " - text run at (0,64) width 472: " border: 20px solid black; float: left; text-align: center;" - text run at (472,64) width 0: " " - text run at (0,80) width 360: " font-family: \"Times New Roman\",Times,serif;}" - text run at (360,80) width 0: " " - text run at (0,96) width 512: "DIV.yellow {margin-left: 0px; background: yellow; color: black;}" - text run at (512,96) width 0: " " - text run at (0,112) width 336: "DIV.blue {background: blue; color: white;}" - text run at (336,112) width 0: " " - text run at (0,128) width 320: "DIV.red {background: red; color: black;}" - text run at (320,128) width 0: " " - text run at (0,144) width 352: "DIV.green {background: green; color: white;}" - text run at (352,144) width 0: " " - text run at (0,160) width 192: "DIV.below {clear: both;}" - text run at (192,160) width 0: " " - text run at (0,176) width 200: "TABLE {margin: 20px 0px;}" - text run at (200,176) width 0: " " - text run at (0,192) width 0: " " - LayoutBlockFlow {P} at (0,264) size 769x40 - LayoutText {#text} at (0,0) size 769x39 - text run at (0,0) width 769: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this page" - text run at (0,20) width 380: "indicates how the DIV elements should be laid out horizontally. " - text run at (379,20) width 205: "They should align with each other." - LayoutBlockFlow (floating) {DIV} at (0,314) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "Yellow" - LayoutBlockFlow (floating) {DIV} at (160,314) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 27x19 - text run at (0,0) width 27: "Blue" - LayoutBlockFlow (floating) {DIV} at (320,314) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 25x19 - text run at (0,0) width 25: "Red" - LayoutBlockFlow (floating) {DIV} at (480,314) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "Green" - LayoutBlockFlow {DIV} at (0,424) size 769x21 - LayoutTable {TABLE} at (0,0) size 620x21 - LayoutTableSection {TBODY} at (0,0) size 620x21 - LayoutTableRow {TR} at (0,0) size 620x21 - LayoutTableCell {TD} at (0,10) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (20,10) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (120,10) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - LayoutTableCell {TD} at (140,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (160,10) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (180,10) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (280,10) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (300,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (320,10) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (340,10) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (440,0) size 20x21 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutText {#text} at (0,1) size 4x19 - text run at (0,1) width 4: ";" - LayoutTableCell {TD} at (460,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (480,10) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (500,10) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (600,10) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTable {TABLE} at (0,465) size 769x239 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x237 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x209 - LayoutTableCell {TD} at (0,118) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x209 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 747x39 - text run at (0,0) width 747: "The four floating DIV elements below should appear next to each other horizontally. The table at the bottom of this page" - text run at (0,20) width 380: "indicates how the DIV elements should be laid out horizontally. " - text run at (379,20) width 205: "They should align with each other." - LayoutBlockFlow (floating) {DIV} at (4,54) size 140x100 [bgcolor=#FFFF00] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 42x19 - text run at (0,0) width 42: "Yellow" - LayoutBlockFlow (floating) {DIV} at (164,54) size 140x100 [color=#FFFFFF] [bgcolor=#0000FF] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 27x19 - text run at (0,0) width 27: "Blue" - LayoutBlockFlow (floating) {DIV} at (324,54) size 140x100 [bgcolor=#FF0000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 25x19 - text run at (0,0) width 25: "Red" - LayoutBlockFlow (floating) {DIV} at (484,54) size 140x100 [color=#FFFFFF] [bgcolor=#008000] [border: (20px solid #000000)] - LayoutBlockFlow {P} at (40,40) size 60x20 - LayoutText {#text} at (0,0) size 37x19 - text run at (0,0) width 37: "Green" - LayoutBlockFlow {DIV} at (4,164) size 747x21 - LayoutTable {TABLE} at (0,0) size 620x21 - LayoutTableSection {TBODY} at (0,0) size 620x21 - LayoutTableRow {TR} at (0,0) size 620x21 - LayoutTableCell {TD} at (0,10) size 20x1 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (20,10) size 100x1 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (120,10) size 20x0 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1] - LayoutTableCell {TD} at (140,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (160,10) size 20x1 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (180,10) size 100x1 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (280,10) size 20x1 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (300,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (320,10) size 20x1 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (340,10) size 100x1 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (440,0) size 20x21 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutText {#text} at (0,1) size 4x19 - text run at (0,1) width 4: ";" - LayoutTableCell {TD} at (460,10) size 20x1 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (480,10) size 20x1 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 - LayoutTableCell {TD} at (500,10) size 100x1 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 100x1 - LayoutTableCell {TD} at (600,10) size 20x1 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1] - LayoutBlockFlow {IMG} at (0,0) size 20x1 -layer at (8,262) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,254) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (28,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (148,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (168,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (188,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (288,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (308,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (328,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (348,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (448,432) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (468,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (488,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (508,442) size 100x1 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (608,442) size 20x1 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (25,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (45,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (165,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (185,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (205,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (305,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (325,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (345,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (365,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (465,666) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (485,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (505,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (525,676) size 100x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 100x1 - LayoutInline {SPAN} at (0,0) size 0x0 -layer at (625,676) size 20x1 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {SPAN} at (0,0) size 20x1 - LayoutInline {SPAN} at (0,0) size 0x0
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_margin-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_margin-expected.png deleted file mode 100644 index a76c748..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt deleted file mode 100644 index 1f25473c..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_margin-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1915 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1915 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1915 - LayoutBlockFlow {BODY} at (8,8) size 769x1899 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 560x144 - text run at (0,0) width 344: "P.test {background: white; font-size: 20px;" - text run at (344,0) width 0: " " - text run at (0,16) width 560: " margin-left: 30px; margin-right: 10px; padding: 0; border: 0;}" - text run at (560,16) width 0: " " - text run at (0,32) width 312: "IMG {padding: 0; border: 0; margin: 0;}" - text run at (312,32) width 0: " " - text run at (0,48) width 200: "P.test IMG {float: left;}" - text run at (200,48) width 0: " " - text run at (0,64) width 352: "#img2 {margin-top: 30px; margin-left: 30px;}" - text run at (352,64) width 0: " " - text run at (0,80) width 368: "#img3 {margin-top: -30px; margin-left: -30px;}" - text run at (368,80) width 0: " " - text run at (0,96) width 384: "#img4 {margin-right: 30px; margin-bottom: 30px;}" - text run at (384,96) width 0: " " - text run at (0,112) width 400: "#img5 {margin-right: -30px; margin-bottom: -30px;}" - text run at (400,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow {P} at (30,215) size 729x92 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 719x91 - text run at (0,0) width 719: "This paragraph should have a white background which extends to the edges of the element's" - text run at (0,23) width 39: "box. " - text run at (39,23) width 430: "There is no padding set on this paragraph whatsoever. " - text run at (468,23) width 236: "If the background of the entire" - text run at (0,46) width 696: "box is not white, this may cause problems with the following tests; at any rate, it must be" - text run at (0,69) width 146: "taken into account." - LayoutBlockFlow {P} at (30,327) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (60,0) size 724x114 - text run at (60,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 112: "nothing more. " - text run at (172,23) width 552: "The edges of the white background should line up with the top and left" - text run at (60,46) width 156: "edges of the image. " - text run at (216,46) width 471: "This paragraph should have a white background, first of all," - text run at (0,69) width 381: "which extends to the edges of the element's box. " - text run at (381,69) width 325: "There is no padding set on this paragraph" - text run at (0,92) width 95: "whatsoever." - LayoutBlockFlow {P} at (30,462) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (30,30) size 60x60 - LayoutText {#text} at (90,0) size 726x114 - text run at (90,0) width 628: "The image in the upper left corner of this paragraph should be pushed down and" - text run at (90,23) width 627: "to the right 30 pixels each from the upper left corner of the paragraph's box, and" - text run at (90,46) width 319: "displace the paragraph text accordingly. " - text run at (408,46) width 282: "This paragraph should have a white" - text run at (90,69) width 571: "background, first of all, which extends to the edges of the element's box. " - text run at (661,69) width 65: "There is" - text run at (0,92) width 355: "no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,597) size 729x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (-30,-30) size 60x60 - LayoutText {#text} at (30,0) size 728x114 - text run at (30,0) width 682: "The image in the upper left corner of this paragraph should be pushed up and to the left" - text run at (30,23) width 683: "30 pixels each from the upper left corner of the paragraph's box, thus causing the edges" - text run at (0,46) width 556: "of the white background to align with the thick gray lines in the image. " - text run at (556,46) width 119: "This paragraph" - text run at (0,69) width 728: "should have a white background, first of all, which extends to the edges of the element's box." - text run at (0,92) width 425: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,732) size 729x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (90,0) size 728x137 - text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (90,23) width 616: "the edges of the white background should line up with the top and left edges of" - text run at (90,46) width 85: "the image. " - text run at (175,46) width 526: "However, there should be 30 pixels of space between the right and" - text run at (90,69) width 468: "bottom edges of the image and the paragraph text around it. " - text run at (558,69) width 119: "This paragraph" - text run at (0,92) width 728: "should have a white background, first of all, which extends to the edges of the element's box." - text run at (0,115) width 425: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (30,890) size 729x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (30,0) size 724x137 - text run at (30,0) width 693: "The image in the upper left corner of this paragraph should be floated left, and the edges" - text run at (30,23) width 623: "of the white background should line up with the top and left edges of the image." - text run at (0,46) width 724: "However, the text should overlap the image's right and bottom sides, lining up with the thick" - text run at (0,69) width 187: "gray lines in the image. " - text run at (187,69) width 524: "This paragraph should have a white background, first of all, which" - text run at (0,92) width 328: "extends to the edges of the element's box. " - text run at (328,92) width 325: "There is no padding set on this paragraph" - text run at (0,115) width 95: "whatsoever." - LayoutTable {TABLE} at (0,1048) size 769x851 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x849 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x821 - LayoutTableCell {TD} at (0,424) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x821 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (34,4) size 707x92 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 704x91 - text run at (0,0) width 641: "This paragraph should have a white background which extends to the edges of the" - text run at (0,23) width 117: "element's box. " - text run at (117,23) width 430: "There is no padding set on this paragraph whatsoever. " - text run at (546,23) width 158: "If the background of" - text run at (0,46) width 693: "the entire box is not white, this may cause problems with the following tests; at any rate," - text run at (0,69) width 227: "it must be taken into account." - LayoutBlockFlow {P} at (34,116) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (60,0) size 693x114 - text run at (60,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (60,23) width 112: "nothing more. " - text run at (172,23) width 521: "The edges of the white background should line up with the top and" - text run at (60,46) width 187: "left edges of the image. " - text run at (247,46) width 440: "This paragraph should have a white background, first of" - text run at (0,69) width 412: "all, which extends to the edges of the element's box. " - text run at (412,69) width 241: "There is no padding set on this" - text run at (0,92) width 179: "paragraph whatsoever." - LayoutBlockFlow {P} at (34,251) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (30,30) size 60x60 - LayoutText {#text} at (90,0) size 699x114 - text run at (90,0) width 595: "The image in the upper left corner of this paragraph should be pushed down" - text run at (90,23) width 588: "and to the right 30 pixels each from the upper left corner of the paragraph's" - text run at (90,46) width 391: "box, and displace the paragraph text accordingly. " - text run at (480,46) width 219: "This paragraph should have" - text run at (90,69) width 590: "a white background, first of all, which extends to the edges of the element's" - text run at (0,92) width 39: "box. " - text run at (39,92) width 425: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,386) size 707x115 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (-30,-30) size 60x60 - LayoutText {#text} at (30,0) size 695x114 - text run at (30,0) width 651: "The image in the upper left corner of this paragraph should be pushed up and to the" - text run at (30,23) width 664: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing the" - text run at (0,46) width 606: "edges of the white background to align with the thick gray lines in the image. " - text run at (606,46) width 35: "This" - text run at (0,69) width 695: "paragraph should have a white background, first of all, which extends to the edges of the" - text run at (0,92) width 117: "element's box. " - text run at (117,92) width 425: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,521) size 707x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (90,0) size 706x137 - text run at (90,0) width 615: "The image in the upper left corner of this paragraph should be floated left, and" - text run at (90,23) width 616: "the edges of the white background should line up with the top and left edges of" - text run at (90,46) width 85: "the image. " - text run at (175,46) width 526: "However, there should be 30 pixels of space between the right and" - text run at (90,69) width 468: "bottom edges of the image and the paragraph text around it. " - text run at (558,69) width 119: "This paragraph" - text run at (0,92) width 689: "should have a white background, first of all, which extends to the edges of the element's" - text run at (0,115) width 39: "box. " - text run at (39,115) width 425: "There is no padding set on this paragraph whatsoever." - LayoutBlockFlow {P} at (34,679) size 707x138 [bgcolor=#FFFFFF] - LayoutImage (floating) {IMG} at (0,0) size 60x60 - LayoutText {#text} at (30,0) size 706x137 - text run at (30,0) width 643: "The image in the upper left corner of this paragraph should be floated left, and the" - text run at (30,23) width 673: "edges of the white background should line up with the top and left edges of the image." - text run at (0,46) width 681: "However, the text should overlap the image's right and bottom sides, lining up with the" - text run at (0,69) width 230: "thick gray lines in the image. " - text run at (230,69) width 471: "This paragraph should have a white background, first of all," - text run at (0,92) width 381: "which extends to the edges of the element's box. " - text run at (381,92) width 325: "There is no padding set on this paragraph" - text run at (0,115) width 95: "whatsoever." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png deleted file mode 100644 index a0ee1de..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt deleted file mode 100644 index 75d8b39..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/float_on_text_elements-expected.txt +++ /dev/null
@@ -1,366 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2846 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2846 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2846 - LayoutBlockFlow {BODY} at (8,8) size 769x2830 [bgcolor=#CCCCCC] - LayoutBlockFlow (floating) {P} at (0,0) size 384.50x40 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 384x39 - text run at (0,0) width 384: "This paragraph is of class \"one\". It has a width of 50% and is" - text run at (0,20) width 105: "floated to the left." - LayoutBlockFlow {P} at (0,0) size 769x80 - LayoutText {#text} at (384,0) size 769x79 - text run at (384,0) width 385: "This paragraph should start on the right side of a yellow box" - text run at (384,20) width 385: "which contains the previous paragraph. Since the text of this" - text run at (0,40) width 769: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no padding," - text run at (0,60) width 708: "border or margins on this and the previous element, so the text of the two elements should be very close to each other." - LayoutBlockFlow (anonymous) at (0,80) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (anonymous) at (0,118) size 769x100 - LayoutBlockFlow (floating) {P} at (0,0) size 769x80 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 769x79 - text run at (0,0) width 769: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent element" - text run at (0,20) width 769: "allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a orange" - text run at (0,40) width 769: "square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this paragraph for" - text run at (0,60) width 123: "diagnostic purposes." - LayoutImage {IMG} at (0,80) size 15x15 - LayoutText {#text} at (15,80) size 4x19 - text run at (15,80) width 4: " " - LayoutBR {BR} at (19,95) size 0x0 - LayoutBlockFlow (anonymous) at (0,236) size 769x100 - LayoutBlockFlow (floating) {P} at (0,0) size 384.50x100 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 384x99 - text run at (0,0) width 384: "This paragraph is floated to the left and the orange square image" - text run at (0,20) width 384: "should appear to the right of the paragraph. This paragraph has" - text run at (0,40) width 384: "a yellow background and no padding, margin or border. The" - text run at (0,60) width 384: "right edge of this yellow box should be horizontally aligned with" - text run at (0,80) width 260: "the left edge of the yellow box undernearth." - LayoutImage {IMG} at (384.50,0) size 15x15 - LayoutText {#text} at (399,0) size 5x19 - text run at (399,0) width 5: " " - LayoutBR {BR} at (403,15) size 1x0 - LayoutBlockFlow (anonymous) at (0,354) size 769x120 - LayoutBlockFlow (floating) {P} at (384.50,0) size 384.50x120 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 384x119 - text run at (0,0) width 384: "This paragraph is floated to the right (using a STYLE attribute)" - text run at (0,20) width 384: "and the orange square image should appear to the left of the" - text run at (0,40) width 384: "paragraph. This paragraph has a yellow background and no" - text run at (0,60) width 384: "padding, margin or border. The left edge of this yellow box" - text run at (0,80) width 384: "should be horizonally aligned with the right edge of the yellow" - text run at (0,100) width 68: "box above." - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 4x19 - text run at (15,0) width 4: " " - LayoutBR {BR} at (19,15) size 0x0 - LayoutBlockFlow {P} at (0,492) size 769x60 - LayoutBlockFlow (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 21x36 - text run at (0,0) width 21: "T" - LayoutText {#text} at (48,0) size 769x59 - text run at (48,0) width 721: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as well as" - text run at (48,20) width 432: "bold, with a content width of 1.5em and a background-color of silver. " - text run at (479,20) width 290: "The top of the big letter \"T\" should be vertically" - text run at (0,40) width 559: "aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." - LayoutBlockFlow (anonymous) at (0,552) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {P} at (423,600) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - LayoutText {#text} at (8,8) size 320x199 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort of" - text run at (8,28) width 320: "like a 'sidebar' in a magazine article. Its width is" - text run at (8,48) width 320: "20em so the box should not be reformatted when the" - text run at (8,68) width 320: "size of the viewport is changed (e.g. when the" - text run at (8,88) width 320: "window is resized). The background color of the" - text run at (8,108) width 320: "element is yellow, and there should be a 3px solid" - text run at (8,128) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,148) width 320: "element has a 10px wide margin around it where the" - text run at (8,168) width 320: "blue background of the paragraph in the normal flow" - text run at (8,188) width 126: "should shine through." - LayoutBlockFlow {P} at (0,590) size 769x220 [bgcolor=#66CCFF] - LayoutText {#text} at (0,0) size 413x219 - text run at (0,0) width 413: "This paragraph is not floating. If there is enough room, the textual" - text run at (0,20) width 413: "content of the paragraph should appear on the left side of the yellow" - text run at (0,40) width 133: "\"sidebar\" on the right. " - text run at (133,40) width 280: "The content of this element should flow around" - text run at (0,60) width 126: "the floated element. " - text run at (126,60) width 287: "However, the floated element may or may not" - text run at (0,80) width 413: "be obscured by the blue background of this element, as the" - text run at (0,100) width 342: "specification does not say which is drawn \"on top.\" " - text run at (342,100) width 71: "Even if the" - text run at (0,120) width 413: "floated element is obscured, it still forces the content of this element" - text run at (0,140) width 107: "to flow around it. " - text run at (107,140) width 306: "If the floated element is not obscured, then the blue" - text run at (0,160) width 413: "rectangle of this paragraph should extend 10px above and to the" - text run at (0,180) width 413: "right of the sidebar's red border, due to the margin styles set for the" - text run at (0,200) width 95: "floated element." - LayoutBlockFlow (anonymous) at (0,810) size 769x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow {DIV} at (0,848) size 769x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - LayoutBlockFlow (floating) {DIV} at (425,14) size 330x250 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (5,5) size 320x240 - LayoutText {#text} at (0,0) size 320x239 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element which" - text run at (0,20) width 320: "is floated to the right. The width of the DIV element" - text run at (0,40) width 320: "is 20em. The background is yellow and there is a" - text run at (0,60) width 320: "5px padding, a 10px margin and no border. Since it" - text run at (0,80) width 320: "is floated, the yellow box should be rendered on top" - text run at (0,100) width 320: "of the background and borders of adjacent non-" - text run at (0,120) width 320: "floated elements. To the left of this yellow box there" - text run at (0,140) width 320: "should be a short paragraph with a blue background" - text run at (0,160) width 320: "and a red border. The yellow box should be" - text run at (0,180) width 320: "rendered on top of the bottom red border. I.e., the" - text run at (0,200) width 320: "bottom red border will appear broken where it's" - text run at (0,220) width 194: "overlaid by the yellow rectangle." - LayoutBlockFlow {P} at (4,4) size 761x20 - LayoutText {#text} at (0,0) size 255x19 - text run at (0,0) width 255: "See description in the box on the right side" - LayoutBlockFlow (anonymous) at (0,876) size 769x246 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {DIV} at (0,1140) size 192.25x80 [bgcolor=#66CCFF] - LayoutBlockFlow {P} at (0,0) size 192.25x80 - LayoutText {#text} at (0,0) size 192x79 - text run at (0,0) width 192: "This paragraph is inside a DIV" - text run at (0,20) width 192: "which is floated left. Its" - text run at (0,40) width 192: "background is blue and the" - text run at (0,60) width 83: "width is 25%." - LayoutBlockFlow (floating) {DIV} at (576.75,1140) size 192.25x80 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 192.25x80 - LayoutText {#text} at (0,0) size 192x79 - text run at (0,0) width 192: "This paragraph is inside a DIV" - text run at (0,20) width 192: "which is floated right. Its" - text run at (0,40) width 192: "background is yellow and the" - text run at (0,60) width 83: "width is 25%." - LayoutBlockFlow {P} at (0,1140) size 769x40 - LayoutText {#text} at (192,0) size 385x39 - text run at (192,0) width 385: "This paragraph should appear between a blue box (on the left)" - text run at (192,20) width 189: "and a yellow box (on the right)." - LayoutBlockFlow (anonymous) at (0,1180) size 769x40 - LayoutBR {BR} at (192,0) size 1x19 - LayoutBlockFlow (anonymous) at (0,1238) size 769x120 - LayoutBlockFlow (floating) {DIV} at (0,0) size 576.75x120 [bgcolor=#66CCFF] - LayoutBlockFlow (floating) {DIV} at (422.56,0) size 144.19x40 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 144.19x40 - LayoutText {#text} at (0,0) size 144x39 - text run at (0,0) width 144: "See description in the" - text run at (0,20) width 118: "box on the left side." - LayoutBlockFlow {P} at (0,0) size 576.75x120 - LayoutText {#text} at (0,0) size 576x119 - text run at (0,0) width 350: "This paragraph is inside a DIV which is floated left. The " - text run at (350,0) width 72: "background" - text run at (0,20) width 321: "of the DIV element is blue and its width is 75%. This " - text run at (321,20) width 101: "text should all be" - text run at (0,40) width 249: "inside the blue rectangle. The blue DIV " - text run at (249,40) width 327: "element has another DIV element as a child. It has a" - text run at (0,60) width 43: "yellow " - text run at (43,60) width 340: "background color and is floated to the right. Since it is a " - text run at (383,60) width 193: "child of the blue DIV, the yellow" - text run at (0,80) width 187: "DIV should appear inside the " - text run at (187,80) width 382: "blue rectangle. Due to it being floated to the right and having " - text run at (569,80) width 7: "a" - text run at (0,100) width 383: "10px right margin, the yellow rectange should have a 10px blue " - text run at (382,100) width 132: "stripe on its right side." - LayoutBR {BR} at (576,0) size 1x19 - LayoutTable {TABLE} at (0,1376) size 769x1454 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1452 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1424 - LayoutTableCell {TD} at (0,726) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1424 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (floating) {P} at (4,4) size 373.50x40 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 373x39 - text run at (0,0) width 373: "This paragraph is of class \"one\". It has a width of 50% and is" - text run at (0,20) width 105: "floated to the left." - LayoutBlockFlow {P} at (4,4) size 747x80 - LayoutText {#text} at (373,0) size 747x79 - text run at (373,0) width 374: "This paragraph should start on the right side of a yellow box" - text run at (373,20) width 374: "which contains the previous paragraph. Since the text of this" - text run at (0,40) width 747: "element is much longer than the text in the previous element, the text will wrap around the yellow box. There is no padding," - text run at (0,60) width 708: "border or margins on this and the previous element, so the text of the two elements should be very close to each other." - LayoutBlockFlow (anonymous) at (4,84) size 747x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (anonymous) at (4,122) size 747x100 - LayoutBlockFlow (floating) {P} at (0,0) size 747x80 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 747x79 - text run at (0,0) width 747: "This paragraph is of class \"two\". Since the width has been set to 100%, it should automatically be as wide as its parent" - text run at (0,20) width 747: "element allows it to be. Therefore, even though the element is floated, there is no room for other content on the sides and a" - text run at (0,40) width 747: "orange square image should be seen AFTER the paragraph, not next to it. A yellow background has been added to this" - text run at (0,60) width 209: "paragraph for diagnostic purposes." - LayoutImage {IMG} at (0,80) size 15x15 - LayoutText {#text} at (15,80) size 4x19 - text run at (15,80) width 4: " " - LayoutBR {BR} at (19,95) size 0x0 - LayoutBlockFlow (anonymous) at (4,240) size 747x120 - LayoutBlockFlow (floating) {P} at (0,0) size 373.50x120 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 374x119 - text run at (0,0) width 373: "This paragraph is floated to the left and the orange square" - text run at (0,20) width 373: "image should appear to the right of the paragraph. This" - text run at (0,40) width 373: "paragraph has a yellow background and no padding, margin" - text run at (0,60) width 374: "or border. The right edge of this yellow box should be" - text run at (0,80) width 373: "horizontally aligned with the left edge of the yellow box" - text run at (0,100) width 75: "undernearth." - LayoutImage {IMG} at (373.50,0) size 15x15 - LayoutText {#text} at (388,0) size 5x19 - text run at (388,0) width 5: " " - LayoutBR {BR} at (392,15) size 1x0 - LayoutBlockFlow (anonymous) at (4,378) size 747x120 - LayoutBlockFlow (floating) {P} at (373.50,0) size 373.50x120 [bgcolor=#FFFF00] - LayoutText {#text} at (0,0) size 373x119 - text run at (0,0) width 373: "This paragraph is floated to the right (using a STYLE" - text run at (0,20) width 373: "attribute) and the orange square image should appear to the" - text run at (0,40) width 373: "left of the paragraph. This paragraph has a yellow background" - text run at (0,60) width 373: "and no padding, margin or border. The left edge of this yellow" - text run at (0,80) width 373: "box should be horizonally aligned with the right edge of the" - text run at (0,100) width 111: "yellow box above." - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 4x19 - text run at (15,0) width 4: " " - LayoutBR {BR} at (19,15) size 0x0 - LayoutBlockFlow {P} at (4,516) size 747x60 - LayoutBlockFlow (floating) {SPAN} at (0,0) size 48x37 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 21x36 - text run at (0,0) width 21: "T" - LayoutText {#text} at (48,0) size 747x59 - text run at (48,0) width 699: "he first letter (a \"T\") of this paragraph should float left and be twice the font-size of the rest of the paragraph, as well" - text run at (48,20) width 460: "as bold, with a content width of 1.5em and a background-color of silver. " - text run at (507,20) width 240: "The top of the big letter \"T\" should be" - text run at (0,40) width 616: "vertically aligned with the top of the first line of this paragraph. This is commonly known as \"drop-cap\"." - LayoutBlockFlow (anonymous) at (4,576) size 747x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {P} at (405,624) size 336x216 [bgcolor=#FFFF00] [border: (3px solid #FF0000)] - LayoutText {#text} at (8,8) size 320x199 - text run at (8,8) width 320: "This paragraph should be floated to the right, sort of" - text run at (8,28) width 320: "like a 'sidebar' in a magazine article. Its width is" - text run at (8,48) width 320: "20em so the box should not be reformatted when the" - text run at (8,68) width 320: "size of the viewport is changed (e.g. when the" - text run at (8,88) width 320: "window is resized). The background color of the" - text run at (8,108) width 320: "element is yellow, and there should be a 3px solid" - text run at (8,128) width 320: "red border outside a 5px wide padding. Also, the" - text run at (8,148) width 320: "element has a 10px wide margin around it where the" - text run at (8,168) width 320: "blue background of the paragraph in the normal flow" - text run at (8,188) width 126: "should shine through." - LayoutBlockFlow {P} at (4,614) size 747x220 [bgcolor=#66CCFF] - LayoutText {#text} at (0,0) size 391x219 - text run at (0,0) width 391: "This paragraph is not floating. If there is enough room, the textual" - text run at (0,20) width 391: "content of the paragraph should appear on the left side of the" - text run at (0,40) width 181: "yellow \"sidebar\" on the right. " - text run at (181,40) width 210: "The content of this element should" - text run at (0,60) width 208: "flow around the floated element. " - text run at (208,60) width 183: "However, the floated element" - text run at (0,80) width 391: "may or may not be obscured by the blue background of this" - text run at (0,100) width 391: "element, as the specification does not say which is drawn \"on" - text run at (0,120) width 35: "top.\" " - text run at (35,120) width 356: "Even if the floated element is obscured, it still forces the" - text run at (0,140) width 249: "content of this element to flow around it. " - text run at (249,140) width 142: "If the floated element is" - text run at (0,160) width 391: "not obscured, then the blue rectangle of this paragraph should" - text run at (0,180) width 391: "extend 10px above and to the right of the sidebar's red border," - text run at (0,200) width 304: "due to the margin styles set for the floated element." - LayoutBlockFlow (anonymous) at (4,834) size 747x20 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow {DIV} at (4,872) size 747x28 [bgcolor=#66CCFF] [border: (4px solid #FF0000)] - LayoutBlockFlow (floating) {DIV} at (403,14) size 330x250 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (5,5) size 320x240 - LayoutText {#text} at (0,0) size 320x239 - text run at (0,0) width 320: "This paragraph is placed inside a DIV element which" - text run at (0,20) width 320: "is floated to the right. The width of the DIV element" - text run at (0,40) width 320: "is 20em. The background is yellow and there is a" - text run at (0,60) width 320: "5px padding, a 10px margin and no border. Since it" - text run at (0,80) width 320: "is floated, the yellow box should be rendered on top" - text run at (0,100) width 320: "of the background and borders of adjacent non-" - text run at (0,120) width 320: "floated elements. To the left of this yellow box there" - text run at (0,140) width 320: "should be a short paragraph with a blue background" - text run at (0,160) width 320: "and a red border. The yellow box should be" - text run at (0,180) width 320: "rendered on top of the bottom red border. I.e., the" - text run at (0,200) width 320: "bottom red border will appear broken where it's" - text run at (0,220) width 194: "overlaid by the yellow rectangle." - LayoutBlockFlow {P} at (4,4) size 739x20 - LayoutText {#text} at (0,0) size 255x19 - text run at (0,0) width 255: "See description in the box on the right side" - LayoutBlockFlow (anonymous) at (4,900) size 747x246 - LayoutBR {BR} at (0,0) size 0x19 - LayoutBlockFlow (floating) {DIV} at (4,1164) size 186.75x80 [bgcolor=#66CCFF] - LayoutBlockFlow {P} at (0,0) size 186.75x80 - LayoutText {#text} at (0,0) size 186x79 - text run at (0,0) width 186: "This paragraph is inside a DIV" - text run at (0,20) width 186: "which is floated left. Its" - text run at (0,40) width 186: "background is blue and the" - text run at (0,60) width 83: "width is 25%." - LayoutBlockFlow (floating) {DIV} at (564.25,1164) size 186.75x80 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 186.75x80 - LayoutText {#text} at (0,0) size 186x79 - text run at (0,0) width 186: "This paragraph is inside a DIV" - text run at (0,20) width 186: "which is floated right. Its" - text run at (0,40) width 186: "background is yellow and the" - text run at (0,60) width 83: "width is 25%." - LayoutBlockFlow {P} at (4,1164) size 747x40 - LayoutText {#text} at (186,0) size 374x39 - text run at (186,0) width 374: "This paragraph should appear between a blue box (on the" - text run at (186,20) width 28: "left) " - text run at (213,20) width 189: "and a yellow box (on the right)." - LayoutBlockFlow (anonymous) at (4,1204) size 747x40 - LayoutBR {BR} at (186,0) size 1x19 - LayoutBlockFlow (anonymous) at (4,1262) size 747x140 - LayoutBlockFlow (floating) {DIV} at (0,0) size 560.25x140 [bgcolor=#66CCFF] - LayoutBlockFlow (floating) {DIV} at (410.19,0) size 140.06x40 [bgcolor=#FFFF00] - LayoutBlockFlow {P} at (0,0) size 140.06x40 - LayoutText {#text} at (0,0) size 140x39 - text run at (0,0) width 140: "See description in the" - text run at (0,20) width 118: "box on the left side." - LayoutBlockFlow {P} at (0,0) size 560.25x140 - LayoutText {#text} at (0,0) size 560x139 - text run at (0,0) width 338: "This paragraph is inside a DIV which is floated left. The " - text run at (338,0) width 72: "background" - text run at (0,20) width 327: "of the DIV element is blue and its width is 75%. This " - text run at (327,20) width 83: "text should all" - text run at (0,40) width 258: "be inside the blue rectangle. The blue DIV " - text run at (258,40) width 302: "element has another DIV element as a child. It has" - text run at (0,60) width 55: "a yellow " - text run at (55,60) width 350: "background color and is floated to the right. Since it is a " - text run at (405,60) width 155: "child of the blue DIV, the" - text run at (0,80) width 230: "yellow DIV should appear inside the " - text run at (230,80) width 330: "blue rectangle. Due to it being floated to the right and" - text run at (0,100) width 43: "having " - text run at (43,100) width 413: "a 10px right margin, the yellow rectange should have a 10px blue " - text run at (455,100) width 105: "stripe on its right" - text run at (0,120) width 28: "side." - LayoutBR {BR} at (560,0) size 1x19 -layer at (8,116) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,108) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,234) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,226) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,352) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,344) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,490) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,482) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,588) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,580) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,846) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,838) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1138) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1130) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1236) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1228) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,1374) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,1366) size 769x2 [border: (1px inset #EEEEEE)] -layer at (25,1525) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,112) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1643) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,230) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1781) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,368) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1919) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,506) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2017) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,604) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2275) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,862) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2567) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1154) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2665) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1252) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,2823) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,1410) size 747x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/height-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/height-expected.png deleted file mode 100644 index 1f789a9..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/height-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/height-expected.txt deleted file mode 100644 index f58c5ead..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/height-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 997 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x997 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x997 - LayoutBlockFlow {BODY} at (8,8) size 769x981 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x48 - LayoutText {#text} at (0,0) size 168x48 - text run at (0,0) width 160: ".one {height: 50px;}" - text run at (160,0) width 0: " " - text run at (0,16) width 168: ".two {height: 100px;}" - text run at (168,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow (anonymous) at (0,107) size 769x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,173) size 769x20 - LayoutText {#text} at (0,0) size 259x19 - text run at (0,0) width 259: "The square above should be fifty pixels tall." - LayoutBlockFlow (anonymous) at (0,209) size 769x100 - LayoutImage {IMG} at (0,0) size 100x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,325) size 769x20 - LayoutText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "The square above should be 100 pixels tall and wide." - LayoutBlockFlow (anonymous) at (0,361) size 769x100 - LayoutImage {IMG} at (0,0) size 30x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,477) size 769x40 - LayoutText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has been" - text run at (0,20) width 109: "doubled using the " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (109,23) size 48x16 - text run at (109,23) width 48: "height" - LayoutText {#text} at (157,20) size 65x19 - text run at (157,20) width 65: " property)." - LayoutTable {TABLE} at (0,533) size 769x448 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x446 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x418 - LayoutTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (4,4) size 747x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,70) size 747x20 - LayoutText {#text} at (0,0) size 259x19 - text run at (0,0) width 259: "The square above should be fifty pixels tall." - LayoutBlockFlow (anonymous) at (4,106) size 747x100 - LayoutImage {IMG} at (0,0) size 100x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,222) size 747x20 - LayoutText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "The square above should be 100 pixels tall and wide." - LayoutBlockFlow (anonymous) at (4,258) size 747x100 - LayoutImage {IMG} at (0,0) size 30x100 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,374) size 747x40 - LayoutText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has been" - text run at (0,20) width 109: "doubled using the " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (109,23) size 48x16 - text run at (109,23) width 48: "height" - LayoutText {#text} at (157,20) size 65x19 - text run at (157,20) width 65: " property)." -layer at (8,105) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin-expected.png deleted file mode 100644 index 23945df..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin-expected.txt deleted file mode 100644 index 4d18d48..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin-expected.txt +++ /dev/null
@@ -1,166 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 802 scrollHeight 2690 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x2690 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x2690 - LayoutBlockFlow {BODY} at (8,8) size 784x2674 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x112 - LayoutText {#text} at (0,0) size 360x112 - text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" - text run at (352,0) width 0: " " - text run at (0,16) width 360: ".one {margin: 0.5in; background-color: aqua;}" - text run at (360,16) width 0: " " - text run at (0,32) width 352: ".two {margin: 25px; background-color: aqua;}" - text run at (352,32) width 0: " " - text run at (0,48) width 360: ".three {margin: 5em; background-color: aqua;}" - text run at (360,48) width 0: " " - text run at (0,64) width 352: ".four {margin: 25%; background-color: aqua;}" - text run at (352,64) width 0: " " - text run at (0,80) width 168: ".five {margin: 25px;}" - text run at (168,80) width 0: " " - text run at (0,96) width 360: ".six {margin: -10px; background-color: aqua;}" - text run at (360,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 784x40 - LayoutText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in section" - text run at (0,20) width 193: "4.1.1 of the CSS1 specification." - LayoutBlockFlow {P} at (0,235) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (48,303) size 688x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 618x19 - text run at (0,0) width 618: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,371) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (25,416) size 734x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 605x19 - text run at (0,0) width 605: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,461) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (80,561) size 624x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 581x19 - text run at (0,0) width 581: "This sentence should have an overall margin of 5 em, which will require extra text in order to test." - LayoutBlockFlow {P} at (0,661) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (196,877) size 392x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 375x59 - text run at (0,0) width 367: "This sentence should have an overall margin of 25%, which is" - text run at (0,20) width 350: "calculated with respect to the width of the parent element. " - text run at (350,20) width 25: "This" - text run at (0,40) width 222: "will require extra text in order to test." - LayoutBlockFlow {P} at (0,1133) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {UL} at (25,1178) size 734x130 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 694x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "This list has a margin of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 694x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (65,65) size 644x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 511x19 - text run at (0,0) width 511: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,110) size 694x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,1333) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (-10,1343) size 804x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 785x59 - text run at (0,0) width 785: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull subsequent" - text run at (0,20) width 281: "text up toward it, and a light blue background. " - text run at (281,20) width 369: "In all other respects, however, the element should be normal. " - text run at (649,20) width 123: "No styles have been" - text run at (0,40) width 401: "applied to it besides the negative margin and the background color." - LayoutBlockFlow {P} at (0,1393) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutTable {TABLE} at (0,1413) size 784x1261 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x1259 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x1231 - LayoutTableCell {TD} at (0,629) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x1231 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 - LayoutText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "NOTE: The following tests are separated by class-zero paragraphs, so as to prevent margin-collapsing as described in section" - text run at (0,20) width 193: "4.1.1 of the CSS1 specification." - LayoutBlockFlow {P} at (4,60) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (52,128) size 666x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 618x19 - text run at (0,0) width 618: "This sentence should have an overall margin of half an inch, which will require extra text in order to test." - LayoutBlockFlow {P} at (4,196) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (29,241) size 712x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 605x19 - text run at (0,0) width 605: "This sentence should have an overall margin of 25 pixels, which will require extra text in order to test." - LayoutBlockFlow {P} at (4,286) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (84,386) size 602x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 581x19 - text run at (0,0) width 581: "This sentence should have an overall margin of 5 em, which will require extra text in order to test." - LayoutBlockFlow {P} at (4,486) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (194.50,696.50) size 381x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 375x59 - text run at (0,0) width 367: "This sentence should have an overall margin of 25%, which is" - text run at (0,20) width 350: "calculated with respect to the width of the parent element. " - text run at (350,20) width 25: "This" - text run at (0,40) width 222: "will require extra text in order to test." - LayoutBlockFlow {P} at (4,947) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {UL} at (29,992) size 712x130 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 672x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 353x19 - text run at (0,0) width 353: "This list has a margin of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 672x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (65,65) size 622x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 511x19 - text run at (0,0) width 511: "This list item has a margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,110) size 672x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,1147) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (-6,1157) size 782x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 778x59 - text run at (0,0) width 714: "This paragraph has an overall margin of -10px, which should make it wider than usual as well as shift it upward and pull" - text run at (0,20) width 352: "subsequent text up toward it, and a light blue background. " - text run at (352,20) width 369: "In all other respects, however, the element should be normal. " - text run at (720,20) width 58: "No styles" - text run at (0,40) width 466: "have been applied to it besides the negative margin and the background color." - LayoutBlockFlow {P} at (4,1207) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." -layer at (8,169) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png deleted file mode 100644 index 79cf193..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt deleted file mode 100644 index 69a6090..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom-expected.txt +++ /dev/null
@@ -1,151 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1822 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1822 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1822.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1806.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 416x144 - text run at (0,0) width 408: ".zero {background-color: silver; margin-bottom: 0;}" - text run at (408,0) width 0: " " - text run at (0,16) width 416: ".one {margin-bottom: 0.5in; background-color: aqua;}" - text run at (416,16) width 0: " " - text run at (0,32) width 408: ".two {margin-bottom: 25px; background-color: aqua;}" - text run at (408,32) width 0: " " - text run at (0,48) width 416: ".three {margin-bottom: 5em; background-color: aqua;}" - text run at (416,48) width 0: " " - text run at (0,64) width 408: ".four {margin-bottom: 25%; background-color: aqua;}" - text run at (408,64) width 0: " " - text run at (0,80) width 224: ".five {margin-bottom: 25px;}" - text run at (224,80) width 0: " " - text run at (0,96) width 416: ".six {margin-bottom: -10px; background-color: aqua;}" - text run at (416,96) width 0: " " - text run at (0,112) width 176: "P, UL {margin-top: 0;}" - text run at (176,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow {P} at (0,203) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,223) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the margin" - text run at (0,20) width 147: "isn't applied to each line." - LayoutBlockFlow {P} at (0,311) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 757x39 - text run at (0,0) width 757: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (0,376) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 733x39 - text run at (0,0) width 733: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (0,496) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 726x39 - text run at (0,0) width 726: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (0,728.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,748.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." - LayoutBlockFlow {UL} at (0,768.25) size 769x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 402x19 - text run at (0,0) width 402: "This list has a margin-bottom of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,898.25) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 756x59 - text run at (0,0) width 756: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page, and no" - text run at (0,20) width 72: "top margin. " - text run at (71,20) width 468: "No other styles have been applied to it besides a light blue background color. " - text run at (538,20) width 195: "In all other respects, the element" - text run at (0,40) width 107: "should be normal." - LayoutBlockFlow {P} at (0,948.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,968.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." - LayoutTable {TABLE} at (0,988.25) size 769x818 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x816 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x788 - LayoutTableCell {TD} at (0,408) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x787.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,24) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 743x39 - text run at (0,0) width 743: "This sentence should have a bottom margin of half an inch, which will require extra text in order to make sure that the margin" - text run at (0,20) width 147: "isn't applied to each line." - LayoutBlockFlow {P} at (4,112) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 730x39 - text run at (0,0) width 730: "This sentence should have a bottom margin of 25 pixels, which will require extra text in order to make sure that the margin" - text run at (0,20) width 147: "isn't applied to each line." - LayoutBlockFlow {P} at (4,177) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 733x39 - text run at (0,0) width 733: "This sentence should have a bottom margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (4,297) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 726x39 - text run at (0,0) width 726: "This element should have a bottom margin of 25%, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (4,523.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,543.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." - LayoutBlockFlow {UL} at (4,563.75) size 747x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 402x19 - text run at (0,0) width 402: "This list has a margin-bottom of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,40) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This list item has a bottom margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,693.75) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 737x59 - text run at (0,0) width 737: "This paragraph has a bottom margin of -10px, which should cause elements after it to be shifted \"upward\" on the page, and" - text run at (0,20) width 91: "no top margin. " - text run at (90,20) width 468: "No other styles have been applied to it besides a light blue background color. " - text run at (557,20) width 145: "In all other respects, the" - text run at (0,40) width 157: "element should be normal." - LayoutBlockFlow {P} at (4,743.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,763.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png deleted file mode 100644 index 1226065..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt deleted file mode 100644 index d817719..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_bottom_inline-expected.txt +++ /dev/null
@@ -1,96 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 416x32 - text run at (0,0) width 408: ".one {margin-bottom: 25px; background-color: aqua;}" - text run at (408,0) width 0: " " - text run at (0,16) width 416: ".two {margin-bottom: -10px; background-color: aqua;}" - text run at (416,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 717x39 [bgcolor=#00FFFF] - LayoutText {#text} at (455,0) size 134x19 - text run at (455,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (588,3) size 25x16 - text run at (588,3) width 25: "one" - LayoutText {#text} at (612,0) size 717x39 - text run at (612,0) width 105: ", giving it an aqua" - text run at (0,20) width 235: "background and a 25px bottom margin" - LayoutText {#text} at (234,20) size 739x39 - text run at (234,20) width 9: ". " - text run at (242,20) width 497: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." - LayoutBlockFlow {P} at (0,175) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 717x39 [bgcolor=#00FFFF] - LayoutText {#text} at (455,0) size 134x19 - text run at (455,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (588,3) size 25x16 - text run at (588,3) width 25: "two" - LayoutText {#text} at (612,0) size 717x39 - text run at (612,0) width 105: ", giving it an aqua" - text run at (0,20) width 241: "background and a -10px bottom margin" - LayoutText {#text} at (240,20) size 745x39 - text run at (240,20) width 9: ". " - text run at (248,20) width 497: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." - LayoutTable {TABLE} at (0,251) size 784x174 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x172 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x144 - LayoutTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 717x39 [bgcolor=#00FFFF] - LayoutText {#text} at (455,0) size 134x19 - text run at (455,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (588,3) size 25x16 - text run at (588,3) width 25: "one" - LayoutText {#text} at (612,0) size 717x39 - text run at (612,0) width 105: ", giving it an aqua" - text run at (0,20) width 235: "background and a 25px bottom margin" - LayoutText {#text} at (234,20) size 739x39 - text run at (234,20) width 9: ". " - text run at (242,20) width 497: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." - LayoutBlockFlow {P} at (4,80) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 717x39 [bgcolor=#00FFFF] - LayoutText {#text} at (455,0) size 134x19 - text run at (455,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (588,3) size 25x16 - text run at (588,3) width 25: "two" - LayoutText {#text} at (612,0) size 717x39 - text run at (612,0) width 105: ", giving it an aqua" - text run at (0,20) width 241: "background and a -10px bottom margin" - LayoutText {#text} at (240,20) size 745x39 - text run at (240,20) width 9: ". " - text run at (248,20) width 497: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png deleted file mode 100644 index 5e42be9..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt deleted file mode 100644 index 6ab4520bf..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_inline-expected.txt +++ /dev/null
@@ -1,124 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 729 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x729 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x729 - LayoutBlockFlow {BODY} at (8,8) size 784x713 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 360x48 - text run at (0,0) width 352: ".zero {background-color: silver; margin: 0;}" - text run at (352,0) width 0: " " - text run at (0,16) width 352: ".one {margin: 25px; background-color: aqua;}" - text run at (352,16) width 0: " " - text run at (0,32) width 360: ".two {margin: -10px; background-color: aqua;}" - text run at (360,32) width 0: " " - LayoutBlockFlow {P} at (0,107) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,143) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 742x39 [bgcolor=#00FFFF] - LayoutText {#text} at (480,0) size 134x19 - text run at (480,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (613,3) size 25x16 - text run at (613,3) width 25: "one" - LayoutText {#text} at (637,0) size 742x39 - text run at (637,0) width 105: ", giving it an aqua" - text run at (0,20) width 188: "background and a 25px margin" - LayoutText {#text} at (212,20) size 767x59 - text run at (212,20) width 9: ". " - text run at (220,20) width 547: "Margins on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 201: "should have the same line-height. " - text run at (201,40) width 530: "However, there should be a 25px margin to the left side of the inline box in the first line it" - text run at (0,60) width 605: "appears, and a 25px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (0,239) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,275) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 783x39 [bgcolor=#00FFFF] - LayoutText {#text} at (445,0) size 134x19 - text run at (445,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (578,3) size 25x16 - text run at (578,3) width 25: "two" - LayoutText {#text} at (602,0) size 783x39 - text run at (602,0) width 181: ", giving it an aqua background" - text run at (0,20) width 118: "and a -10px margin" - LayoutText {#text} at (107,20) size 774x59 - text run at (107,20) width 9: ". " - text run at (115,20) width 644: "Margins on inline elements does not affect line-height calculations, so all lines in this element should have the" - text run at (0,40) width 104: "same line-height. " - text run at (104,40) width 670: "However, there should be a -10px margin to the left side of the inline box in the first line it appears, and a -10px" - text run at (0,60) width 477: "margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (0,371) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutTable {TABLE} at (0,391) size 784x322 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x320 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x292 - LayoutTableCell {TD} at (0,160) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x292 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 762x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 742x39 [bgcolor=#00FFFF] - LayoutText {#text} at (480,0) size 134x19 - text run at (480,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (613,3) size 25x16 - text run at (613,3) width 25: "one" - LayoutText {#text} at (637,0) size 742x39 - text run at (637,0) width 105: ", giving it an aqua" - text run at (0,20) width 188: "background and a 25px margin" - LayoutText {#text} at (212,20) size 746x59 - text run at (212,20) width 9: ". " - text run at (220,20) width 497: "Margins on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 495: "However, there should be a 25px margin to the left side of the inline box in the first" - text run at (0,60) width 640: "line it appears, and a 25px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (4,136) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,172) size 762x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 456x19 - text run at (0,0) width 372: "This element is unstyled save for a background color of gray.. " - text run at (371,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 707x39 [bgcolor=#00FFFF] - LayoutText {#text} at (445,0) size 134x19 - text run at (445,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (578,3) size 25x16 - text run at (578,3) width 25: "two" - LayoutText {#text} at (602,0) size 707x39 - text run at (602,0) width 105: ", giving it an aqua" - text run at (0,20) width 194: "background and a -10px margin" - LayoutText {#text} at (183,20) size 738x59 - text run at (183,20) width 9: ". " - text run at (191,20) width 547: "Margins on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 201: "should have the same line-height. " - text run at (201,40) width 536: "However, there should be a -10px margin to the left side of the inline box in the first line it" - text run at (0,60) width 611: "appears, and a -10px margin to the right side of the inline element box in the last line where it appears." - LayoutBlockFlow {P} at (4,268) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left-expected.png deleted file mode 100644 index 8243239..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt deleted file mode 100644 index a371e1b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left-expected.txt +++ /dev/null
@@ -1,120 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1057 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1057 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1057 - LayoutBlockFlow {BODY} at (8,8) size 769x1041 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 408x96 - text run at (0,0) width 392: ".zero {background-color: silver; margin-left: 0;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".one {margin-left: 0.5in; background-color: aqua;}" - text run at (400,16) width 0: " " - text run at (0,32) width 392: ".two {margin-left: 25px; background-color: aqua;}" - text run at (392,32) width 0: " " - text run at (0,48) width 400: ".three {margin-left: 5em; background-color: aqua;}" - text run at (400,48) width 0: " " - text run at (0,64) width 392: ".four {margin-left: 25%; background-color: aqua;}" - text run at (392,64) width 0: " " - text run at (0,80) width 408: ".five {margin-left: -10px; background-color: aqua;}" - text run at (408,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (48,199) size 721x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 324x19 - text run at (0,0) width 324: "This sentence should have a left margin of half an inch." - LayoutBlockFlow {P} at (25,235) size 744x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 311x19 - text run at (0,0) width 311: "This sentence should have a left margin of 25 pixels." - LayoutBlockFlow {P} at (80,271) size 689x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 287x19 - text run at (0,0) width 287: "This sentence should have a left margin of 5 em." - LayoutBlockFlow {P} at (192.25,307) size 576.75x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 570x39 - text run at (0,0) width 570: "This sentence should have a left margin of 25%, which is calculated with respect to the width of" - text run at (0,20) width 114: "the parent element." - LayoutBlockFlow {UL} at (25,363) size 744x100 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 704x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 655x19 - text run at (0,0) width 655: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." - LayoutListItem {LI} at (65,20) size 679x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 644x59 - text run at (0,0) width 625: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,20) width 59: "checked. " - text run at (59,20) width 585: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin to" - text run at (0,40) width 443: "make 50 pixels of margin, and its background color has been set to white." - LayoutListItem {LI} at (40,80) size 704x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 167x19 - text run at (0,0) width 167: "This is an unclassed list item" - LayoutBlockFlow {P} at (0,479) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (-10,515) size 779x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 770x59 - text run at (0,0) width 746: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (448,20) width 322: "No styles have been applied to it besides the negative" - text run at (0,40) width 224: "left margin and the background color." - LayoutTable {TABLE} at (0,591) size 769x450 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x448 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x420 - LayoutTableCell {TD} at (0,224) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x420 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (52,40) size 699x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 324x19 - text run at (0,0) width 324: "This sentence should have a left margin of half an inch." - LayoutBlockFlow {P} at (29,76) size 722x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 311x19 - text run at (0,0) width 311: "This sentence should have a left margin of 25 pixels." - LayoutBlockFlow {P} at (84,112) size 667x20 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 287x19 - text run at (0,0) width 287: "This sentence should have a left margin of 5 em." - LayoutBlockFlow {P} at (190.75,148) size 560.25x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 554x39 - text run at (0,0) width 554: "This sentence should have a left margin of 25%, which is calculated with respect to the width" - text run at (0,20) width 130: "of the parent element." - LayoutBlockFlow {UL} at (29,204) size 722x100 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 682x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 655x19 - text run at (0,0) width 655: "The left margin on this unordered list has been set to 25 pixels, and its background color has been set to gray." - LayoutListItem {LI} at (65,20) size 657x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 644x59 - text run at (0,0) width 625: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (0,20) width 59: "checked. " - text run at (59,20) width 585: "This list item has its left margin also set to 25 pixels, which should combine with the list's margin to" - text run at (0,40) width 443: "make 50 pixels of margin, and its background color has been set to white." - LayoutListItem {LI} at (40,80) size 682x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 167x19 - text run at (0,0) width 167: "This is an unclassed list item" - LayoutBlockFlow {P} at (4,320) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (-6,356) size 757x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 746x59 - text run at (0,0) width 746: "This paragraph has a left margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (448,20) width 269: "No styles have been applied to it besides the" - text run at (0,40) width 277: "negative left margin and the background color." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png deleted file mode 100644 index 83c6c3a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt deleted file mode 100644 index 4e11b88..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_left_inline-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 400x32 - text run at (0,0) width 392: ".one {margin-left: 25px; background-color: aqua;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".two {margin-left: -10px; background-color: aqua;}" - text run at (400,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (538,0) size 134x19 - text run at (538,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (671,3) size 25x16 - text run at (671,3) width 25: "one" - LayoutText {#text} at (695,0) size 782x39 - text run at (695,0) width 87: ", which should" - text run at (0,20) width 235: "result in 25-pixel left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (234,20) size 28x19 - text run at (234,20) width 28: "first" - LayoutText {#text} at (261,20) size 217x19 - text run at (261,20) width 217: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,155) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (503,0) size 134x19 - text run at (503,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (636,3) size 25x16 - text run at (636,3) width 25: "two" - LayoutText {#text} at (660,0) size 783x39 - text run at (660,0) width 123: ", which should result" - text run at (0,20) width 186: "in -10px left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (185,20) size 28x19 - text run at (185,20) width 28: "first" - LayoutText {#text} at (212,20) size 217x19 - text run at (212,20) width 217: " line in which the inline box appears." - LayoutTable {TABLE} at (0,211) size 784x134 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x132 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x104 - LayoutTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (538,0) size 134x19 - text run at (538,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (671,3) size 25x16 - text run at (671,3) width 25: "one" - LayoutText {#text} at (695,0) size 739x39 - text run at (695,0) width 44: ", which" - text run at (0,20) width 278: "should result in 25-pixel left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (277,20) size 28x19 - text run at (277,20) width 28: "first" - LayoutText {#text} at (304,20) size 217x19 - text run at (304,20) width 217: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,60) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (503,0) size 134x19 - text run at (503,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (636,3) size 25x16 - text run at (636,3) width 25: "two" - LayoutText {#text} at (660,0) size 747x39 - text run at (660,0) width 87: ", which should" - text run at (0,20) width 222: "result in -10px left margin only in the " - LayoutInline {STRONG} at (0,0) size 28x19 - LayoutText {#text} at (221,20) size 28x19 - text run at (221,20) width 28: "first" - LayoutText {#text} at (248,20) size 217x19 - text run at (248,20) width 217: " line in which the inline box appears." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right-expected.png deleted file mode 100644 index 33ca1bcd..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt deleted file mode 100644 index a98c349..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right-expected.txt +++ /dev/null
@@ -1,119 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 802 scrollHeight 1057 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1057 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1057 - LayoutBlockFlow {BODY} at (8,8) size 784x1041 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x96 - LayoutText {#text} at (0,0) size 560x96 - text run at (0,0) width 552: ".zero {background-color: silver; margin-right: 0; text-align: right;}" - text run at (552,0) width 0: " " - text run at (0,16) width 560: ".one {margin-right: 0.5in; text-align: right; background-color: aqua;}" - text run at (560,16) width 0: " " - text run at (0,32) width 552: ".two {margin-right: 25px; text-align: right; background-color: aqua;}" - text run at (552,32) width 0: " " - text run at (0,48) width 560: ".three {margin-right: 5em; text-align: right; background-color: aqua;}" - text run at (560,48) width 0: " " - text run at (0,64) width 552: ".four {margin-right: 25%; text-align: right; background-color: aqua;}" - text run at (552,64) width 0: " " - text run at (0,80) width 416: ".five {margin-right: -10px; background-color: aqua;}" - text run at (416,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (591,0) size 193x19 - text run at (591,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 736x20 [bgcolor=#00FFFF] - LayoutText {#text} at (404,0) size 332x19 - text run at (404,0) width 332: "This sentence should have a right margin of half an inch." - LayoutBlockFlow {P} at (0,235) size 759x20 [bgcolor=#00FFFF] - LayoutText {#text} at (440,0) size 319x19 - text run at (440,0) width 319: "This sentence should have a right margin of 25 pixels." - LayoutBlockFlow {P} at (0,271) size 704x20 [bgcolor=#00FFFF] - LayoutText {#text} at (409,0) size 295x19 - text run at (409,0) width 295: "This sentence should have a right margin of 5 em." - LayoutBlockFlow {P} at (0,307) size 588x40 [bgcolor=#00FFFF] - LayoutText {#text} at (10,0) size 578x39 - text run at (10,0) width 578: "This sentence should have a right margin of 25%, which is calculated with respect to the width of" - text run at (474,20) width 114: "the parent element." - LayoutBlockFlow {UL} at (0,363) size 759x100 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 719x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (51,0) size 668x19 - text run at (51,0) width 668: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." - LayoutListItem {LI} at (40,20) size 694x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (14,0) size 688x59 - text run at (14,0) width 680: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked." - text run at (6,20) width 688: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin to make 50 pixels" - text run at (344,40) width 350: "of margin, and its background-color has been set to white." - LayoutListItem {LI} at (40,80) size 719x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (552,0) size 167x19 - text run at (552,0) width 167: "This is an unclassed list item" - LayoutBlockFlow {P} at (0,479) size 784x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (591,0) size 193x19 - text run at (591,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,515) size 794x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 770x59 - text run at (0,0) width 754: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (448,20) width 322: "No styles have been applied to it besides the negative" - text run at (0,40) width 232: "right margin and the background color." - LayoutTable {TABLE} at (0,591) size 784x450 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x448 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x420 - LayoutTableCell {TD} at (0,224) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x420 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (569,0) size 193x19 - text run at (569,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 714x20 [bgcolor=#00FFFF] - LayoutText {#text} at (382,0) size 332x19 - text run at (382,0) width 332: "This sentence should have a right margin of half an inch." - LayoutBlockFlow {P} at (4,76) size 737x20 [bgcolor=#00FFFF] - LayoutText {#text} at (418,0) size 319x19 - text run at (418,0) width 319: "This sentence should have a right margin of 25 pixels." - LayoutBlockFlow {P} at (4,112) size 682x20 [bgcolor=#00FFFF] - LayoutText {#text} at (387,0) size 295x19 - text run at (387,0) width 295: "This sentence should have a right margin of 5 em." - LayoutBlockFlow {P} at (4,148) size 571.50x40 [bgcolor=#00FFFF] - LayoutText {#text} at (9,0) size 563x39 - text run at (9,0) width 563: "This sentence should have a right margin of 25%, which is calculated with respect to the width" - text run at (441,20) width 131: "of the parent element." - LayoutBlockFlow {UL} at (4,204) size 737x100 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 697x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (29,0) size 668x19 - text run at (29,0) width 668: "The right margin on this unordered list has been set to 25 pixels, and the background color has been set to gray." - LayoutListItem {LI} at (40,20) size 672x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (47,0) size 652x59 - text run at (47,0) width 625: "Another list item might not be such a bad idea, either, considering that such things do need to be double-" - text run at (20,20) width 60: "checked. " - text run at (79,20) width 593: "This list item has its right margin also set to 25 pixels, which should combine with the list's margin to" - text run at (227,40) width 445: "make 50 pixels of margin, and its background-color has been set to white." - LayoutListItem {LI} at (40,80) size 697x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (530,0) size 167x19 - text run at (530,0) width 167: "This is an unclassed list item" - LayoutBlockFlow {P} at (4,320) size 762x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (569,0) size 193x19 - text run at (569,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,356) size 772x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 770x59 - text run at (0,0) width 754: "This paragraph has a right margin of -10px, which should cause it to be wider than it might otherwise be, and it has a light blue" - text run at (0,20) width 80: "background. " - text run at (80,20) width 369: "In all other respects, however, the element should be normal. " - text run at (448,20) width 322: "No styles have been applied to it besides the negative" - text run at (0,40) width 232: "right margin and the background color." -layer at (8,153) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png deleted file mode 100644 index 963bb0b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt deleted file mode 100644 index ccfdadd..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_right_inline-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 552x32 - text run at (0,0) width 552: ".one {margin-right: 25px; text-align: right; background-color: aqua;}" - text run at (552,0) width 0: " " - text run at (0,16) width 408: ".two {margin-right: -10px; background-color: aqua;}" - text run at (408,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "one" - LayoutText {#text} at (695,0) size 782x39 - text run at (695,0) width 87: ", which should" - text run at (0,20) width 243: "result in 25-pixel right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x19 - LayoutText {#text} at (242,20) size 25x19 - text run at (242,20) width 25: "last" - LayoutText {#text} at (266,20) size 217x19 - text run at (266,20) width 217: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,155) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "two" - LayoutText {#text} at (660,0) size 783x39 - text run at (660,0) width 123: ", which should result" - text run at (0,20) width 194: "in -10px right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x19 - LayoutText {#text} at (193,20) size 25x19 - text run at (193,20) width 25: "last" - LayoutText {#text} at (217,20) size 217x19 - text run at (217,20) width 217: " line in which the inline box appears." - LayoutTable {TABLE} at (0,211) size 784x134 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x132 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x104 - LayoutTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "one" - LayoutText {#text} at (695,0) size 739x39 - text run at (695,0) width 44: ", which" - text run at (0,20) width 286: "should result in 25-pixel right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x19 - LayoutText {#text} at (285,20) size 25x19 - text run at (285,20) width 25: "last" - LayoutText {#text} at (309,20) size 217x19 - text run at (309,20) width 217: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,60) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "two" - LayoutText {#text} at (660,0) size 747x39 - text run at (660,0) width 87: ", which should" - text run at (0,20) width 230: "result in -10px right margin only in the " - LayoutInline {STRONG} at (0,0) size 25x19 - LayoutText {#text} at (229,20) size 25x19 - text run at (229,20) width 25: "last" - LayoutText {#text} at (253,20) size 217x19 - text run at (253,20) width 217: " line in which the inline box appears." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top-expected.png deleted file mode 100644 index aa54f029..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt deleted file mode 100644 index 5c659a8..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top-expected.txt +++ /dev/null
@@ -1,138 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1703 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1703 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1703.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1687.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,33) size 769x128 - LayoutText {#text} at (0,0) size 392x128 - text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" - text run at (384,0) width 0: " " - text run at (0,16) width 392: ".one {margin-top: 0.5in; background-color: aqua;}" - text run at (392,16) width 0: " " - text run at (0,32) width 384: ".two {margin-top: 25px; background-color: aqua;}" - text run at (384,32) width 0: " " - text run at (0,48) width 392: ".three {margin-top: 5em; background-color: aqua;}" - text run at (392,48) width 0: " " - text run at (0,64) width 384: ".four {margin-top: 25%; background-color: aqua;}" - text run at (384,64) width 0: " " - text run at (0,80) width 200: ".five {margin-top: 25px;}" - text run at (200,80) width 0: " " - text run at (0,96) width 392: ".six {margin-top: -10px; background-color: aqua;}" - text run at (392,96) width 0: " " - text run at (0,112) width 200: "P, UL {margin-bottom: 0;}" - text run at (200,112) width 0: " " - LayoutBlockFlow {P} at (0,184) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,204) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." - LayoutBlockFlow {P} at (0,272) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 741x39 - text run at (0,0) width 741: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (0,337) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (0,457) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 768x39 - text run at (0,0) width 768: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't applied to" - text run at (0,20) width 56: "each line." - LayoutBlockFlow {P} at (0,689.25) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 737x39 - text run at (0,0) width 688: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " - text run at (687,0) width 50: "This will" - text run at (0,20) width 198: "require extra text in order to test." - LayoutBlockFlow {UL} at (0,754.25) size 769x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 379x19 - text run at (0,0) width 379: "This list has a margin-top of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,65) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (0,859.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,869.25) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 750x39 - text run at (0,0) width 730: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom margin. " - text run at (729,0) width 21: "No" - text run at (0,20) width 444: "other styles have been applied to it besides a light blue background color. " - text run at (443,20) width 306: "In all other respects, the element should be normal." - LayoutTable {TABLE} at (0,909.25) size 769x778 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x776 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x748 - LayoutTableCell {TD} at (0,388) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x747.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,24) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This element also has a class of zero." - LayoutBlockFlow {P} at (4,92) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 741x39 - text run at (0,0) width 741: "This element should have a top margin of half an inch, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (4,157) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "This element should have a top margin of 25 pixels, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (4,277) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 704x39 - text run at (0,0) width 704: "This element should have a top margin of 5 em, which will require extra text in order to make sure that the margin isn't" - text run at (0,20) width 120: "applied to each line." - LayoutBlockFlow {P} at (4,503.75) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 737x39 - text run at (0,0) width 688: "This element should have a top margin of 25%, which is calculated with respect to the width of the parent element. " - text run at (687,0) width 50: "This will" - text run at (0,20) width 198: "require extra text in order to test." - LayoutBlockFlow {UL} at (4,568.75) size 747x105 [bgcolor=#00FFFF] - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 379x19 - text run at (0,0) width 379: "This list has a margin-top of 25px, and a light blue background." - LayoutListItem {LI} at (40,20) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 249x19 - text run at (0,0) width 249: "Therefore, it ought to have such a margin." - LayoutListItem {LI} at (40,65) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This list item has a top margin of 25px, which should cause it to be offset in some fashion." - LayoutListItem {LI} at (40,85) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 278x19 - text run at (0,0) width 278: "This list item has no special styles applied to it." - LayoutBlockFlow {P} at (4,673.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,683.75) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 726x59 - text run at (0,0) width 726: "This element has a top margin of -10px, which should cause it to be shifted \"upward\" on the page, and no bottom margin." - text run at (0,20) width 468: "No other styles have been applied to it besides a light blue background color. " - text run at (467,20) width 257: "In all other respects, the element should be" - text run at (0,40) width 45: "normal." -layer at (8,182) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,174) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png deleted file mode 100644 index c4d30bf..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt deleted file mode 100644 index d4edea4..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/margin_top_inline-expected.txt +++ /dev/null
@@ -1,99 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 392x64 - text run at (0,0) width 384: ".zero {background-color: silver; margin-top: 0;}" - text run at (384,0) width 0: " " - text run at (0,16) width 384: ".one {margin-top: 25px; background-color: aqua;}" - text run at (384,16) width 0: " " - text run at (0,32) width 392: ".two {margin-top: -10px; background-color: aqua;}" - text run at (392,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "one" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 212: "background and a 25px top margin" - LayoutText {#text} at (211,20) size 753x39 - text run at (211,20) width 9: ". " - text run at (219,20) width 534: "Margins on inline elements do not affect line-height calculations, so all lines in this element" - text run at (0,40) width 197: "should have the same line-height." - LayoutBlockFlow {P} at (0,207) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 775x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 775x39 - text run at (608,0) width 167: ", giving the inline element an" - text run at (0,20) width 251: "aqua background and a -10px top margin" - LayoutText {#text} at (250,20) size 742x39 - text run at (250,20) width 9: ". " - text run at (258,20) width 484: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." - LayoutTable {TABLE} at (0,283) size 784x174 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x172 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x144 - LayoutTableCell {TD} at (0,86) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x144 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "one" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 212: "background and a 25px top margin" - LayoutText {#text} at (211,20) size 753x39 - text run at (211,20) width 9: ". " - text run at (219,20) width 534: "Margins on inline elements do not affect line-height calculations, so all lines in this element" - text run at (0,40) width 197: "should have the same line-height." - LayoutBlockFlow {P} at (4,80) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 757x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 757x39 - text run at (608,0) width 149: ", giving the inline element" - text run at (0,20) width 269: "an aqua background and a -10px top margin" - LayoutText {#text} at (268,20) size 760x39 - text run at (268,20) width 9: ". " - text run at (276,20) width 484: "Margins on inline elements do not affect line-height calculations, so all lines in this" - text run at (0,40) width 247: "element should have the same line-height." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding-expected.png deleted file mode 100644 index 03e1257..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding-expected.txt deleted file mode 100644 index 70895084..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding-expected.txt +++ /dev/null
@@ -1,92 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2284 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2284 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2283.50 - LayoutBlockFlow {BODY} at (8,8) size 769x2267.50 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 376x96 - text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" - text run at (360,0) width 0: " " - text run at (0,16) width 368: ".one {padding: 0.5in; background-color: aqua;}" - text run at (368,16) width 0: " " - text run at (0,32) width 360: ".two {padding: 25px; background-color: aqua;}" - text run at (360,32) width 0: " " - text run at (0,48) width 368: ".three {padding: 5em; background-color: aqua;}" - text run at (368,48) width 0: " " - text run at (0,64) width 360: ".four {padding: 25%; background-color: aqua;}" - text run at (360,64) width 0: " " - text run at (0,80) width 376: ".five {padding: -20px; background-color: aqua;}" - text run at (376,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x136 [bgcolor=#00FFFF] - LayoutText {#text} at (48,48) size 653x39 - text run at (48,48) width 624: "This element should have an overall padding of half an inch, which will require extra text in order to test. " - text run at (672,48) width 29: "Both" - text run at (48,68) width 408: "the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,351) size 769x90 [bgcolor=#00FFFF] - LayoutText {#text} at (25,25) size 710x39 - text run at (25,25) width 611: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (636,25) width 99: "Both the content" - text run at (25,45) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,457) size 769x200 [bgcolor=#00FFFF] - LayoutText {#text} at (80,80) size 583x39 - text run at (80,80) width 583: "This element should have an overall padding of 5 em, which will require extra text in order to test." - text run at (80,100) width 441: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,673) size 769x464.50 [bgcolor=#00FFFF] - LayoutText {#text} at (192,192) size 380x80 - text run at (192,192) width 370: "This element should have an overall padding of 25%, which is" - text run at (192,212) width 351: "calculated with respect to the width of the parent element. " - text run at (542,212) width 30: "Both" - text run at (192,232) width 371: "the content background and the padding should be aqua (light" - text run at (192,252) width 35: "blue)." - LayoutBlockFlow {P} at (0,1153.50) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 733x39 - text run at (0,0) width 510: "This element should have no padding, since negative padding values are not allowed. " - text run at (510,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,1209.50) size 769x1058 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1056 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1028 - LayoutTableCell {TD} at (0,528) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1027.50 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x136 [bgcolor=#00FFFF] - LayoutText {#text} at (48,48) size 620x39 - text run at (48,48) width 620: "This element should have an overall padding of half an inch, which will require extra text in order to test." - text run at (48,68) width 441: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,192) size 747x90 [bgcolor=#00FFFF] - LayoutText {#text} at (25,25) size 662x39 - text run at (25,25) width 611: "This element should have an overall padding of 25 pixels, which will require extra text in order to test. " - text run at (636,25) width 51: "Both the" - text run at (25,45) width 386: "content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,298) size 747x200 [bgcolor=#00FFFF] - LayoutText {#text} at (80,80) size 583x39 - text run at (80,80) width 583: "This element should have an overall padding of 5 em, which will require extra text in order to test." - text run at (80,100) width 441: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,514) size 747x453.50 [bgcolor=#00FFFF] - LayoutText {#text} at (186,186) size 371x80 - text run at (186,186) width 370: "This element should have an overall padding of 25%, which is" - text run at (186,206) width 347: "calculated with respect to the width of the parent element." - text run at (186,226) width 371: "Both the content background and the padding should be aqua" - text run at (186,246) width 68: "(light blue)." - LayoutBlockFlow {P} at (4,983.50) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 733x39 - text run at (0,0) width 510: "This element should have no padding, since negative padding values are not allowed. " - text run at (510,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png deleted file mode 100644 index 15081963..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt deleted file mode 100644 index 8c24c1b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom-expected.txt +++ /dev/null
@@ -1,100 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1590 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1590 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1590.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1574.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 432x96 - text run at (0,0) width 416: ".zero {background-color: silver; padding-bottom: 0;}" - text run at (416,0) width 0: " " - text run at (0,16) width 424: ".one {padding-bottom: 0.5in; background-color: aqua;}" - text run at (424,16) width 0: " " - text run at (0,32) width 416: ".two {padding-bottom: 25px; background-color: aqua;}" - text run at (416,32) width 0: " " - text run at (0,48) width 424: ".three {padding-bottom: 5em; background-color: aqua;}" - text run at (424,48) width 0: " " - text run at (0,64) width 416: ".four {padding-bottom: 25%; background-color: aqua;}" - text run at (416,64) width 0: " " - text run at (0,80) width 432: ".five {padding-bottom: -20px; background-color: aqua;}" - text run at (432,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 719x39 - text run at (0,0) width 620: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (620,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,303) size 769x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 706x39 - text run at (0,0) width 607: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,384) size 769x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 758x39 - text run at (0,0) width 583: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (583,0) width 175: "Both the content background" - text run at (0,20) width 262: "and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,520) size 769x232.25 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 768x39 - text run at (0,0) width 719: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (719,0) width 49: "This will" - text run at (0,20) width 202: "require extra text in order to test. " - text run at (202,20) width 441: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,768.25) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,804.25) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 758x39 - text run at (0,0) width 557: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (557,0) width 201: "Both the content background and" - text run at (0,20) width 281: "the normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,860.25) size 769x714 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x712 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x684 - LayoutTableCell {TD} at (0,356) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x683.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 719x39 - text run at (0,0) width 620: "This element should have a bottom padding of half an inch, which will require extra text in order to test. " - text run at (620,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,144) size 747x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 706x39 - text run at (0,0) width 607: "This element should have a bottom padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,225) size 747x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 682x39 - text run at (0,0) width 583: "This element should have a bottom padding of 5 em, which will require extra text in order to test. " - text run at (583,0) width 99: "Both the content" - text run at (0,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,361) size 747x226.75 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 744x39 - text run at (0,0) width 719: "This element should have a bottom padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (719,0) width 25: "This" - text run at (0,20) width 226: "will require extra text in order to test. " - text run at (226,20) width 441: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,603.75) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,639.75) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 732x39 - text run at (0,0) width 557: "This element should have no bottom padding, since negative padding values are not allowed. " - text run at (557,0) width 175: "Both the content background" - text run at (0,20) width 307: "and the normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png deleted file mode 100644 index 9ba2494..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt deleted file mode 100644 index 363091c5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_bottom_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 424x48 - text run at (0,0) width 416: ".one {padding-bottom: 25px; background-color: aqua;}" - text run at (416,0) width 0: " " - text run at (0,16) width 424: ".two {padding-bottom: -10px; background-color: aqua;}" - text run at (424,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x64 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "one" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 243: "background and a 25px bottom padding" - LayoutText {#text} at (243,20) size 775x59 - text run at (243,20) width 8: ". " - text run at (251,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 524: "There may be implementation-specific limits on how much of the padding the user agent" - text run at (0,60) width 103: "is able to display." - LayoutBlockFlow {P} at (0,211) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 497: "background and no bottom padding, since negative padding values are not allowed" - LayoutText {#text} at (497,20) size 756x39 - text run at (497,20) width 8: ". " - text run at (505,20) width 251: "Padding on inline elements does not affect" - text run at (0,40) width 492: "line-height calculations, so all lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,287) size 784x194 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x192 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x164 - LayoutTableCell {TD} at (0,96) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x64 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "one" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 243: "background and a 25px bottom padding" - LayoutText {#text} at (243,20) size 747x59 - text run at (243,20) width 8: ". " - text run at (251,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 139: "agent is able to display." - LayoutBlockFlow {P} at (4,100) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 497: "background and no bottom padding, since negative padding values are not allowed" - LayoutText {#text} at (497,20) size 756x39 - text run at (497,20) width 8: ". " - text run at (505,20) width 251: "Padding on inline elements does not affect" - text run at (0,40) width 492: "line-height calculations, so all lines in this element should have the same line-height." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png deleted file mode 100644 index 56b0f8c..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt deleted file mode 100644 index f673b082..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_inline-expected.txt +++ /dev/null
@@ -1,127 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 809 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x809 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x809 - LayoutBlockFlow {BODY} at (8,8) size 769x793 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 368x64 - text run at (0,0) width 360: ".zero {background-color: silver; padding: 0;}" - text run at (360,0) width 0: " " - text run at (0,16) width 360: ".one {padding: 25px; background-color: aqua;}" - text run at (360,16) width 0: " " - text run at (0,32) width 368: ".two {padding: -10px; background-color: aqua;}" - text run at (368,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,167) size 769x120 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x89 [bgcolor=#00FFFF] - LayoutText {#text} at (476,0) size 134x19 - text run at (476,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (609,3) size 25x16 - text run at (609,3) width 25: "one" - LayoutText {#text} at (633,0) size 738x39 - text run at (633,0) width 105: ", giving it an aqua" - text run at (0,20) width 196: "background and a 25px padding" - LayoutText {#text} at (221,20) size 739x99 - text run at (221,20) width 8: ". " - text run at (229,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 308: "agent is able to display above and below each line. " - text run at (308,60) width 431: "However, there should be at least 25px of padding to the left side of the" - text run at (0,80) width 720: "inline box in the first line it appears, and 25px of padding to the right side of the inline element box in the last line where it" - text run at (0,100) width 52: "appears." - LayoutBlockFlow {P} at (0,303) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,339) size 769x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 450: "background and no padding, since negative padding values are not allowed" - LayoutText {#text} at (450,20) size 739x39 - text run at (450,20) width 8: ". " - text run at (458,20) width 281: "Padding on inline elements does not affect line-" - text run at (0,40) width 466: "height calculations, so all lines in this element should have the same line-height." - LayoutBlockFlow {P} at (0,415) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutTable {TABLE} at (0,451) size 769x342 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x340 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x312 - LayoutTableCell {TD} at (0,170) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x312 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x120 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 738x89 [bgcolor=#00FFFF] - LayoutText {#text} at (476,0) size 134x19 - text run at (476,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (609,3) size 25x16 - text run at (609,3) width 25: "one" - LayoutText {#text} at (633,0) size 738x39 - text run at (633,0) width 105: ", giving it an aqua" - text run at (0,20) width 196: "background and a 25px padding" - LayoutText {#text} at (221,20) size 739x99 - text run at (221,20) width 8: ". " - text run at (229,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 308: "agent is able to display above and below each line. " - text run at (308,60) width 431: "However, there should be at least 25px of padding to the left side of the" - text run at (0,80) width 720: "inline box in the first line it appears, and 25px of padding to the right side of the inline element box in the last line where it" - text run at (0,100) width 52: "appears." - LayoutBlockFlow {P} at (4,176) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,212) size 747x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 450: "background and no padding, since negative padding values are not allowed" - LayoutText {#text} at (450,20) size 739x39 - text run at (450,20) width 8: ". " - text run at (458,20) width 281: "Padding on inline elements does not affect line-" - text run at (0,40) width 466: "height calculations, so all lines in this element should have the same line-height." - LayoutBlockFlow {P} at (4,288) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left-expected.png deleted file mode 100644 index d31eecfb..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt deleted file mode 100644 index 968c6e9..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left-expected.txt +++ /dev/null
@@ -1,116 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1045 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1045 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1045 - LayoutBlockFlow {BODY} at (8,8) size 769x1029 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 416x96 - text run at (0,0) width 400: ".zero {background-color: silver; padding-left: 0;}" - text run at (400,0) width 0: " " - text run at (0,16) width 408: ".one {padding-left: 0.5in; background-color: aqua;}" - text run at (408,16) width 0: " " - text run at (0,32) width 400: ".two {padding-left: 25px; background-color: aqua;}" - text run at (400,32) width 0: " " - text run at (0,48) width 408: ".three {padding-left: 5em; background-color: aqua;}" - text run at (408,48) width 0: " " - text run at (0,64) width 400: ".four {padding-left: 25%; background-color: aqua;}" - text run at (400,64) width 0: " " - text run at (0,80) width 416: ".five {padding-left: -20px; background-color: aqua;}" - text run at (416,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 694x39 - text run at (48,0) width 595: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (643,0) width 99: "Both the content" - text run at (48,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,255) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 681x39 - text run at (25,0) width 582: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (25,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,311) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (80,0) size 653x39 - text run at (80,0) width 554: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (634,0) width 99: "Both the content" - text run at (80,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,367) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (192,0) size 573x39 - text run at (192,0) width 573: "This element should have a left padding of 25%, which is calculated with respect to the width of" - text run at (192,20) width 119: "the parent element. " - text run at (310,20) width 442: "Both the content background and the padding should be aqua (light blue)." - LayoutBlockFlow {UL} at (0,423) size 769x80 [bgcolor=#808080] - LayoutListItem {LI} at (25,0) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 682x19 - text run at (0,0) width 682: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." - LayoutListItem {LI} at (25,20) size 744x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (25,0) size 709x59 - text run at (25,0) width 684: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked. " - text run at (708,0) width 26: "This" - text run at (25,20) width 683: "list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50 pixels of" - text run at (25,40) width 44: "margin." - LayoutBlockFlow {P} at (0,519) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 755x39 - text run at (0,0) width 532: "This element should have no left padding, since negative padding values are not allowed. " - text run at (532,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,575) size 769x454 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x452 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x424 - LayoutTableCell {TD} at (0,226) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x424 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 694x39 - text run at (48,0) width 595: "This element should have a left padding of half an inch, which will require extra text in order to test. " - text run at (643,0) width 99: "Both the content" - text run at (48,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,96) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 681x39 - text run at (25,0) width 582: "This element should have a left padding of 25 pixels, which will require extra text in order to test. " - text run at (607,0) width 99: "Both the content" - text run at (25,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,152) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (80,0) size 653x39 - text run at (80,0) width 554: "This element should have a left padding of 5em, which will require extra text in order to test. " - text run at (634,0) width 99: "Both the content" - text run at (80,20) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,208) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (186,0) size 557x59 - text run at (186,0) width 557: "This element should have a left padding of 25%, which is calculated with respect to the width" - text run at (186,20) width 135: "of the parent element. " - text run at (320,20) width 404: "Both the content background and the padding should be aqua (light" - text run at (186,40) width 35: "blue)." - LayoutBlockFlow {UL} at (4,284) size 747x80 [bgcolor=#808080] - LayoutListItem {LI} at (25,0) size 722x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 682x19 - text run at (0,0) width 682: "The left padding on this unordered list has been set to 25 pixels, which will require some extra test in order to test." - LayoutListItem {LI} at (25,20) size 722x60 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (25,0) size 696x59 - text run at (25,0) width 680: "Another list item might not be such a bad idea, either, considering that such things do need to be double-checked." - text run at (25,20) width 696: "This list item has its left padding also set to 25 pixels, which should combine with the list's padding to make 50 pixels" - text run at (25,40) width 60: "of margin." - LayoutBlockFlow {P} at (4,380) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 733x39 - text run at (0,0) width 532: "This element should have no left padding, since negative padding values are not allowed. " - text run at (532,0) width 201: "Both the content background and" - text run at (0,20) width 281: "the normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png deleted file mode 100644 index c5f5b137..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt deleted file mode 100644 index 6af1111..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_left_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 408x48 - text run at (0,0) width 400: ".one {padding-left: 25px; background-color: aqua;}" - text run at (400,0) width 0: " " - text run at (0,16) width 408: ".two {padding-left: -10px; background-color: aqua;}" - text run at (408,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 183x19 [bgcolor=#00FFFF] - LayoutText {#text} at (538,0) size 134x19 - text run at (538,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (671,3) size 25x16 - text run at (671,3) width 25: "one" - LayoutText {#text} at (695,0) size 778x39 - text run at (695,0) width 83: " which should" - text run at (0,20) width 450: "result in 25-pixel left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (450,20) size 27x19 - text run at (450,20) width 27: "first" - LayoutText {#text} at (477,20) size 216x19 - text run at (477,20) width 216: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,171) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "two" - LayoutText {#text} at (670,0) size 753x39 - text run at (670,0) width 83: " which should" - text run at (0,20) width 437: "result in -10px left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (437,20) size 27x19 - text run at (437,20) width 27: "first" - LayoutText {#text} at (464,20) size 216x19 - text run at (464,20) width 216: " line in which the inline box appears." - LayoutTable {TABLE} at (0,227) size 784x134 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x132 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x104 - LayoutTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 183x19 [bgcolor=#00FFFF] - LayoutText {#text} at (538,0) size 134x19 - text run at (538,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (671,3) size 25x16 - text run at (671,3) width 25: "one" - LayoutText {#text} at (695,0) size 735x39 - text run at (695,0) width 40: " which" - text run at (0,20) width 493: "should result in 25-pixel left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (493,20) size 27x19 - text run at (493,20) width 27: "first" - LayoutText {#text} at (520,20) size 216x19 - text run at (520,20) width 216: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,60) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "two" - LayoutText {#text} at (670,0) size 753x39 - text run at (670,0) width 83: " which should" - text run at (0,20) width 437: "result in -10px left padding (which should also be a light blue) only in the " - LayoutInline {STRONG} at (0,0) size 27x19 - LayoutText {#text} at (437,20) size 27x19 - text run at (437,20) width 27: "first" - LayoutText {#text} at (464,20) size 216x19 - text run at (464,20) width 216: " line in which the inline box appears." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right-expected.png deleted file mode 100644 index 4da4ea5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt deleted file mode 100644 index a7445fe..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right-expected.txt +++ /dev/null
@@ -1,131 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1185 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1185 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1185 - LayoutBlockFlow {BODY} at (8,8) size 769x1169 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 576x96 - text run at (0,0) width 408: ".zero {background-color: silver; padding-right: 0;}" - text run at (408,0) width 0: " " - text run at (0,16) width 568: ".one {padding-right: 0.5in; text-align: right; background-color: aqua;}" - text run at (568,16) width 0: " " - text run at (0,32) width 560: ".two {padding-right: 25px; text-align: right; background-color: aqua;}" - text run at (560,32) width 0: " " - text run at (0,48) width 568: ".three {padding-right: 5em; text-align: right; background-color: aqua;}" - text run at (568,48) width 0: " " - text run at (0,64) width 560: ".four {padding-right: 25%; text-align: right; background-color: aqua;}" - text run at (560,64) width 0: " " - text run at (0,80) width 576: ".five {padding-right: -20px; text-align: right; background-color: aqua;}" - text run at (576,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (19,0) size 702x59 - text run at (19,0) width 603: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (622,0) width 99: "Both the content" - text run at (39,20) width 342: "background and the padding should be aqua (light blue). " - text run at (381,20) width 340: "The text has been right-aligned in order to make the right" - text run at (590,40) width 131: "padding easier to see." - LayoutBlockFlow {P} at (0,275) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (55,0) size 734x59 - text run at (55,0) width 590: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (645,0) width 99: "Both the content" - text run at (10,20) width 342: "background and the padding should be aqua (light blue). " - text run at (352,20) width 392: "The text has been right-aligned in order to make the right padding" - text run at (665,40) width 79: "easier to see." - LayoutBlockFlow {P} at (0,351) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (24,0) size 682x59 - text run at (24,0) width 566: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (590,0) width 99: "Both the content" - text run at (7,20) width 342: "background and the padding should be aqua (light blue). " - text run at (349,20) width 340: "The text has been right-aligned in order to make the right" - text run at (558,40) width 131: "padding easier to see." - LayoutBlockFlow {P} at (0,427) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (12,0) size 576x59 - text run at (12,0) width 565: "This element should have a right padding of 25%, which is calculated with respect to the width" - text run at (1,20) width 135: "of the parent element. " - text run at (135,20) width 442: "Both the content background and the padding should be aqua (light blue)." - text run at (101,40) width 476: "The text has been right-aligned in order to make the right padding easier to see." - LayoutBlockFlow {UL} at (0,503) size 769x40 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 704x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (13,0) size 691x19 - text run at (13,0) width 691: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to test." - LayoutListItem {LI} at (40,20) size 704x20 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (5,0) size 674x19 - text run at (5,0) width 674: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL element." - LayoutBlockFlow {P} at (0,559) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (6,0) size 763x59 - text run at (6,0) width 540: "This element should have no right padding, since negative padding values are not allowed. " - text run at (546,0) width 223: "Both the content background and the" - text run at (14,20) width 263: "normal padding should be aqua (light blue). " - text run at (277,20) width 492: "The text has been right-aligned in order to make the lack of right padding easier to" - text run at (745,40) width 24: "see." - LayoutTable {TABLE} at (0,635) size 769x534 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x532 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x504 - LayoutTableCell {TD} at (0,266) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x504 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (45,0) size 678x59 - text run at (45,0) width 603: "This element should have a right padding of half an inch, which will require extra text in order to test. " - text run at (648,0) width 51: "Both the" - text run at (21,20) width 390: "content background and the padding should be aqua (light blue). " - text run at (411,20) width 288: "The text has been right-aligned in order to make" - text run at (516,40) width 183: "the right padding easier to see." - LayoutBlockFlow {P} at (4,116) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (33,0) size 689x59 - text run at (33,0) width 590: "This element should have a right padding of 25 pixels, which will require extra text in order to test. " - text run at (623,0) width 99: "Both the content" - text run at (40,20) width 342: "background and the padding should be aqua (light blue). " - text run at (382,20) width 340: "The text has been right-aligned in order to make the right" - text run at (591,40) width 131: "padding easier to see." - LayoutBlockFlow {P} at (4,192) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (2,0) size 665x59 - text run at (2,0) width 566: "This element should have a right padding of 5 em, which will require extra text in order to test. " - text run at (568,0) width 99: "Both the content" - text run at (15,20) width 342: "background and the padding should be aqua (light blue). " - text run at (357,20) width 310: "The text has been right-aligned in order to make the" - text run at (506,40) width 161: "right padding easier to see." - LayoutBlockFlow {P} at (4,268) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (33,0) size 547x59 - text run at (33,0) width 528: "This element should have a right padding of 25%, which is calculated with respect to the" - text run at (19,20) width 172: "width of the parent element. " - text run at (190,20) width 371: "Both the content background and the padding should be aqua" - text run at (14,40) width 72: "(light blue). " - text run at (85,40) width 476: "The text has been right-aligned in order to make the right padding easier to see." - LayoutBlockFlow {UL} at (4,344) size 747x80 [bgcolor=#808080] - LayoutListItem {LI} at (40,0) size 682x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (20,0) size 662x39 - text run at (20,0) width 662: "The right padding on this unordered list has been set to 25 pixels, which will require some extra text in order to" - text run at (657,20) width 25: "test." - LayoutListItem {LI} at (40,40) size 682x40 [bgcolor=#FFFFFF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (37,0) size 620x39 - text run at (37,0) width 620: "This list item has a right padding of 25 pixels, which will appear to the left of the gray padding of the UL" - text run at (607,20) width 50: "element." - LayoutBlockFlow {P} at (4,440) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (6,0) size 741x59 - text run at (6,0) width 540: "This element should have no right padding, since negative padding values are not allowed. " - text run at (546,0) width 201: "Both the content background and" - text run at (25,20) width 285: "the normal padding should be aqua (light blue). " - text run at (310,20) width 437: "The text has been right-aligned in order to make the lack of right padding" - text run at (668,40) width 79: "easier to see." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png deleted file mode 100644 index fa1b663..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt deleted file mode 100644 index 028b1b0..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_right_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 568x48 - text run at (0,0) width 560: ".one {padding-right: 25px; text-align: right; background-color: aqua;}" - text run at (560,0) width 0: " " - text run at (0,16) width 568: ".two {padding-right: -10px; text-align: right; background-color: aqua;}" - text run at (568,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 183x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "one" - LayoutText {#text} at (695,0) size 782x39 - text run at (695,0) width 87: ", which should" - text run at (0,20) width 447: "result in 25-pixel right padding (which should also be light blue) only in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (447,20) size 24x19 - text run at (447,20) width 24: "last" - LayoutText {#text} at (471,20) size 216x19 - text run at (471,20) width 216: " line in which the inline box appears." - LayoutBlockFlow {P} at (0,171) size 784x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "two" - LayoutText {#text} at (670,0) size 757x39 - text run at (670,0) width 87: ", which should" - text run at (0,20) width 472: "result in no right padding, since negative padding values are not allowed, in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (472,20) size 24x19 - text run at (472,20) width 24: "last" - LayoutText {#text} at (496,20) size 216x19 - text run at (496,20) width 216: " line in which the inline box appears." - LayoutTable {TABLE} at (0,227) size 784x134 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x132 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x104 - LayoutTableCell {TD} at (0,66) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x104 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 183x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "one" - LayoutText {#text} at (695,0) size 739x39 - text run at (695,0) width 44: ", which" - text run at (0,20) width 490: "should result in 25-pixel right padding (which should also be light blue) only in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (490,20) size 24x19 - text run at (490,20) width 24: "last" - LayoutText {#text} at (514,20) size 216x19 - text run at (514,20) width 216: " line in which the inline box appears." - LayoutBlockFlow {P} at (4,60) size 762x40 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 514x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 147: "However, it contains an " - LayoutInline {SPAN} at (0,0) size 158x19 [bgcolor=#00FFFF] - LayoutText {#text} at (513,0) size 134x19 - text run at (513,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (646,3) size 25x16 - text run at (646,3) width 25: "two" - LayoutText {#text} at (670,0) size 757x39 - text run at (670,0) width 87: ", which should" - text run at (0,20) width 472: "result in no right padding, since negative padding values are not allowed, in the " - LayoutInline {STRONG} at (0,0) size 24x19 - LayoutText {#text} at (472,20) size 24x19 - text run at (472,20) width 24: "last" - LayoutText {#text} at (496,20) size 216x19 - text run at (496,20) width 216: " line in which the inline box appears." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top-expected.png deleted file mode 100644 index 8ed50c94..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt deleted file mode 100644 index 90571a7..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top-expected.txt +++ /dev/null
@@ -1,94 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1518 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1518 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1518.25 - LayoutBlockFlow {BODY} at (8,8) size 769x1502.25 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 408x96 - text run at (0,0) width 392: ".zero {background-color: silver; padding-top: 0;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".one {padding-top: 0.5in; background-color: aqua;}" - text run at (400,16) width 0: " " - text run at (0,32) width 392: ".two {padding-top: 25px; background-color: aqua;}" - text run at (392,32) width 0: " " - text run at (0,48) width 400: ".three {padding-top: 5em; background-color: aqua;}" - text run at (400,48) width 0: " " - text run at (0,64) width 392: ".four {padding-top: 25%; background-color: aqua;}" - text run at (392,64) width 0: " " - text run at (0,80) width 408: ".five {padding-top: -20px; background-color: aqua;}" - text run at (408,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (0,199) size 769x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,48) size 696x39 - text run at (0,48) width 597: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (597,48) width 99: "Both the content" - text run at (0,68) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,303) size 769x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,25) size 759x39 - text run at (0,25) width 584: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (584,25) width 175: "Both the content background" - text run at (0,45) width 262: "and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,384) size 769x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,80) size 761x39 - text run at (0,80) width 560: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (560,80) width 201: "Both the content background and" - text run at (0,100) width 236: "the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (0,520) size 769x232.25 [bgcolor=#00FFFF] - LayoutText {#text} at (0,192) size 747x40 - text run at (0,192) width 696: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (696,192) width 51: "Both the" - text run at (0,212) width 390: "content background and the padding should be aqua (light blue). " - text run at (390,212) width 251: "This will require extra text in order to test." - LayoutBlockFlow {P} at (0,768.25) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 757x39 - text run at (0,0) width 534: "This element should have no top padding, since negative padding values are not allowed. " - text run at (534,0) width 223: "Both the content background and the" - text run at (0,20) width 259: "normal padding should be aqua (light blue)." - LayoutTable {TABLE} at (0,824.25) size 769x678 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x676 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x648 - LayoutTableCell {TD} at (0,338) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x647.75 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 193x19 - text run at (0,0) width 193: "This element has a class of zero." - LayoutBlockFlow {P} at (4,40) size 747x88 [bgcolor=#00FFFF] - LayoutText {#text} at (0,48) size 696x39 - text run at (0,48) width 597: "This element should have a top padding of half an inch, which will require extra text in order to test. " - text run at (597,48) width 99: "Both the content" - text run at (0,68) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,144) size 747x65 [bgcolor=#00FFFF] - LayoutText {#text} at (0,25) size 683x39 - text run at (0,25) width 584: "This element should have a top padding of 25 pixels, which will require extra text in order to test. " - text run at (584,25) width 99: "Both the content" - text run at (0,45) width 338: "background and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,225) size 747x120 [bgcolor=#00FFFF] - LayoutText {#text} at (0,80) size 735x39 - text run at (0,80) width 560: "This element should have a top padding of 5 em, which will require extra text in order to test. " - text run at (560,80) width 175: "Both the content background" - text run at (0,100) width 262: "and the padding should be aqua (light blue)." - LayoutBlockFlow {P} at (4,361) size 747x226.75 [bgcolor=#00FFFF] - LayoutText {#text} at (0,186) size 747x40 - text run at (0,186) width 696: "This element should have a top padding of 25%, which is calculated with respect to the width of the parent element. " - text run at (696,186) width 51: "Both the" - text run at (0,206) width 390: "content background and the padding should be aqua (light blue). " - text run at (390,206) width 251: "This will require extra text in order to test." - LayoutBlockFlow {P} at (4,603.75) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 735x39 - text run at (0,0) width 534: "This element should have no top padding, since negative padding values are not allowed. " - text run at (534,0) width 201: "Both the content background and" - text run at (0,20) width 281: "the normal padding should be aqua (light blue)." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png deleted file mode 100644 index 063c026..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt deleted file mode 100644 index c488791..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/padding_top_inline-expected.txt +++ /dev/null
@@ -1,101 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 400x48 - text run at (0,0) width 392: ".one {padding-top: 25px; background-color: aqua;}" - text run at (392,0) width 0: " " - text run at (0,16) width 400: ".two {padding-top: -10px; background-color: aqua;}" - text run at (400,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x64 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "one" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 220: "background and a 25px top padding" - LayoutText {#text} at (220,20) size 783x59 - text run at (220,20) width 8: ". " - text run at (228,20) width 546: "Padding on inline elements does not affect line-height calculations, so all lines in this element" - text run at (0,40) width 201: "should have the same line-height. " - text run at (201,40) width 582: "There may be implementation-specific limits on how much of the padding the user agent is able to" - text run at (0,60) width 45: "display." - LayoutBlockFlow {P} at (0,211) size 784x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 474: "background and no top padding, since negative padding values are not allowed" - LayoutText {#text} at (474,20) size 763x39 - text run at (474,20) width 8: ". " - text run at (482,20) width 281: "Padding on inline elements does not affect line-" - text run at (0,40) width 466: "height calculations, so all lines in this element should have the same line-height." - LayoutTable {TABLE} at (0,287) size 784x194 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x192 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x164 - LayoutTableCell {TD} at (0,96) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x164 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x80 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x64 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "one" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 220: "background and a 25px top padding" - LayoutText {#text} at (220,20) size 739x59 - text run at (220,20) width 8: ". " - text run at (228,20) width 496: "Padding on inline elements does not affect line-height calculations, so all lines in this" - text run at (0,40) width 251: "element should have the same line-height. " - text run at (251,40) width 488: "There may be implementation-specific limits on how much of the padding the user" - text run at (0,60) width 139: "agent is able to display." - LayoutBlockFlow {P} at (4,100) size 762x60 [bgcolor=#808080] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 368: "This element is unstyled save for a background color of gray. " - text run at (367,0) width 85: "It contains an " - LayoutInline {SPAN} at (0,0) size 713x39 [bgcolor=#00FFFF] - LayoutText {#text} at (451,0) size 134x19 - text run at (451,0) width 134: "inline element of class " - LayoutInline {TT} at (0,0) size 25x16 - LayoutText {#text} at (584,3) size 25x16 - text run at (584,3) width 25: "two" - LayoutText {#text} at (608,0) size 713x39 - text run at (608,0) width 105: ", giving it an aqua" - text run at (0,20) width 474: "background and no top padding, since negative padding values are not allowed" - LayoutText {#text} at (474,20) size 733x39 - text run at (474,20) width 8: ". " - text run at (482,20) width 251: "Padding on inline elements does not affect" - text run at (0,40) width 492: "line-height calculations, so all lines in this element should have the same line-height." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/width-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/width-expected.png deleted file mode 100644 index 4fd63c2..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/width-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/width-expected.txt deleted file mode 100644 index 6fb23fc..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/box_properties/width-expected.txt +++ /dev/null
@@ -1,86 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1391 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1391 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1390.50 - LayoutBlockFlow {BODY} at (8,8) size 769x1374.50 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x48 - LayoutText {#text} at (0,0) size 152x48 - text run at (0,0) width 152: ".one {width: 50px;}" - text run at (152,0) width 0: " " - text run at (0,16) width 144: ".two {width: 50%;}" - text run at (144,16) width 0: " " - text run at (0,32) width 152: "TABLE {width: 50%;}" - text run at (152,32) width 0: " " - LayoutBlockFlow (anonymous) at (0,107) size 769x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,173) size 769x20 - LayoutText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "The square above should be fifty pixels wide." - LayoutBlockFlow (anonymous) at (0,209) size 769x384.50 - LayoutImage {IMG} at (0,0) size 384.50x384.50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,609.50) size 769x20 - LayoutText {#text} at (0,0) size 641x19 - text run at (0,0) width 641: "The square above should be half as wide as the image's parent element (either the BODY or the table cell)." - LayoutBlockFlow {P} at (0,645.50) size 384.50x100 - LayoutText {#text} at (0,0) size 361x79 - text run at (0,0) width 361: "This paragraph should be half the width of its parent element" - text run at (0,20) width 358: "(either the BODY or the table, which should itself be half as" - text run at (0,40) width 179: "wide as the BODY element). " - text run at (179,40) width 168: "This is extra text included to" - text run at (0,60) width 233: "ensure that this will be a fair test of the " - LayoutInline {CODE} at (0,0) size 40x16 - LayoutText {#text} at (233,63) size 40x16 - text run at (233,63) width 40: "width" - LayoutText {#text} at (273,60) size 377x39 - text run at (273,60) width 104: " property without" - text run at (0,80) width 303: "the need for the user to resize the viewing window." - LayoutTable {TABLE} at (0,761.50) size 384x613 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 382x611 - LayoutTableRow {TR} at (0,0) size 382x28 - LayoutTableCell {TD} at (0,0) size 382x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 382x583 - LayoutTableCell {TD} at (0,305) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 370x583 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow (anonymous) at (4,4) size 362x50 - LayoutImage {IMG} at (0,0) size 50x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,70) size 362x20 - LayoutText {#text} at (0,0) size 271x19 - text run at (0,0) width 271: "The square above should be fifty pixels wide." - LayoutBlockFlow (anonymous) at (4,106) size 362x181 - LayoutImage {IMG} at (0,0) size 181x181 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,303) size 362x40 - LayoutText {#text} at (0,0) size 332x39 - text run at (0,0) width 332: "The square above should be half as wide as the image's" - text run at (0,20) width 305: "parent element (either the BODY or the table cell)." - LayoutBlockFlow {P} at (4,359) size 181x220 - LayoutText {#text} at (0,0) size 180x159 - text run at (0,0) width 177: "This paragraph should be half" - text run at (0,20) width 180: "the width of its parent element" - text run at (0,40) width 147: "(either the BODY or the" - text run at (0,60) width 165: "table, which should itself be" - text run at (0,80) width 158: "half as wide as the BODY" - text run at (0,100) width 59: "element). " - text run at (59,100) width 98: "This is extra text" - text run at (0,120) width 159: "included to ensure that this" - text run at (0,140) width 140: "will be a fair test of the " - LayoutInline {CODE} at (0,0) size 40x16 - LayoutText {#text} at (140,143) size 40x16 - text run at (140,143) width 40: "width" - LayoutText {#text} at (0,160) size 176x59 - text run at (0,160) width 176: "property without the need for" - text run at (0,180) width 172: "the user to resize the viewing" - text run at (0,200) width 51: "window." -layer at (8,105) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/cascade_order-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/cascade_order-expected.png deleted file mode 100644 index e694b54b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/cascade_order-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt deleted file mode 100644 index 28833e3..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/cascade_order-expected.txt +++ /dev/null
@@ -1,143 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 849 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x849 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x849 - LayoutBlockFlow {BODY} at (8,8) size 769x833 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 576x176 - text run at (0,0) width 576: "<LINK rel=\"stylesheet\" type=\"text/css\" HREF=\"../resources/linktest.css\">" - text run at (576,0) width 0: " " - text run at (0,16) width 152: "LI {color: purple;}" - text run at (152,16) width 0: " " - text run at (0,32) width 160: "UL LI {color: blue;}" - text run at (160,32) width 0: " " - text run at (0,48) width 184: "UL LI LI {color: gray;}" - text run at (184,48) width 0: " " - text run at (0,64) width 176: "LI.red {color: green;}" - text run at (176,64) width 0: " " - text run at (0,80) width 216: "UL LI.mar {color: #660000;}" - text run at (216,80) width 0: " " - text run at (0,96) width 200: "UL LI#gre {color: green;}" - text run at (200,96) width 0: " " - text run at (0,112) width 160: ".test {color: blue;}" - text run at (160,112) width 0: " " - text run at (0,128) width 176: ".test {color: purple;}" - text run at (176,128) width 0: " " - text run at (0,144) width 296: ".one {text-decoration: line-through;}" - text run at (296,144) width 0: " " - text run at (0,160) width 0: " " - LayoutBlockFlow {UL} at (0,243) size 769x160 - LayoutListItem {LI} at (40,0) size 729x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 177x19 - text run at (0,0) width 177: "This list item should be blue..." - LayoutListItem {LI} at (40,20) size 729x80 [color=#0000FF] - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "...and so should this; neither should be purple." - LayoutBlockFlow {UL} at (0,20) size 729x60 - LayoutListItem {LI} at (40,0) size 689x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 177x19 - text run at (0,0) width 177: "This list item should be gray..." - LayoutListItem {LI} at (40,20) size 689x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...as should this...." - LayoutListItem {LI} at (40,40) size 689x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "...but this one should be green." - LayoutListItem {LI} at (40,100) size 729x20 [color=#660000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "This ought to be dark red..." - LayoutListItem {LI} at (40,120) size 729x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 81x19 - text run at (0,0) width 81: "...this green..." - LayoutListItem {LI} at (40,140) size 729x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 91x19 - text run at (0,0) width 91: "...and this blue." - LayoutBlockFlow {P} at (0,419) size 769x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This sentence should be blue (STYLE attr.)." - LayoutBlockFlow {P} at (0,455) size 769x20 [color=#800080] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be purple [" - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (194,3) size 96x16 - text run at (194,3) width 96: "class=\"test\"" - LayoutText {#text} at (290,0) size 9x19 - text run at (290,0) width 9: "]." - LayoutBlockFlow {P} at (0,491) size 769x20 - LayoutText {#text} at (0,0) size 652x19 - text run at (0,0) width 652: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." - LayoutTable {TABLE} at (0,527) size 674x306 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 672x304 - LayoutTableRow {TR} at (0,0) size 672x28 - LayoutTableCell {TD} at (0,0) size 672x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 672x276 - LayoutTableCell {TD} at (0,152) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 660x276 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 652x160 - LayoutListItem {LI} at (40,0) size 612x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 177x19 - text run at (0,0) width 177: "This list item should be blue..." - LayoutListItem {LI} at (40,20) size 612x80 [color=#0000FF] - LayoutBlockFlow (anonymous) at (0,0) size 612x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 275x19 - text run at (0,0) width 275: "...and so should this; neither should be purple." - LayoutBlockFlow {UL} at (0,20) size 612x60 - LayoutListItem {LI} at (40,0) size 572x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 177x19 - text run at (0,0) width 177: "This list item should be gray..." - LayoutListItem {LI} at (40,20) size 572x20 [color=#808080] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...as should this...." - LayoutListItem {LI} at (40,40) size 572x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "...but this one should be green." - LayoutListItem {LI} at (40,100) size 612x20 [color=#660000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 165x19 - text run at (0,0) width 165: "This ought to be dark red..." - LayoutListItem {LI} at (40,120) size 612x20 [color=#008000] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 81x19 - text run at (0,0) width 81: "...this green..." - LayoutListItem {LI} at (40,140) size 612x20 [color=#0000FF] - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 91x19 - text run at (0,0) width 91: "...and this blue." - LayoutBlockFlow {P} at (4,180) size 652x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This sentence should be blue (STYLE attr.)." - LayoutBlockFlow {P} at (4,216) size 652x20 [color=#800080] - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "This sentence should be purple [" - LayoutInline {CODE} at (0,0) size 96x16 - LayoutText {#text} at (194,3) size 96x16 - text run at (194,3) width 96: "class=\"test\"" - LayoutText {#text} at (290,0) size 9x19 - text run at (290,0) width 9: "]." - LayoutBlockFlow {P} at (4,252) size 652x20 - LayoutText {#text} at (0,0) size 652x19 - text run at (0,0) width 652: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/important-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/important-expected.png deleted file mode 100644 index 3de29e8..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/important-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/important-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/important-expected.txt deleted file mode 100644 index af35e590..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/cascade/important-expected.txt +++ /dev/null
@@ -1,69 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 232x64 - text run at (0,0) width 232: "P {color: green ! important;}" - text run at (232,0) width 0: " " - text run at (0,16) width 120: "P {color: red;}" - text run at (120,16) width 0: " " - text run at (0,32) width 176: "P#id1 {color: purple;}" - text run at (176,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x40 [color=#008000] - LayoutText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "This sentence should be green, because the declaration marked important should override any other normal declaration for the" - text run at (0,20) width 315: "same element, even if it occurs later in the stylesheet." - LayoutBlockFlow {P} at (0,187) size 784x40 [color=#008000] - LayoutText {#text} at (0,0) size 381x19 - text run at (0,0) width 381: "This sentence should also be green, even though it has an ID of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (381,3) size 24x16 - text run at (381,3) width 24: "id1" - LayoutText {#text} at (405,0) size 738x39 - text run at (405,0) width 242: ", which would ordinarily make it purple. " - text run at (647,0) width 91: "This is because" - text run at (0,20) width 611: "declarations marked important have more weight than normal declarations given in a STYLE attribute." - LayoutBlockFlow {P} at (0,243) size 784x40 [color=#008000] - LayoutText {#text} at (0,0) size 741x39 - text run at (0,0) width 574: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (574,0) width 167: "This is because declarations" - text run at (0,20) width 535: "marked important have more weight than normal declarations given in a STYLE attribute." - LayoutTable {TABLE} at (0,299) size 784x190 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x188 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x160 - LayoutTableCell {TD} at (0,94) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x160 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 [color=#008000] - LayoutText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "This sentence should be green, because the declaration marked important should override any other normal declaration for the" - text run at (0,20) width 315: "same element, even if it occurs later in the stylesheet." - LayoutBlockFlow {P} at (4,60) size 762x40 [color=#008000] - LayoutText {#text} at (0,0) size 381x19 - text run at (0,0) width 381: "This sentence should also be green, even though it has an ID of " - LayoutInline {TT} at (0,0) size 24x16 - LayoutText {#text} at (381,3) size 24x16 - text run at (381,3) width 24: "id1" - LayoutText {#text} at (405,0) size 738x39 - text run at (405,0) width 242: ", which would ordinarily make it purple. " - text run at (647,0) width 91: "This is because" - text run at (0,20) width 611: "declarations marked important have more weight than normal declarations given in a STYLE attribute." - LayoutBlockFlow {P} at (4,116) size 762x40 [color=#008000] - LayoutText {#text} at (0,0) size 741x39 - text run at (0,0) width 574: "This sentence should also be green, even though it has a STYLE attribute declaring it to be red. " - text run at (574,0) width 167: "This is because declarations" - text run at (0,20) width 535: "marked important have more weight than normal declarations given in a STYLE attribute." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/display-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/display-expected.png deleted file mode 100644 index c722fa2..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/display-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/display-expected.txt deleted file mode 100644 index 99331257..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/display-expected.txt +++ /dev/null
@@ -1,129 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 873 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x873 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x873 - LayoutBlockFlow {BODY} at (8,8) size 769x857 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x80 - LayoutText {#text} at (0,0) size 568x80 - text run at (0,0) width 176: ".one {display: block;}" - text run at (176,0) width 0: " " - text run at (0,16) width 184: ".two {display: inline;}" - text run at (184,16) width 0: " " - text run at (0,32) width 568: ".three {display: list-item; list-style-type: square; margin-left: 3em;}" - text run at (568,32) width 0: " " - text run at (0,48) width 272: ".four {display: none; color: red;}" - text run at (272,48) width 0: " " - text run at (0,64) width 152: "I {display: block;}" - text run at (152,64) width 0: " " - LayoutBlockFlow {P} at (0,147) size 769x20 - LayoutText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "This sentence should be a block-level element." - LayoutBlockFlow (anonymous) at (0,183) size 769x60 - LayoutInline {P} at (0,0) size 426x19 - LayoutText {#text} at (0,0) size 426x19 - text run at (0,0) width 426: "This sentence should be part of an inline element, as are the next three. " - LayoutInline {P} at (0,0) size 742x59 - LayoutText {#text} at (426,0) size 742x59 - text run at (426,0) width 310: "This sentence and the next two are part of a second" - text run at (0,20) width 88: "inline element. " - text run at (88,20) width 654: "They should therefore appear, along with the sentence above, to be all one paragraph which is four sentences" - text run at (0,40) width 33: "long. " - text run at (33,40) width 239: "If this is not the case, then the keyword " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (272,43) size 48x16 - text run at (272,43) width 48: "inline" - LayoutText {#text} at (320,40) size 102x19 - text run at (320,40) width 102: " is being ignored." - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {P} at (48,259) size 721x60 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 701x19 - text run at (0,0) width 701: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list items (if" - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (0,23) size 120x16 - text run at (0,23) width 120: "list-style-type" - LayoutText {#text} at (120,20) size 692x39 - text run at (120,20) width 346: " is supported, there will be a square for the item marker). " - text run at (466,20) width 226: "A 3em left margin has been applied in" - text run at (0,40) width 349: "order to ensure that there is space for the list-item marker." - LayoutBlockFlow {P} at (0,335) size 769x20 - LayoutText {#text} at (0,0) size 429x19 - text run at (0,0) width 429: "The next paragraph should be invisible (if it's visible, you'll see red text)." - LayoutBlockFlow {P} at (0,371) size 769x20 - LayoutText {#text} at (0,0) size 235x19 - text run at (0,0) width 235: "There should be no text after the colon:" - LayoutBlockFlow {P} at (0,407) size 769x60 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 104x19 - text run at (0,0) width 104: "The italicized text" - LayoutBlockFlow {I} at (0,20) size 769x20 - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "in this paragraph" - LayoutBlockFlow (anonymous) at (0,40) size 769x20 - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "should be a block-level element." - LayoutTable {TABLE} at (0,483) size 769x374 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x372 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x344 - LayoutTableCell {TD} at (0,186) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x344 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 279x19 - text run at (0,0) width 279: "This sentence should be a block-level element." - LayoutBlockFlow (anonymous) at (4,40) size 747x60 - LayoutInline {P} at (0,0) size 426x19 - LayoutText {#text} at (0,0) size 426x19 - text run at (0,0) width 426: "This sentence should be part of an inline element, as are the next three. " - LayoutInline {P} at (0,0) size 742x59 - LayoutText {#text} at (426,0) size 742x59 - text run at (426,0) width 310: "This sentence and the next two are part of a second" - text run at (0,20) width 88: "inline element. " - text run at (88,20) width 654: "They should therefore appear, along with the sentence above, to be all one paragraph which is four sentences" - text run at (0,40) width 33: "long. " - text run at (33,40) width 239: "If this is not the case, then the keyword " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (272,43) size 48x16 - text run at (272,43) width 48: "inline" - LayoutText {#text} at (320,40) size 102x19 - text run at (320,40) width 102: " is being ignored." - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {P} at (52,116) size 699x60 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 685x39 - text run at (0,0) width 685: "This sentence should be treated as a list-item, and therefore be rendered however this user agent displays list items" - text run at (0,20) width 16: "(if " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (16,23) size 120x16 - text run at (16,23) width 120: "list-style-type" - LayoutText {#text} at (136,20) size 694x39 - text run at (136,20) width 346: " is supported, there will be a square for the item marker). " - text run at (482,20) width 212: "A 3em left margin has been applied" - text run at (0,40) width 363: "in order to ensure that there is space for the list-item marker." - LayoutBlockFlow {P} at (4,192) size 747x20 - LayoutText {#text} at (0,0) size 429x19 - text run at (0,0) width 429: "The next paragraph should be invisible (if it's visible, you'll see red text)." - LayoutBlockFlow {P} at (4,228) size 747x20 - LayoutText {#text} at (0,0) size 235x19 - text run at (0,0) width 235: "There should be no text after the colon:" - LayoutBlockFlow {P} at (4,264) size 747x60 - LayoutBlockFlow (anonymous) at (0,0) size 747x20 - LayoutText {#text} at (0,0) size 104x19 - text run at (0,0) width 104: "The italicized text" - LayoutBlockFlow {I} at (0,20) size 747x20 - LayoutText {#text} at (0,0) size 111x19 - text run at (0,0) width 111: "in this paragraph" - LayoutBlockFlow (anonymous) at (0,40) size 747x20 - LayoutText {#text} at (0,0) size 194x19 - text run at (0,0) width 194: "should be a block-level element." -layer at (8,137) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style-expected.png deleted file mode 100644 index 60e65d5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style-expected.txt deleted file mode 100644 index 4a70661..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style-expected.txt +++ /dev/null
@@ -1,54 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 496x32 - text run at (0,0) width 304: ".one {list-style: upper-alpha inside;}" - text run at (304,0) width 0: " " - text run at (0,16) width 496: ".two {list-style: url(../resources/oransqr.gif) disc outside;}" - text run at (496,16) width 0: " " - LayoutBlockFlow {UL} at (0,99) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (0,0) size 19x19: "A" - LayoutText {#text} at (19,0) size 735x39 - text run at (19,0) width 716: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left margin, leaving" - text run at (0,20) width 228: "no blank space beneath the capital-A." - LayoutBlockFlow {UL} at (0,155) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 737x39 - text run at (0,0) width 448: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (448,0) width 289: "Also, the bullet should be outside the text block," - text run at (0,20) width 206: "as the list has been set to 'outside'." - LayoutTable {TABLE} at (0,211) size 784x150 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x148 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x120 - LayoutTableCell {TD} at (0,74) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x120 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (0,0) size 19x19: "A" - LayoutText {#text} at (19,0) size 690x39 - text run at (19,0) width 671: "The text in this item should not behave as expected; that is, it should line up with the capital-A on the left margin," - text run at (0,20) width 273: "leaving no blank space beneath the capital-A." - LayoutBlockFlow {UL} at (4,60) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 695x39 - text run at (0,0) width 448: "The text in this item have an orange square for its bullet; failing that, a disc. " - text run at (448,0) width 247: "Also, the bullet should be outside the text" - text run at (0,20) width 248: "block, as the list has been set to 'outside'." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_image-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_image-expected.png deleted file mode 100644 index b017aa5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_image-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_image-expected.txt deleted file mode 100644 index 4ef4e03..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_image-expected.txt +++ /dev/null
@@ -1,81 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 440x48 - text run at (0,0) width 440: ".one {list-style-image: url(../resources/oransqr.gif);}" - text run at (440,0) width 0: " " - text run at (0,16) width 240: ".two {list-style-image: none;}" - text run at (240,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {UL} at (0,115) size 784x60 - LayoutListItem {LI} at (40,0) size 744x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 744x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 744x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 139x19 - text run at (0,0) width 139: "...images for each item." - LayoutBlockFlow {UL} at (0,191) size 784x60 - LayoutListItem {LI} at (40,0) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 744x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 223x19 - text run at (0,0) width 223: "...standard list markers for each item." - LayoutTable {TABLE} at (0,267) size 285x190 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 283x188 - LayoutTableRow {TR} at (0,0) size 283x28 - LayoutTableCell {TD} at (0,0) size 283x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 283x160 - LayoutTableCell {TD} at (0,94) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 271x160 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 263x60 - LayoutListItem {LI} at (40,0) size 223x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 223x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 223x20 - LayoutListMarker (anonymous) at (-22,0) size 15x15 - LayoutText {#text} at (0,0) size 139x19 - text run at (0,0) width 139: "...images for each item." - LayoutBlockFlow {UL} at (4,80) size 263x60 - LayoutListItem {LI} at (40,0) size 223x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 223x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 223x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 223x19 - text run at (0,0) width 223: "...standard list markers for each item." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_position-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_position-expected.png deleted file mode 100644 index d9c3eba9..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_position-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_position-expected.txt deleted file mode 100644 index 2518c2d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_position-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 288x48 - text run at (0,0) width 288: ".one {list-style-position: outside;}" - text run at (288,0) width 0: " " - text run at (0,16) width 280: ".two {list-style-position: inside;}" - text run at (280,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {UL} at (0,115) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank space" - text run at (0,20) width 109: "beneath the bullet." - LayoutBlockFlow {UL} at (0,171) size 784x40 - LayoutListItem {LI} at (40,0) size 744x40 - LayoutListMarker (anonymous) at (-1,0) size 7x19: bullet - LayoutText {#text} at (22,0) size 733x39 - text run at (22,0) width 711: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin, leaving no" - text run at (0,20) width 185: "blank space beneath the bullet." - LayoutTable {TABLE} at (0,227) size 784x150 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x148 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x120 - LayoutTableCell {TD} at (0,74) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x120 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "The text in this item should behave as expected; that is, it should line up with itself on the left margin, leaving blank space" - text run at (0,20) width 109: "beneath the bullet." - LayoutBlockFlow {UL} at (4,60) size 762x40 - LayoutListItem {LI} at (40,0) size 722x40 - LayoutListMarker (anonymous) at (-1,0) size 7x19: bullet - LayoutText {#text} at (22,0) size 714x39 - text run at (22,0) width 692: "The text in this item should not behave as expected; that is, it should line up with the bullet on the left margin, leaving" - text run at (0,20) width 204: "no blank space beneath the bullet." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_type-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_type-expected.png deleted file mode 100644 index 81ede0a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_type-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_type-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_type-expected.txt deleted file mode 100644 index 0c74994..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/list_style_type-expected.txt +++ /dev/null
@@ -1,271 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1649 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1649 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1649 - LayoutBlockFlow {BODY} at (8,8) size 769x1633 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x160 - LayoutText {#text} at (0,0) size 304x160 - text run at (0,0) width 232: ".one {list-style-type: disc;}" - text run at (232,0) width 0: " " - text run at (0,16) width 248: ".two {list-style-type: circle;}" - text run at (248,16) width 0: " " - text run at (0,32) width 264: ".three {list-style-type: square;}" - text run at (264,32) width 0: " " - text run at (0,48) width 296: ".four {list-style-type: lower-roman;}" - text run at (296,48) width 0: " " - text run at (0,64) width 296: ".five {list-style-type: upper-roman;}" - text run at (296,64) width 0: " " - text run at (0,80) width 288: ".six {list-style-type: lower-alpha;}" - text run at (288,80) width 0: " " - text run at (0,96) width 304: ".seven {list-style-type: upper-alpha;}" - text run at (304,96) width 0: " " - text run at (0,112) width 272: ".eight {list-style-type: decimal;}" - text run at (272,112) width 0: " " - text run at (0,128) width 240: ".nine {list-style-type: none;}" - text run at (240,128) width 0: " " - text run at (0,144) width 0: " " - LayoutBlockFlow {UL} at (0,227) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "...discs for each item." - LayoutBlockFlow {UL} at (0,303) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 136x19 - text run at (0,0) width 136: "...circles for each item." - LayoutBlockFlow {UL} at (0,379) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "...squares for each item." - LayoutBlockFlow {OL} at (0,455) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-11,0) size 11x19: "i" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-14,0) size 14x19: "ii" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-17,0) size 17x19: "iii" - LayoutText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "...lowercase Roman numerals for each item." - LayoutBlockFlow {OL} at (0,531) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-13,0) size 13x19: "I" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "II" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-23,0) size 23x19: "III" - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "...uppercase Roman numerals for each item." - LayoutBlockFlow {OL} at (0,607) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "a" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "b" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "c" - LayoutText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "...lowercase letters for each item." - LayoutBlockFlow {OL} at (0,683) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "A" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "B" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "C" - LayoutText {#text} at (0,0) size 200x19 - text run at (0,0) width 200: "...uppercase letters for each item." - LayoutBlockFlow {OL} at (0,759) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "A" - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "This list should feature..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "B" - LayoutText {#text} at (0,0) size 142x19 - text run at (0,0) width 142: "...letters for each item..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "...except this one." - LayoutBlockFlow {UL} at (0,835) size 769x60 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 729x20 - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 729x20 - LayoutText {#text} at (0,0) size 141x19 - text run at (0,0) width 141: "...nothing for each item." - LayoutTable {TABLE} at (0,911) size 326x722 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 324x720 - LayoutTableRow {TR} at (0,0) size 324x28 - LayoutTableCell {TD} at (0,0) size 324x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 324x692 - LayoutTableCell {TD} at (0,360) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 312x692 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {UL} at (4,4) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 128x19 - text run at (0,0) width 128: "...discs for each item." - LayoutBlockFlow {UL} at (4,80) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutText {#text} at (0,0) size 136x19 - text run at (0,0) width 136: "...circles for each item." - LayoutBlockFlow {UL} at (4,156) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: black square - LayoutText {#text} at (0,0) size 144x19 - text run at (0,0) width 144: "...squares for each item." - LayoutBlockFlow {OL} at (4,232) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-11,0) size 11x19: "i" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-14,0) size 14x19: "ii" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-17,0) size 17x19: "iii" - LayoutText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "...lowercase Roman numerals for each item." - LayoutBlockFlow {OL} at (4,308) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-13,0) size 13x19: "I" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "II" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-23,0) size 23x19: "III" - LayoutText {#text} at (0,0) size 264x19 - text run at (0,0) width 264: "...uppercase Roman numerals for each item." - LayoutBlockFlow {OL} at (4,384) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "a" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "b" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-15,0) size 15x19: "c" - LayoutText {#text} at (0,0) size 199x19 - text run at (0,0) width 199: "...lowercase letters for each item." - LayoutBlockFlow {OL} at (4,460) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "A" - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "B" - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "C" - LayoutText {#text} at (0,0) size 200x19 - text run at (0,0) width 200: "...uppercase letters for each item." - LayoutBlockFlow {OL} at (4,536) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutListMarker (anonymous) at (-19,0) size 19x19: "A" - LayoutText {#text} at (0,0) size 145x19 - text run at (0,0) width 145: "This list should feature..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutListMarker (anonymous) at (-18,0) size 18x19: "B" - LayoutText {#text} at (0,0) size 142x19 - text run at (0,0) width 142: "...letters for each item..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "3" - LayoutText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "...except this one." - LayoutBlockFlow {UL} at (4,612) size 304x60 - LayoutListItem {LI} at (40,0) size 264x20 - LayoutText {#text} at (0,0) size 57x19 - text run at (0,0) width 57: "This list..." - LayoutListItem {LI} at (40,20) size 264x20 - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "...should feature..." - LayoutListItem {LI} at (40,40) size 264x20 - LayoutText {#text} at (0,0) size 141x19 - text run at (0,0) width 141: "...nothing for each item." -layer at (8,217) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,209) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/white_space-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/white_space-expected.png deleted file mode 100644 index df1df56..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/white_space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/white_space-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/white_space-expected.txt deleted file mode 100644 index a224d45..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/classification/white_space-expected.txt +++ /dev/null
@@ -1,81 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 882 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 232x64 - text run at (0,0) width 192: ".one {white-space: pre;}" - text run at (192,0) width 0: " " - text run at (0,16) width 216: ".two {white-space: nowrap;}" - text run at (216,16) width 0: " " - text run at (0,32) width 232: ".three {white-space: normal;}" - text run at (232,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x100 - LayoutText {#text} at (0,0) size 543x99 - text run at (0,0) width 0: " " - text run at (0,20) width 543: "This sentence should show extra space where there would ordinarily not be any." - text run at (542,20) width 1: " " - text run at (0,40) width 284: " There should also be preservation of returns" - text run at (284,40) width 0: " " - text run at (0,60) width 93: "as this sentence" - text run at (93,60) width 0: " " - text run at (0,80) width 177: " very clearly demonstrates." - text run at (177,80) width 0: " " - LayoutBlockFlow {P} at (0,247) size 784x20 - LayoutText {#text} at (0,0) size 852x19 - text run at (0,0) width 852: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - LayoutBlockFlow {P} at (0,283) size 784x40 - LayoutText {#text} at (0,0) size 285x39 - text run at (0,0) width 0: " " - text run at (0,20) width 285: "This sentence should show extra space, " - LayoutInline {SPAN} at (0,0) size 148x19 - LayoutText {#text} at (285,20) size 148x19 - text run at (285,20) width 80: "except in the " - text run at (365,20) width 68: "second half" - LayoutText {#text} at (433,20) size 4x19 - text run at (433,20) width 4: "." - text run at (437,20) width 0: " " - LayoutTable {TABLE} at (0,339) size 874x230 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 872x228 - LayoutTableRow {TR} at (0,0) size 872x28 - LayoutTableCell {TD} at (0,0) size 872x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 872x200 - LayoutTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 860x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 852x100 - LayoutText {#text} at (0,0) size 543x99 - text run at (0,0) width 0: " " - text run at (0,20) width 543: "This sentence should show extra space where there would ordinarily not be any." - text run at (542,20) width 1: " " - text run at (0,40) width 284: " There should also be preservation of returns" - text run at (284,40) width 0: " " - text run at (0,60) width 93: "as this sentence" - text run at (93,60) width 0: " " - text run at (0,80) width 177: " very clearly demonstrates." - text run at (177,80) width 0: " " - LayoutBlockFlow {P} at (4,120) size 852x20 - LayoutText {#text} at (0,0) size 852x19 - text run at (0,0) width 852: "This sentence should not word-wrap, no matter how long the sentence is, as it has been set to nowrap and that should have the obvious effect." - LayoutBlockFlow {P} at (4,156) size 852x40 - LayoutText {#text} at (0,0) size 285x39 - text run at (0,0) width 0: " " - text run at (0,20) width 285: "This sentence should show extra space, " - LayoutInline {SPAN} at (0,0) size 148x19 - LayoutText {#text} at (285,20) size 148x19 - text run at (285,20) width 80: "except in the " - text run at (365,20) width 68: "second half" - LayoutText {#text} at (433,20) size 4x19 - text run at (433,20) width 4: "." - text run at (437,20) width 0: " " -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background-expected.png deleted file mode 100644 index 65e3686..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background-expected.txt deleted file mode 100644 index 97dca62..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background-expected.txt +++ /dev/null
@@ -1,90 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 777 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x777 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x777 - LayoutBlockFlow {BODY} at (8,8) size 769x761 [bgcolor=#008000] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 648x64 - text run at (0,0) width 648: "BODY {background: green url(../resources/oransqr.gif) repeat-x center top fixed;}" - text run at (648,0) width 0: " " - text run at (0,16) width 568: ".one {background: lime url(../resources/oransqr.gif) repeat-y 100% 0%;}" - text run at (568,16) width 0: " " - text run at (0,32) width 592: ".two {background: lime url(../resources/oransqr.gif) repeat-y center top;}" - text run at (592,32) width 0: " " - text run at (0,48) width 592: ".three {background: lime url(../resources/oransqr.gif) repeat-x left top;}" - text run at (592,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x60 - LayoutText {#text} at (0,0) size 695x19 - text run at (0,0) width 695: "This document should have a green background with an orange strip running across the entire top of the page, since " - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (695,3) size 64x16 - text run at (695,3) width 64: "repeat-x" - LayoutText {#text} at (0,20) size 746x39 - text run at (0,20) width 276: "indicates tiling in both directions of the x-axis. " - text run at (276,20) width 284: "Furthermore, the strip should be fixed in place. " - text run at (560,20) width 186: "I'll have to add extra text at the" - text run at (0,40) width 368: "end of this page to make it long enough to scroll conveniently." - LayoutBlockFlow {P} at (0,207) size 769x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 756x59 - text run at (0,0) width 709: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,20) width 756: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling these" - text run at (0,40) width 80: "declarations. " - text run at (80,40) width 294: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (0,283) size 769x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 756x59 - text run at (0,0) width 720: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." - text run at (0,20) width 756: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling these" - text run at (0,40) width 80: "declarations. " - text run at (80,40) width 294: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (0,359) size 769x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 756x59 - text run at (0,0) width 708: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,20) width 756: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling these" - text run at (0,40) width 80: "declarations. " - text run at (80,40) width 294: "Hey, I didn't say the page would be pretty, did I?" - LayoutTable {TABLE} at (0,435) size 769x326 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x324 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x296 - LayoutTableCell {TD} at (0,162) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x296 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutText {#text} at (0,0) size 691x19 - text run at (0,0) width 691: "This document should have a green background with an orange strip running across the entire top of the page, since" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "repeat-x" - LayoutText {#text} at (64,20) size 717x39 - text run at (64,20) width 280: " indicates tiling in both directions of the x-axis. " - text run at (344,20) width 284: "Furthermore, the strip should be fixed in place. " - text run at (628,20) width 89: "I'll have to add" - text run at (0,40) width 465: "extra text at the end of this page to make it long enough to scroll conveniently." - LayoutBlockFlow {P} at (4,80) size 747x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 721x59 - text run at (0,0) width 709: "This paragraph should have a lime background and an orange strip which starts at the top right and runs to the bottom." - text run at (0,20) width 721: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 115: "these declarations. " - text run at (115,40) width 294: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (4,156) size 747x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 721x59 - text run at (0,0) width 720: "This paragraph should have a lime background and an orange strip which starts at the center top and runs to the bottom." - text run at (0,20) width 721: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 115: "these declarations. " - text run at (115,40) width 294: "Hey, I didn't say the page would be pretty, did I?" - LayoutBlockFlow {P} at (4,232) size 747x60 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 721x59 - text run at (0,0) width 708: "This paragraph should have a lime background and an orange strip which starts at the top left and runs to the top right." - text run at (0,20) width 721: "Therefore, extra text would be in order, so that we can intelligently evaluate the performance of your browser in handling" - text run at (0,40) width 115: "these declarations. " - text run at (115,40) width 294: "Hey, I didn't say the page would be pretty, did I?" -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt deleted file mode 100644 index 3faed43..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_attachment-expected.txt +++ /dev/null
@@ -1,182 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 880 scrollHeight 1239 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1239 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1238.53 - LayoutBlockFlow {BODY} at (8,8) size 784x1222.53 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 872x32 - text run at (0,0) width 872: "BODY {background-image: url(../resources/bg.gif); background-repeat: repeat-x; background-attachment: fixed;}" - text run at (872,0) width 0: " " - text run at (0,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x100 - LayoutText {#text} at (0,0) size 769x99 - text run at (0,0) width 768: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does NOT" - text run at (0,20) width 154: "scroll with the document. " - text run at (154,20) width 615: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when the end of the" - text run at (0,40) width 102: "page is reached. " - text run at (102,40) width 663: "In addition, the default Test Suite background should NOT appear, as it's been overridden by the styles shown" - text run at (0,60) width 45: "above. " - text run at (45,60) width 619: "I'll have to add a lot of extra text to the page in order to make all this something we can actually check. " - text run at (664,60) width 94: "Don't worry, I'll" - text run at (0,80) width 113: "think of something." - LayoutBlockFlow {P} at (0,215) size 784x20 - LayoutText {#text} at (0,0) size 484x19 - text run at (0,0) width 397: "In fact, why not the relevant section from the CSS1 specification? " - text run at (397,0) width 87: "A capital idea." - LayoutBlockFlow {H4} at (0,284.27) size 784x20 - LayoutInline {A} at (0,0) size 213x19 - LayoutText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "5.3.5 'background-attachment'" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,325.53) size 784x100 - LayoutInline {EM} at (0,0) size 41x19 - LayoutText {#text} at (0,0) size 41x19 - text run at (0,0) width 41: "Value:" - LayoutText {#text} at (40,0) size 77x19 - text run at (40,0) width 77: " scroll | fixed" - LayoutBR {BR} at (116,15) size 1x0 - LayoutInline {EM} at (0,0) size 43x19 - LayoutText {#text} at (0,20) size 43x19 - text run at (0,20) width 43: "Initial:" - LayoutText {#text} at (43,20) size 36x19 - text run at (43,20) width 36: " scroll" - LayoutBR {BR} at (79,35) size 0x0 - LayoutInline {EM} at (0,0) size 69x19 - LayoutText {#text} at (0,40) size 69x19 - text run at (0,40) width 69: "Applies to:" - LayoutText {#text} at (69,40) size 73x19 - text run at (69,40) width 73: " all elements" - LayoutBR {BR} at (142,55) size 0x0 - LayoutInline {EM} at (0,0) size 63x19 - LayoutText {#text} at (0,60) size 63x19 - text run at (0,60) width 63: "Inherited:" - LayoutText {#text} at (63,60) size 19x19 - text run at (63,60) width 19: " no" - LayoutBR {BR} at (82,75) size 0x0 - LayoutInline {EM} at (0,0) size 123x19 - LayoutText {#text} at (0,80) size 123x19 - text run at (0,80) width 123: "Percentage values:" - LayoutText {#text} at (122,80) size 32x19 - text run at (122,80) width 32: " N/A" - LayoutBR {BR} at (153,95) size 1x0 - LayoutBlockFlow {P} at (0,441.53) size 784x40 - LayoutText {#text} at (0,0) size 766x39 - text run at (0,0) width 766: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas or if it" - text run at (0,20) width 177: "scrolls along with the content." - LayoutBlockFlow {PRE} at (0,497.53) size 784x80 - LayoutText {#text} at (0,0) size 296x80 - text run at (0,0) width 72: " BODY { " - text run at (72,0) width 0: " " - text run at (0,16) width 296: " background: red url(pendant.gif);" - text run at (296,16) width 0: " " - text run at (0,32) width 256: " background-repeat: repeat-y;" - text run at (256,32) width 0: " " - text run at (0,48) width 264: " background-attachment: fixed;" - text run at (264,48) width 0: " " - text run at (0,64) width 24: " }" - text run at (24,64) width 0: " " - LayoutBlockFlow {P} at (0,593.53) size 784x40 - LayoutInline {EM} at (0,0) size 72x19 - LayoutText {#text} at (0,0) size 72x19 - text run at (0,0) width 72: "CSS1 core:" - LayoutText {#text} at (71,0) size 759x39 - text run at (71,0) width 688: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the HTML" - text run at (0,20) width 728: "and BODY elements, since there is no way for an author to provide an image only for those browsers that support 'fixed'." - LayoutTable {TABLE} at (0,649.53) size 784x573 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x571 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x543 - LayoutTableCell {TD} at (0,285) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x542.53 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x100 - LayoutText {#text} at (0,0) size 749x99 - text run at (0,0) width 731: "This document should have a green grid-pattern line across the top of the page (or at least a tiled background) which does" - text run at (0,20) width 191: "NOT scroll with the document. " - text run at (191,20) width 551: "It should, instead, appear to be a fixed pattern past which the content scrolls, even when the" - text run at (0,40) width 166: "end of the page is reached. " - text run at (166,40) width 583: "In addition, the default Test Suite background should NOT appear, as it's been overridden by the" - text run at (0,60) width 125: "styles shown above. " - text run at (125,60) width 615: "I'll have to add a lot of extra text to the page in order to make all this something we can actually check." - text run at (0,80) width 211: "Don't worry, I'll think of something." - LayoutBlockFlow {P} at (4,120) size 762x20 - LayoutText {#text} at (0,0) size 484x19 - text run at (0,0) width 397: "In fact, why not the relevant section from the CSS1 specification? " - text run at (397,0) width 87: "A capital idea." - LayoutBlockFlow {H4} at (4,189.27) size 762x20 - LayoutInline {A} at (0,0) size 213x19 - LayoutText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "5.3.5 'background-attachment'" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,230.53) size 762x100 - LayoutInline {EM} at (0,0) size 41x19 - LayoutText {#text} at (0,0) size 41x19 - text run at (0,0) width 41: "Value:" - LayoutText {#text} at (40,0) size 77x19 - text run at (40,0) width 77: " scroll | fixed" - LayoutBR {BR} at (116,15) size 1x0 - LayoutInline {EM} at (0,0) size 43x19 - LayoutText {#text} at (0,20) size 43x19 - text run at (0,20) width 43: "Initial:" - LayoutText {#text} at (43,20) size 36x19 - text run at (43,20) width 36: " scroll" - LayoutBR {BR} at (79,35) size 0x0 - LayoutInline {EM} at (0,0) size 69x19 - LayoutText {#text} at (0,40) size 69x19 - text run at (0,40) width 69: "Applies to:" - LayoutText {#text} at (69,40) size 73x19 - text run at (69,40) width 73: " all elements" - LayoutBR {BR} at (142,55) size 0x0 - LayoutInline {EM} at (0,0) size 63x19 - LayoutText {#text} at (0,60) size 63x19 - text run at (0,60) width 63: "Inherited:" - LayoutText {#text} at (63,60) size 19x19 - text run at (63,60) width 19: " no" - LayoutBR {BR} at (82,75) size 0x0 - LayoutInline {EM} at (0,0) size 123x19 - LayoutText {#text} at (0,80) size 123x19 - text run at (0,80) width 123: "Percentage values:" - LayoutText {#text} at (122,80) size 32x19 - text run at (122,80) width 32: " N/A" - LayoutBR {BR} at (153,95) size 1x0 - LayoutBlockFlow {P} at (4,346.53) size 762x40 - LayoutText {#text} at (0,0) size 755x39 - text run at (0,0) width 755: "If a background image is specified, the value of 'background-attachment' determines if it is fixed with regard to the canvas or if" - text run at (0,20) width 188: "it scrolls along with the content." - LayoutBlockFlow {PRE} at (4,402.53) size 762x80 - LayoutText {#text} at (0,0) size 296x80 - text run at (0,0) width 72: " BODY { " - text run at (72,0) width 0: " " - text run at (0,16) width 296: " background: red url(pendant.gif);" - text run at (296,16) width 0: " " - text run at (0,32) width 256: " background-repeat: repeat-y;" - text run at (256,32) width 0: " " - text run at (0,48) width 264: " background-attachment: fixed;" - text run at (264,48) width 0: " " - text run at (0,64) width 24: " }" - text run at (24,64) width 0: " " - LayoutBlockFlow {P} at (4,498.53) size 762x40 - LayoutInline {EM} at (0,0) size 72x19 - LayoutText {#text} at (0,0) size 72x19 - text run at (0,0) width 72: "CSS1 core:" - LayoutText {#text} at (71,0) size 759x39 - text run at (71,0) width 688: " UAs may treat 'fixed' as 'scroll'. However, it is recommended they interpret 'fixed' correctly, at least on the HTML" - text run at (0,20) width 728: "and BODY elements, since there is no way for an author to provide an image only for those browsers that support 'fixed'." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,259) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,251) size 784x2 [border: (1px inset #EEEEEE)] -layer at (8,269) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,261) size 784x2 [border: (1px inset #EEEEEE)] -layer at (25,843) size 762x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,156) size 762x2 [border: (1px inset #EEEEEE)] -layer at (25,853) size 762x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,166) size 762x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_color-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_color-expected.png deleted file mode 100644 index 157863b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt deleted file mode 100644 index f088b188..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_color-expected.txt +++ /dev/null
@@ -1,85 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 296x64 - text run at (0,0) width 224: "P {background-color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 240: ".one {background-color: lime;}" - text run at (240,16) width 0: " " - text run at (0,32) width 296: ".two {background-color: transparent;}" - text run at (296,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "This element's background should be green." - LayoutBlockFlow {P} at (0,167) size 784x20 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 329x19 - text run at (0,0) width 329: "This element's background should be lime (light green)." - LayoutBlockFlow {P} at (0,203) size 784x60 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This element's background should be green, and the last word in this sentence should also have a green " - LayoutInline {SPAN} at (0,0) size 72x19 - LayoutText {#text} at (620,0) size 72x19 - text run at (620,0) width 72: "background" - LayoutText {#text} at (692,0) size 778x59 - text run at (692,0) width 8: ". " - text run at (700,0) width 38: "This is" - text run at (0,20) width 778: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\" which" - text run at (0,40) width 65: "was set to " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (65,43) size 88x16 - text run at (65,43) width 88: "transparent" - LayoutText {#text} at (153,40) size 377x19 - text run at (153,40) width 8: ". " - text run at (161,40) width 369: "If the document background is visible, the browser is in error." - LayoutBlockFlow {P} at (0,279) size 784x20 - LayoutText {#text} at (0,0) size 702x19 - text run at (0,0) width 432: "This element should allow the document background to \"shine through.\" " - text run at (432,0) width 270: "There should be no green backgrounds here!" - LayoutTable {TABLE} at (0,315) size 784x206 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x204 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x176 - LayoutTableCell {TD} at (0,102) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x176 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 263x19 - text run at (0,0) width 263: "This element's background should be green." - LayoutBlockFlow {P} at (4,40) size 762x20 [bgcolor=#00FF00] - LayoutText {#text} at (0,0) size 329x19 - text run at (0,0) width 329: "This element's background should be lime (light green)." - LayoutBlockFlow {P} at (4,76) size 762x60 [bgcolor=#008000] - LayoutText {#text} at (0,0) size 620x19 - text run at (0,0) width 620: "This element's background should be green, and the last word in this sentence should also have a green " - LayoutInline {SPAN} at (0,0) size 72x19 - LayoutText {#text} at (620,0) size 72x19 - text run at (620,0) width 72: "background" - LayoutText {#text} at (692,0) size 739x59 - text run at (692,0) width 8: ". " - text run at (700,0) width 38: "This is" - text run at (0,20) width 739: "because the background color of the parent element (the paragraph) should \"shine through\" the SPANned word \"sentence,\"" - text run at (0,40) width 104: "which was set to " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (104,43) size 88x16 - text run at (104,43) width 88: "transparent" - LayoutText {#text} at (192,40) size 377x19 - text run at (192,40) width 8: ". " - text run at (200,40) width 369: "If the document background is visible, the browser is in error." - LayoutBlockFlow {P} at (4,152) size 762x20 - LayoutText {#text} at (0,0) size 702x19 - text run at (0,0) width 432: "This element should allow the document background to \"shine through.\" " - text run at (432,0) width 270: "There should be no green backgrounds here!" -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_image-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_image-expected.png deleted file mode 100644 index 51565f6..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt deleted file mode 100644 index 47586509..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_image-expected.txt +++ /dev/null
@@ -1,92 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 376x48 - text run at (0,0) width 376: "P {background-image: url(../resources/bg.gif);}" - text run at (376,0) width 0: " " - text run at (0,16) width 240: ".one {background-image: none;}" - text run at (240,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x40 - LayoutText {#text} at (0,0) size 779x39 - text run at (0,0) width 482: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (482,0) width 297: "The background image should also tile along both" - text run at (0,20) width 570: "axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - LayoutBlockFlow {P} at (0,171) size 784x60 - LayoutText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This sentence should be backed by a repeated green-grid image, as should the last three words " - LayoutInline {STRONG} at (0,0) size 103x19 - LayoutInline {SPAN} at (0,0) size 103x19 - LayoutText {#text} at (574,0) size 103x19 - text run at (574,0) width 103: "in this sentence" - LayoutText {#text} at (677,0) size 97x19 - text run at (677,0) width 8: ". " - text run at (685,0) width 89: "If it is not, then" - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (0,23) size 32x16 - text run at (0,23) width 32: "none" - LayoutText {#text} at (32,20) size 161x19 - text run at (32,20) width 156: " is interpreted incorrectly. " - text run at (187,20) width 6: "(" - LayoutInline {CODE} at (0,0) size 33x16 - LayoutText {#text} at (192,23) size 33x16 - text run at (192,23) width 33: "none" - LayoutText {#text} at (224,20) size 772x39 - text run at (224,20) width 548: " means that the element has no background image, allowing the parent to \"shine through\" by" - text run at (0,40) width 706: "default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be visible.)" - LayoutBlockFlow {P} at (0,247) size 784x20 - LayoutText {#text} at (0,0) size 777x19 - text run at (0,0) width 777: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\" instead." - LayoutTable {TABLE} at (0,283) size 784x230 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x228 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x200 - LayoutTableCell {TD} at (0,114) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x200 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x40 - LayoutText {#text} at (0,0) size 748x39 - text run at (0,0) width 482: "This sentence should be backed by an image-- a green grid pattern, in this case. " - text run at (482,0) width 266: "The background image should also tile along" - text run at (0,20) width 601: "both axes, because no repeat direction is specified (specific tests for repeating are found elsewhere)." - LayoutBlockFlow {P} at (4,60) size 762x80 - LayoutText {#text} at (0,0) size 574x19 - text run at (0,0) width 574: "This sentence should be backed by a repeated green-grid image, as should the last three words " - LayoutInline {STRONG} at (0,0) size 103x19 - LayoutInline {SPAN} at (0,0) size 103x19 - LayoutText {#text} at (574,0) size 103x19 - text run at (574,0) width 103: "in this sentence" - LayoutText {#text} at (677,0) size 745x39 - text run at (677,0) width 8: ". " - text run at (685,0) width 60: "If it is not," - text run at (0,20) width 29: "then " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (29,23) size 32x16 - text run at (29,23) width 32: "none" - LayoutText {#text} at (61,20) size 161x19 - text run at (61,20) width 156: " is interpreted incorrectly. " - text run at (216,20) width 6: "(" - LayoutInline {CODE} at (0,0) size 33x16 - LayoutText {#text} at (221,23) size 33x16 - text run at (221,23) width 33: "none" - LayoutText {#text} at (253,20) size 729x59 - text run at (253,20) width 475: " means that the element has no background image, allowing the parent to \"shine" - text run at (0,40) width 729: "through\" by default; since the parent of the words \"in this sentence\" is the paragraph, then the paragraph's image should be" - text run at (0,60) width 46: "visible.)" - LayoutBlockFlow {P} at (4,156) size 762x40 - LayoutText {#text} at (0,0) size 727x39 - text run at (0,0) width 727: "This sentence should NOT be backed by a repeated green-grid image, allowing the page's background to \"shine through\"" - text run at (0,20) width 46: "instead." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt deleted file mode 100644 index f927518..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_position-expected.txt +++ /dev/null
@@ -1,147 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1533 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1533 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1533 - LayoutBlockFlow {BODY} at (8,8) size 769x1517 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x272 - LayoutText {#text} at (0,0) size 688x272 - text run at (0,0) width 648: "BODY {background-image: url(../resources/bg.gif); background-position: right top;" - text run at (648,0) width 0: " " - text run at (0,16) width 288: " background-repeat: no-repeat;}" - text run at (288,16) width 0: " " - text run at (0,32) width 624: ".one {background-image: url(../resources/bg.gif); background-position: center;" - text run at (624,32) width 0: " " - text run at (0,48) width 480: " background-repeat: no-repeat; background-color: aqua;}" - text run at (480,48) width 0: " " - text run at (0,64) width 632: ".two {background-image: url(../resources/bg.gif); background-position: 50% 50%;" - text run at (632,64) width 0: " " - text run at (0,80) width 480: " background-repeat: no-repeat; background-color: aqua;}" - text run at (480,80) width 0: " " - text run at (0,96) width 688: ".three {background-image: url(../resources/bg.gif); background-position: bottom right;" - text run at (688,96) width 0: " " - text run at (0,112) width 496: " background-repeat: no-repeat; background-color: aqua;}" - text run at (496,112) width 0: " " - text run at (0,128) width 656: ".four {background-image: url(../resources/bg.gif); background-position: 100% 100%;" - text run at (656,128) width 0: " " - text run at (0,144) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,144) width 0: " " - text run at (0,160) width 632: ".five {background-image: url(../resources/bg.gif); background-position: 0% 50%;" - text run at (632,160) width 0: " " - text run at (0,176) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,176) width 0: " " - text run at (0,192) width 632: ".six {background-image: url(../resources/bg.gif); background-position: 75% 25%;" - text run at (632,192) width 0: " " - text run at (0,208) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,208) width 0: " " - text run at (0,224) width 664: ".seven {background-image: url(../resources/bg.gif); background-position: 20px 20px;" - text run at (664,224) width 0: " " - text run at (0,240) width 488: " background-repeat: no-repeat; background-color: aqua;}" - text run at (488,240) width 0: " " - text run at (0,256) width 0: " " - LayoutBlockFlow {P} at (0,339) size 769x20 - LayoutText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "This document should have a single, small green image in its upper right corner." - LayoutBlockFlow {P} at (0,375) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 764x59 - text run at (0,0) width 764: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at the" - text run at (0,20) width 148: "center of the paragraph. " - text run at (148,20) width 612: "The background color will make it easier to determine the edges of the paragraph, and therefore allow" - text run at (0,40) width 156: "you to calculate its center." - LayoutBlockFlow {P} at (0,451) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 764x59 - text run at (0,0) width 764: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at the" - text run at (0,20) width 148: "center of the paragraph. " - text run at (148,20) width 612: "The background color will make it easier to determine the edges of the paragraph, and therefore allow" - text run at (0,40) width 156: "you to calculate its center." - LayoutBlockFlow {P} at (0,527) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 751x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 401: "The background color will make it easier to determine the edges of" - text run at (0,40) width 343: "the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (0,603) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 751x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 401: "The background color will make it easier to determine the edges of" - text run at (0,40) width 343: "the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (0,679) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 758x59 - text run at (0,0) width 744: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image should be" - text run at (0,20) width 240: "fixed at the left center of the paragraph. " - text run at (240,20) width 518: "The background color will make it easier to determine the edges of the paragraph, and" - text run at (0,40) width 250: "therefore allow you to calculate its center." - LayoutBlockFlow {P} at (0,755) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 750x59 - text run at (0,0) width 717: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down. " - text run at (717,0) width 23: "The" - text run at (0,20) width 750: "background color will make it easier to determine the edges of the paragraph, which should help in determining if all this is so," - text run at (0,40) width 557: "and the extra text should make the element long enough for this test to be simpler to evaluate." - LayoutBlockFlow {P} at (0,831) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 757x59 - text run at (0,0) width 756: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand corner;" - text run at (0,20) width 757: "that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of the element." - text run at (0,40) width 740: "The background color will make it easier to determine the edges of the paragraph, which should assist in evaluating this test." - LayoutTable {TABLE} at (0,907) size 769x610 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x608 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x580 - LayoutTableCell {TD} at (0,304) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x580 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "This document should have a single, small green image in its upper right corner." - LayoutBlockFlow {P} at (4,40) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 746x59 - text run at (0,0) width 742: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at" - text run at (0,20) width 170: "the center of the paragraph. " - text run at (170,20) width 576: "The background color will make it easier to determine the edges of the paragraph, and therefore" - text run at (0,40) width 192: "allow you to calculate its center." - LayoutBlockFlow {P} at (4,116) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 746x59 - text run at (0,0) width 742: "This paragraph should have a single, small green image exactly in its center; that is, the center of the image should be fixed at" - text run at (0,20) width 170: "the center of the paragraph. " - text run at (170,20) width 576: "The background color will make it easier to determine the edges of the paragraph, and therefore" - text run at (0,40) width 192: "allow you to calculate its center." - LayoutBlockFlow {P} at (4,192) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 735x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 385: "The background color will make it easier to determine the edges" - text run at (0,40) width 359: "of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (4,268) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 735x59 - text run at (0,0) width 728: "This paragraph should have a single, small green image in its lower-right corner; that is, the lower right corner of the image" - text run at (0,20) width 350: "should be fixed at the lower right corner of the paragraph. " - text run at (350,20) width 385: "The background color will make it easier to determine the edges" - text run at (0,40) width 359: "of the paragraph, and therefore allow you to see its corners." - LayoutBlockFlow {P} at (4,344) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 744x59 - text run at (0,0) width 744: "This paragraph should have a single, small green image exactly at the left center; that is, the left center of the image should be" - text run at (0,20) width 240: "fixed at the left center of the paragraph. " - text run at (240,20) width 492: "The background color will make it easier to determine the edges of the paragraph," - text run at (0,40) width 276: "and therefore allow you to calculate its center." - LayoutBlockFlow {P} at (4,420) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 740x59 - text run at (0,0) width 717: "This paragraph should have a single, small green image positioned 75% of the way across the element, and 25% down. " - text run at (717,0) width 23: "The" - text run at (0,20) width 728: "background color will make it easier to determine the edges of the paragraph, which should help in determining if all this is" - text run at (0,40) width 579: "so, and the extra text should make the element long enough for this test to be simpler to evaluate." - LayoutBlockFlow {P} at (4,496) size 747x80 [bgcolor=#00FFFF] - LayoutText {#text} at (0,0) size 728x79 - text run at (0,0) width 709: "This paragraph should have a single, small green image positioned 20 pixels down and to the left of the upper left-hand" - text run at (0,20) width 728: "corner; that is, the upper left-hand corner of the image should be 20 pixels down and to the left of the upper-left corner of" - text run at (0,40) width 76: "the element. " - text run at (76,40) width 624: "The background color will make it easier to determine the edges of the paragraph, which should assist in" - text run at (0,60) width 112: "evaluating this test." -layer at (8,329) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,321) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png deleted file mode 100644 index bf456ff..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt deleted file mode 100644 index 9b3402d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/background_repeat-expected.txt +++ /dev/null
@@ -1,308 +0,0 @@ -layer at (0,0) size 800x600 scrollWidth 888 scrollHeight 1973 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x1973 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x1973 - LayoutBlockFlow {BODY} at (8,8) size 784x1957 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x240 - LayoutText {#text} at (0,0) size 880x240 - text run at (0,0) width 672: ".one {background-image: url(../resources/oransqr.gif); background-repeat: repeat-y;}" - text run at (672,0) width 0: " " - text run at (0,16) width 672: ".two {background-image: url(../resources/oransqr.gif); background-repeat: repeat-x;}" - text run at (672,16) width 0: " " - text run at (0,32) width 696: ".three {background-image: url(../resources/oransqr.gif); background-repeat: no-repeat;}" - text run at (696,32) width 0: " " - text run at (0,48) width 880: ".four {background-image: url(../resources/bg.gif); background-position: 50% 50%; background-repeat: repeat-y;}" - text run at (880,48) width 0: " " - text run at (0,64) width 704: ".five {background-image: url(../resources/crosshair2.gif); background-position: 50% 50%;" - text run at (704,64) width 0: " " - text run at (0,80) width 240: " background-color: red;}" - text run at (240,80) width 0: " " - text run at (0,96) width 720: ".six {background-image: url(../resources/crosshair2.gif); background-position: center top;" - text run at (720,96) width 0: " " - text run at (0,112) width 232: " background-color: red;}" - text run at (232,112) width 0: " " - text run at (0,128) width 720: ".seven {background-image: url(../resources/crosshair2.gif); background-position: top left;" - text run at (720,128) width 0: " " - text run at (0,144) width 248: " background-color: red;}" - text run at (248,144) width 0: " " - text run at (0,160) width 752: ".eight {background-image: url(../resources/crosshair2.gif); background-position: bottom right;" - text run at (752,160) width 0: " " - text run at (0,176) width 248: " background-color: red;}" - text run at (248,176) width 0: " " - text run at (0,192) width 704: ".nine {background-image: url(../resources/crosshair2.gif); background-position: 50% 50%;" - text run at (704,192) width 0: " " - text run at (0,208) width 240: " background-color: red;}" - text run at (240,208) width 0: " " - text run at (0,224) width 0: " " - LayoutBlockFlow {P} at (0,307) size 784x60 - LayoutText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 756x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 292: "This is extra text included for the sole purpose of" - text run at (0,40) width 179: "making the paragraph longer. " - text run at (178,40) width 208: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,383) size 784x60 - LayoutText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 756x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 292: "This is extra text included for the sole purpose of" - text run at (0,40) width 179: "making the paragraph longer. " - text run at (178,40) width 208: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,459) size 784x60 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for " - LayoutInline {CODE} at (0,0) size 755x36 - LayoutText {#text} at (667,3) size 755x36 - text run at (667,3) width 88: "background-" - text run at (0,23) width 64: "position" - LayoutText {#text} at (64,20) size 737x39 - text run at (64,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (376,20) width 361: "This is extra text included for the sole purpose of making the" - text run at (0,40) width 110: "paragraph longer. " - text run at (109,40) width 208: "Thank you for your understanding." - LayoutBlockFlow {P} at (0,535) size 784x80 - LayoutText {#text} at (0,0) size 764x39 - text run at (0,0) width 764: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image exactly" - text run at (0,20) width 161: "centered in the paragraph. " - text run at (161,20) width 95: "This is because " - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (256,23) size 64x16 - text run at (256,23) width 64: "repeat-y" - LayoutText {#text} at (320,20) size 104x19 - text run at (320,20) width 104: " specifies tiling in " - LayoutInline {EM} at (0,0) size 29x19 - LayoutText {#text} at (424,20) size 29x19 - text run at (424,20) width 29: "both" - LayoutText {#text} at (453,20) size 784x39 - text run at (453,20) width 151: " directions on the y-axis. " - text run at (604,20) width 180: "Note that this test is only valid" - text run at (0,40) width 154: "if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (154,43) size 152x16 - text run at (154,43) width 152: "background-position" - LayoutText {#text} at (306,40) size 33x19 - text run at (306,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (339,40) size 57x19 - text run at (339,40) width 57: "test 5.3.6" - LayoutText {#text} at (396,40) size 773x39 - text run at (396,40) width 13: "). " - text run at (409,40) width 364: "I'll fill the paragraph with extra text to make the conformance" - text run at (0,60) width 188: "(or lack thereof) more obvious." - LayoutBlockFlow {P} at (0,631) size 784x80 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 714x19 - text run at (0,0) width 623: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (623,0) width 91: "This is because" - LayoutInline {CODE} at (0,0) size 136x16 - LayoutText {#text} at (0,23) size 136x16 - text run at (0,23) width 136: "background-repeat" - LayoutText {#text} at (136,20) size 104x19 - text run at (136,20) width 104: " specifies tiling in " - LayoutInline {EM} at (0,0) size 16x19 - LayoutText {#text} at (240,20) size 16x19 - text run at (240,20) width 16: "all" - LayoutText {#text} at (256,20) size 778x39 - text run at (256,20) width 342: " directions, regardless of the position of the origin image. " - text run at (598,20) width 180: "Note that this test is only valid" - text run at (0,40) width 154: "if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (154,43) size 152x16 - text run at (154,43) width 152: "background-position" - LayoutText {#text} at (306,40) size 33x19 - text run at (306,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (339,40) size 57x19 - text run at (339,40) width 57: "test 5.3.6" - LayoutText {#text} at (396,40) size 773x39 - text run at (396,40) width 13: "). " - text run at (409,40) width 364: "I'll fill the paragraph with extra text to make the conformance" - text run at (0,60) width 192: "(or lack thereof) more obvious. " - text run at (192,60) width 570: "A background color is present, although if it is visible then the image has not bee correctly tiled." - LayoutBlockFlow {P} at (0,727) size 784x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 783x59 - text run at (0,0) width 783: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be the exact" - text run at (0,20) width 210: "center of the top of the paragraph. " - text run at (210,20) width 484: "I'll fill it with extra text to make the conformance (or lack thereof) more obvious. " - text run at (694,20) width 87: "A background" - text run at (0,40) width 526: "color is present, although if it is visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (0,803) size 784x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 771x59 - text run at (0,0) width 461: "This sentence should have a fully tiled background which starts at its top left. " - text run at (461,0) width 310: "I'll fill it with extra text to make the conformance (or" - text run at (0,20) width 170: "lack thereof) more obvious. " - text run at (170,20) width 557: "A background color is present, although if it is visible, then the image may not have been tiled" - text run at (0,40) width 56: "correctly." - LayoutBlockFlow {P} at (0,879) size 784x80 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 782x79 - text run at (0,0) width 782: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of the image" - text run at (0,20) width 592: "should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (591,20) width 185: "I'll fill it with extra text to make" - text run at (0,40) width 296: "the conformance (or lack thereof) more obvious. " - text run at (296,40) width 463: "A background color is present, although if it is visible, then the image may not" - text run at (0,60) width 150: "have been tiled correctly." - LayoutBlockFlow {P} at (0,975) size 784x120 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 769x119 - text run at (0,0) width 763: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the background's" - text run at (0,20) width 305: "origin should be the exact center of the paragraph. " - text run at (305,20) width 425: "I'll fill it with extra text to make the conformance (or lack thereof) more" - text run at (0,40) width 55: "obvious. " - text run at (55,40) width 422: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (477,40) width 292: "This is true because I am not able to increase the" - text run at (0,60) width 724: "text size without resorting to either headings or other CSS properties, neither of which I want to use in this circumstance. " - text run at (724,60) width 25: "This" - text run at (0,80) width 197: "ought to be enough text, though. " - text run at (197,80) width 557: "A background color is present, although if it is visible, then the image may not have been tiled" - text run at (0,100) width 56: "correctly." - LayoutTable {TABLE} at (0,1111) size 784x846 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x844 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x816 - LayoutTableCell {TD} at (0,422) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x816 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x60 - LayoutText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"y\" direction, starting at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 756x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 292: "This is extra text included for the sole purpose of" - text run at (0,40) width 179: "making the paragraph longer. " - text run at (178,40) width 208: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,80) size 762x60 - LayoutText {#text} at (0,0) size 744x19 - text run at (0,0) width 744: "This sentence should have an orange stripe repeated in the \"x\" direction, starting at the upper left corner (since the default for" - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (0,23) size 152x16 - text run at (0,23) width 152: "background-position" - LayoutText {#text} at (152,20) size 756x39 - text run at (152,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (464,20) width 292: "This is extra text included for the sole purpose of" - text run at (0,40) width 179: "making the paragraph longer. " - text run at (178,40) width 208: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,156) size 762x60 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This sentence should have a single orange square behind it, placed at the upper left corner (since the default for " - LayoutInline {CODE} at (0,0) size 755x36 - LayoutText {#text} at (667,3) size 755x36 - text run at (667,3) width 88: "background-" - text run at (0,23) width 64: "position" - LayoutText {#text} at (64,20) size 737x39 - text run at (64,20) width 312: " is '0% 0%' and that property is not declared here). " - text run at (376,20) width 361: "This is extra text included for the sole purpose of making the" - text run at (0,40) width 110: "paragraph longer. " - text run at (109,40) width 208: "Thank you for your understanding." - LayoutBlockFlow {P} at (4,232) size 762x80 - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 718: "This sentence should have a green-hatch stripe running vertically down the center of the paragraph, with the origin image" - text run at (0,20) width 207: "exactly centered in the paragraph. " - text run at (207,20) width 95: "This is because " - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (302,23) size 64x16 - text run at (302,23) width 64: "repeat-y" - LayoutText {#text} at (366,20) size 104x19 - text run at (366,20) width 104: " specifies tiling in " - LayoutInline {EM} at (0,0) size 29x19 - LayoutText {#text} at (470,20) size 29x19 - text run at (470,20) width 29: "both" - LayoutText {#text} at (499,20) size 756x39 - text run at (499,20) width 151: " directions on the y-axis. " - text run at (650,20) width 106: "Note that this test" - text run at (0,40) width 228: "is only valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (228,43) size 152x16 - text run at (228,43) width 152: "background-position" - LayoutText {#text} at (380,40) size 33x19 - text run at (380,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (413,40) size 57x19 - text run at (413,40) width 57: "test 5.3.6" - LayoutText {#text} at (470,40) size 743x39 - text run at (470,40) width 13: "). " - text run at (483,40) width 260: "I'll fill the paragraph with extra text to make" - text run at (0,60) width 292: "the conformance (or lack thereof) more obvious." - LayoutBlockFlow {P} at (4,328) size 762x100 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 714x19 - text run at (0,0) width 623: "This paragraph should have a tiled background, with the origin image exactly centered in the paragraph. " - text run at (623,0) width 91: "This is because" - LayoutInline {CODE} at (0,0) size 136x16 - LayoutText {#text} at (0,23) size 136x16 - text run at (0,23) width 136: "background-repeat" - LayoutText {#text} at (136,20) size 104x19 - text run at (136,20) width 104: " specifies tiling in " - LayoutInline {EM} at (0,0) size 16x19 - LayoutText {#text} at (240,20) size 16x19 - text run at (240,20) width 16: "all" - LayoutText {#text} at (256,20) size 746x39 - text run at (256,20) width 342: " directions, regardless of the position of the origin image. " - text run at (598,20) width 148: "Note that this test is only" - text run at (0,40) width 186: "valid if the user agent supports " - LayoutInline {CODE} at (0,0) size 152x16 - LayoutText {#text} at (186,43) size 152x16 - text run at (186,43) width 152: "background-position" - LayoutText {#text} at (338,40) size 33x19 - text run at (338,40) width 33: " (see " - LayoutInline {A} at (0,0) size 57x19 [color=#0000FF] - LayoutText {#text} at (371,40) size 57x19 - text run at (371,40) width 57: "test 5.3.6" - LayoutText {#text} at (428,40) size 754x59 - text run at (428,40) width 13: "). " - text run at (441,40) width 282: "I'll fill the paragraph with extra text to make the" - text run at (0,60) width 274: "conformance (or lack thereof) more obvious. " - text run at (274,60) width 480: "A background color is present, although if it is visible then the image has not bee" - text run at (0,80) width 86: "correctly tiled." - LayoutBlockFlow {P} at (4,444) size 762x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 747x59 - text run at (0,0) width 747: "This sentence should have a fully tiled background which starts at its center top; that is, the background's origin should be the" - text run at (0,20) width 246: "exact center of the top of the paragraph. " - text run at (246,20) width 484: "I'll fill it with extra text to make the conformance (or lack thereof) more obvious. " - text run at (730,20) width 11: "A" - text run at (0,40) width 602: "background color is present, although if it is visible, then the image may not have been tiled correctly." - LayoutBlockFlow {P} at (4,520) size 762x60 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 749x59 - text run at (0,0) width 461: "This sentence should have a fully tiled background which starts at its top left. " - text run at (461,0) width 288: "I'll fill it with extra text to make the conformance" - text run at (0,20) width 192: "(or lack thereof) more obvious. " - text run at (192,20) width 557: "A background color is present, although if it is visible, then the image may not have been tiled" - text run at (0,40) width 56: "correctly." - LayoutBlockFlow {P} at (4,596) size 762x80 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 762x79 - text run at (0,0) width 743: "This sentence should have a fully tiled background which starts at its bottom right; in other words, a complete instance of the" - text run at (0,20) width 631: "image should be anchored in the bottom right corner, with the tiled background extending out from there. " - text run at (630,20) width 132: "I'll fill it with extra text" - text run at (0,40) width 349: "to make the conformance (or lack thereof) more obvious. " - text run at (349,40) width 411: "A background color is present, although if it is visible, then the image" - text run at (0,60) width 202: "may not have been tiled correctly." - LayoutBlockFlow {P} at (4,692) size 762x120 [bgcolor=#FF0000] - LayoutText {#text} at (0,0) size 754x119 - text run at (0,0) width 678: "This sentence should have a fully tiled background which starts at its center and is tiled in all directions; that is, the" - text run at (0,20) width 390: "background's origin should be the exact center of the paragraph. " - text run at (390,20) width 339: "I'll fill it with extra text to make the conformance (or lack" - text run at (0,40) width 141: "thereof) more obvious. " - text run at (141,40) width 422: "In fact, a lot of extra text will be necessary to make this at all obvious. " - text run at (563,40) width 172: "This is true because I am not" - text run at (0,60) width 754: "able to increase the text size without resorting to either headings or other CSS properties, neither of which I want to use in this" - text run at (0,80) width 86: "circumstance. " - text run at (86,80) width 226: "This ought to be enough text, though. " - text run at (312,80) width 440: "A background color is present, although if it is visible, then the image may" - text run at (0,100) width 173: "not have been tiled correctly." -layer at (8,297) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,289) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/color-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/color-expected.png deleted file mode 100644 index 6fc0975..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/color-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/color-expected.txt deleted file mode 100644 index 897ec93..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/color_and_background/color-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x32 - LayoutText {#text} at (0,0) size 160x32 - text run at (0,0) width 160: ".one {color: green;}" - text run at (160,0) width 0: " " - text run at (0,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,135) size 784x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutTable {TABLE} at (0,171) size 206x94 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 204x92 - LayoutTableRow {TR} at (0,0) size 204x28 - LayoutTableCell {TD} at (0,0) size 204x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 204x64 - LayoutTableCell {TD} at (0,46) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 192x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,40) size 184x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." -layer at (8,89) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png deleted file mode 100644 index c25112d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt deleted file mode 100644 index ec5ffd6..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/conformance/forward_compatible_parsing-expected.txt +++ /dev/null
@@ -1,543 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4321 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4321 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4321 - LayoutBlockFlow {BODY} at (8,8) size 769x4305 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x864 - LayoutText {#text} at (0,0) size 568x864 - text run at (0,0) width 304: "P.one {color: green; rotation: 70deg;}" - text run at (304,0) width 0: " " - text run at (0,16) width 176: "P.oneb {color: green;}" - text run at (176,16) width 0: " " - text run at (0,32) width 232: "P.oneb {color: invalidValue;}" - text run at (232,32) width 0: " " - text run at (0,48) width 272: "P.two {background-color: inherit;}" - text run at (272,48) width 0: " " - text run at (0,64) width 216: "H1 + P.three {color: blue;}" - text run at (216,64) width 0: " " - text run at (0,80) width 200: "P.four + H1 {color: red;}" - text run at (200,80) width 0: " " - text run at (0,96) width 264: "P.five {background-color: \"red\";}" - text run at (264,96) width 0: " " - text run at (0,112) width 408: "P.sixa {border-width: medium; border-style: solid;}" - text run at (408,112) width 0: " " - text run at (0,128) width 400: "P.sixb {border-width: funny; border-style: solid;}" - text run at (400,128) width 0: " " - text run at (0,144) width 392: "P.sixc {border-width: 50zu; border-style: solid;}" - text run at (392,144) width 0: " " - text run at (0,160) width 376: "P.sixd {border-width: px; border-style: solid;}" - text run at (376,160) width 0: " " - text run at (0,176) width 96: "@three-dee {" - text run at (96,176) width 0: " " - text run at (0,192) width 184: " @background-lighting {" - text run at (184,192) width 0: " " - text run at (0,208) width 136: " azimuth: 30deg;" - text run at (136,208) width 0: " " - text run at (0,224) width 160: " elevation: 190deg;" - text run at (160,224) width 0: " " - text run at (0,240) width 24: " }" - text run at (24,240) width 0: " " - text run at (0,256) width 184: " P.seven { color: red }" - text run at (184,256) width 0: " " - text run at (0,272) width 16: " }" - text run at (16,272) width 0: " " - text run at (0,288) width 184: "P.eight {COLOR: GREEN;}" - text run at (184,288) width 0: " " - text run at (0,304) width 192: "OL:wait {color: maroon;}" - text run at (192,304) width 0: " " - text run at (0,320) width 272: "P.ten:first-child {color: maroon;}" - text run at (272,320) width 0: " " - text run at (0,336) width 208: "UL:lang(fr) {color: gray;}" - text run at (208,336) width 0: " " - text run at (0,352) width 248: "BLOCKQUOTE[href] {color: navy;}" - text run at (248,352) width 0: " " - text run at (0,368) width 288: "ACRONYM[href=\"foo\"] {color: purple;}" - text run at (288,368) width 0: " " - text run at (0,384) width 296: "ADDRESS[href~=\"foo\"] {color: purple;}" - text run at (296,384) width 0: " " - text run at (0,400) width 248: "SPAN[lang|=\"fr\"] {color: #c37;}" - text run at (248,400) width 0: " " - text run at (0,416) width 96: "@media tty {" - text run at (96,416) width 0: " " - text run at (0,432) width 136: " H1 {color: red;}" - text run at (136,432) width 0: " " - text run at (0,448) width 192: " P.sixteen {color: red;}" - text run at (192,448) width 0: " " - text run at (0,464) width 16: " }" - text run at (16,464) width 0: " " - text run at (0,480) width 96: "@three-dee {" - text run at (96,480) width 0: " " - text run at (0,496) width 208: " P.seventeen {color: red }" - text run at (208,496) width 0: " " - text run at (0,512) width 16: " }" - text run at (16,512) width 0: " " - text run at (0,528) width 568: "P.eighteena {text-decoration: underline overline line-through diagonal;" - text run at (568,528) width 0: " " - text run at (0,544) width 416: " font: bold highlighted 100% sans-serif;}" - text run at (416,544) width 0: " " - text run at (0,560) width 568: "P.eighteenb {text-decoration: underline overline line-through diagonal;" - text run at (568,560) width 0: " " - text run at (0,576) width 376: " font: bold highlighted 100% serif;}" - text run at (376,576) width 0: " " - text run at (0,592) width 384: "EM, P.nineteena ! EM, STRONG {font-size: 200%; }" - text run at (384,592) width 0: " " - text run at (0,608) width 0: " " - text run at (0,624) width 128: "// UL.nineteenb," - text run at (128,624) width 0: " " - text run at (0,640) width 200: "P.nineteenb {color: red;}" - text run at (200,640) width 0: " " - text run at (0,656) width 0: " " - text run at (0,672) width 360: "P.twentya {rotation-code: \"}\"; color: blue;} " - text run at (360,672) width 0: " " - text run at (0,688) width 392: "P.twentyb {rotation-code: \"\\\"}\\\"\"; color: green;}" - text run at (392,688) width 0: " " - text run at (0,704) width 400: "P.twentyonea {rotation-code: '}'; color: purple;} " - text run at (400,704) width 0: " " - text run at (0,720) width 416: "P.twentyoneb {rotation-code: '\\'}\\''; color: green;}" - text run at (416,720) width 0: " " - text run at (0,736) width 104: "P.twentytwo {" - text run at (104,736) width 0: " " - text run at (0,752) width 376: " type-display: @threedee {rotation-code: '}';};" - text run at (376,752) width 0: " " - text run at (0,768) width 112: " color: green;" - text run at (112,768) width 0: " " - text run at (0,784) width 16: " }" - text run at (16,784) width 0: " " - text run at (0,800) width 280: "P.twentythree {text-indent: 0.5in;}" - text run at (280,800) width 0: " " - text run at (0,816) width 112: " color: maroon" - text run at (112,816) width 0: " " - text run at (0,832) width 208: "P.twentyfour {color: red;}" - text run at (208,832) width 0: " " - text run at (0,848) width 0: " " - LayoutBlockFlow {P} at (0,931) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 462x19 - text run at (0,0) width 462: "This paragraph should be green, because only the rotation should be ignored." - LayoutBlockFlow {P} at (0,967) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This paragraph should be green, since error-checking should be done before calculating specificity." - LayoutBlockFlow {P} at (0,1003) size 769x40 - LayoutText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " - LayoutInline {CODE} at (0,0) size 56x16 - LayoutText {#text} at (535,3) size 56x16 - text run at (535,3) width 56: "inherit" - LayoutText {#text} at (591,0) size 766x39 - text run at (591,0) width 175: " is an invalid keyword, and in" - text run at (0,20) width 454: "CSS2, it will cause the gray background (not the white grid) to be inherited." - LayoutBlockFlow {P} at (0,1059) size 769x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (0,1095) size 769x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (0,1131) size 769x20 - LayoutText {#text} at (0,0) size 503x19 - text run at (0,0) width 503: "This paragraph should have a white background, since keywords cannot be quoted." - LayoutBlockFlow {P} at (0,1167) size 769x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 744x39 - text run at (3,3) width 616: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (619,3) width 128: "This should cause the" - text run at (3,23) width 279: "user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1229) size 769x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 761x39 - text run at (3,3) width 761: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs), because" - text run at (3,23) width 165: "the border-width is invalid. " - text run at (167,23) width 412: "This should cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (0,1291) size 769x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 761x59 - text run at (3,3) width 761: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs), because" - text run at (3,23) width 511: "the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (513,23) width 234: "This should cause the user agent to use" - text run at (3,43) width 174: "the default value of 'medium'." - LayoutBlockFlow {P} at (0,1373) size 769x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 750x59 - text run at (3,3) width 713: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" - text run at (3,23) width 517: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (519,23) width 234: "This should cause the user agent to use" - text run at (3,43) width 174: "the default value of 'medium'." - LayoutBlockFlow {P} at (0,1455) size 769x20 - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (0,1491) size 769x40 [color=#008000] - LayoutText {#text} at (0,0) size 726x39 - text run at (0,0) width 197: "This paragraph should be green. " - text run at (197,0) width 529: "CSS is case-insensitive, unless required to be case sensitive due to interaction with other" - text run at (0,20) width 228: "standards (e.g., font names or URLs.)" - LayoutBlockFlow {OL} at (0,1547) size 769x20 - LayoutListItem {LI} at (40,0) size 729x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 596x19 - text run at (0,0) width 596: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - LayoutBlockFlow {P} at (0,1583) size 769x40 - LayoutText {#text} at (0,0) size 764x39 - text run at (0,0) width 764: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is not the" - text run at (0,20) width 58: "first child." - LayoutBlockFlow {UL} at (0,1639) size 769x40 - LayoutListItem {LI} at (40,0) size 729x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,20) width 153: "selector should not apply." - LayoutBlockFlow {BLOCKQUOTE} at (40,1695) size 689x40 - LayoutText {#text} at (0,0) size 685x39 - text run at (0,0) width 685: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,20) width 153: "selector should not apply." - LayoutBlockFlow {P} at (0,1751) size 769x40 - LayoutInline {ACRONYM} at (0,0) size 763x39 - LayoutText {#text} at (0,0) size 763x39 - text run at (0,0) width 763: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should" - text run at (0,20) width 59: "not apply." - LayoutBlockFlow {ADDRESS} at (0,1807) size 769x40 - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 752: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 110: "should not apply." - LayoutBlockFlow {P} at (0,1863) size 769x40 - LayoutInline {SPAN} at (0,0) size 762x39 - LayoutText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should not" - text run at (0,20) width 36: "apply." - LayoutBlockFlow {P} at (0,1919) size 769x40 - LayoutText {#text} at (0,0) size 761x39 - text run at (0,0) width 631: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (631,0) width 130: "However, it is valid in" - text run at (0,20) width 521: "CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - LayoutBlockFlow {P} at (0,1975) size 769x20 - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (0,2011) size 769x80 - LayoutText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - LayoutText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - LayoutText {#text} at (608,20) size 145x19 - text run at (608,20) width 145: " is not a valid part of the" - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (0,43) size 32x16 - text run at (0,43) width 32: "font" - LayoutText {#text} at (32,40) size 768x39 - text run at (32,40) width 167: " property, making it invalid. " - text run at (198,40) width 537: "Therefore, this paragraph's font should be the UA default, and match the next paragraph. " - text run at (734,40) width 34: "If this" - text run at (0,60) width 144: "is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (144,63) size 32x16 - text run at (144,63) width 32: "font" - LayoutText {#text} at (176,60) size 237x19 - text run at (176,60) width 237: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (0,2107) size 769x80 - LayoutText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - LayoutText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - LayoutText {#text} at (608,20) size 145x19 - text run at (608,20) width 145: " is not a valid part of the" - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (0,43) size 32x16 - text run at (0,43) width 32: "font" - LayoutText {#text} at (32,40) size 757x39 - text run at (32,40) width 167: " property, making it invalid. " - text run at (198,40) width 559: "Therefore, this paragraph's font should be the UA default, and match the previous paragraph." - text run at (0,60) width 181: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (181,63) size 32x16 - text run at (181,63) width 32: "font" - LayoutText {#text} at (213,60) size 237x19 - text run at (213,60) width 237: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (0,2203) size 769x60 - LayoutText {#text} at (0,0) size 503x19 - text run at (0,0) width 476: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (476,0) width 27: "The " - LayoutInline {EM} at (0,0) size 103x19 - LayoutText {#text} at (503,0) size 103x19 - text run at (503,0) width 103: "emphasized text" - LayoutText {#text} at (606,0) size 52x19 - text run at (606,0) width 52: " and the " - LayoutInline {STRONG} at (0,0) size 72x19 - LayoutText {#text} at (658,0) size 72x19 - text run at (658,0) width 72: "strong text" - LayoutText {#text} at (729,0) size 769x59 - text run at (729,0) width 40: " within" - text run at (0,20) width 757: "it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there could be an" - text run at (0,40) width 425: "operator within the selector that has higher precedence than a comma)." - LayoutBlockFlow {P} at (0,2279) size 769x40 - LayoutText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be black, because the line before the declaration is " - LayoutInline {STRONG} at (0,0) size 21x19 - LayoutText {#text} at (444,0) size 21x19 - text run at (444,0) width 21: "not" - LayoutText {#text} at (465,0) size 713x39 - text run at (465,0) width 248: " a comment and therefore the selector for" - text run at (0,20) width 128: "P.nineteenb is invalid." - LayoutBlockFlow {P} at (0,2335) size 769x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be blue, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2371) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2407) size 769x20 [color=#800080] - LayoutText {#text} at (0,0) size 457x19 - text run at (0,0) width 457: "This paragraph should be purple, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2443) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2479) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (0,2515) size 769x20 - LayoutText {#text} at (48,0) size 571x19 - text run at (48,0) width 459: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (507,0) width 112: "It should be black." - LayoutBlockFlow {P} at (0,2551) size 769x40 - LayoutText {#text} at (0,0) size 722x39 - text run at (0,0) width 722: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" - text run at (0,20) width 588: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." - LayoutTable {TABLE} at (0,2607) size 769x1698 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1696 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1668 - LayoutTableCell {TD} at (0,848) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1668 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 462x19 - text run at (0,0) width 462: "This paragraph should be green, because only the rotation should be ignored." - LayoutBlockFlow {P} at (4,40) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 591x19 - text run at (0,0) width 591: "This paragraph should be green, since error-checking should be done before calculating specificity." - LayoutBlockFlow {P} at (4,76) size 747x40 - LayoutText {#text} at (0,0) size 535x19 - text run at (0,0) width 535: "This paragraph should have a solid gray background (or a white grid), because in CSS1, " - LayoutInline {CODE} at (0,0) size 56x16 - LayoutText {#text} at (535,3) size 56x16 - text run at (535,3) width 56: "inherit" - LayoutText {#text} at (591,0) size 726x39 - text run at (591,0) width 135: " is an invalid keyword," - text run at (0,20) width 494: "and in CSS2, it will cause the gray background (not the white grid) to be inherited." - LayoutBlockFlow {P} at (4,132) size 747x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (4,168) size 747x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This paragraph should be black, since in CSS1, the selector is invalid, and in CSS2, it does not apply." - LayoutBlockFlow {P} at (4,204) size 747x20 - LayoutText {#text} at (0,0) size 503x19 - text run at (0,0) width 503: "This paragraph should have a white background, since keywords cannot be quoted." - LayoutBlockFlow {P} at (4,240) size 747x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 722x39 - text run at (3,3) width 616: "This paragraph should have a medium-width border around it (the same as the next three paragraphs). " - text run at (619,3) width 106: "This should cause" - text run at (3,23) width 301: "the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,302) size 747x46 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 708x39 - text run at (3,3) width 708: "This paragraph should have a medium-width border around it (the same as the previous and the next two paragraphs)," - text run at (3,23) width 218: "because the border-width is invalid. " - text run at (220,23) width 412: "This should cause the user agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,364) size 747x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 721x59 - text run at (3,3) width 708: "This paragraph should have a medium-width border around it (the same as the next and the previous two paragraphs)," - text run at (3,23) width 564: "because the border-width units are invalid, and therefore the border-width should be ignored. " - text run at (566,23) width 158: "This should cause the user" - text run at (3,43) width 250: "agent to use the default value of 'medium'." - LayoutBlockFlow {P} at (4,446) size 747x66 [border: (3px solid #000000)] - LayoutText {#text} at (3,3) size 726x59 - text run at (3,3) width 713: "This paragraph should have a medium-width border around it (the same as the previous three paragraphs), because the" - text run at (3,23) width 517: "border-width does not have any value to go with its pixel unit, and is therefore invalid. " - text run at (519,23) width 210: "This should cause the user agent to" - text run at (3,43) width 198: "use the default value of 'medium'." - LayoutBlockFlow {P} at (4,528) size 747x20 - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (4,564) size 747x40 [color=#008000] - LayoutText {#text} at (0,0) size 726x39 - text run at (0,0) width 197: "This paragraph should be green. " - text run at (197,0) width 529: "CSS is case-insensitive, unless required to be case sensitive due to interaction with other" - text run at (0,20) width 228: "standards (e.g., font names or URLs.)" - LayoutBlockFlow {OL} at (4,620) size 747x20 - LayoutListItem {LI} at (40,0) size 707x20 - LayoutListMarker (anonymous) at (-16,0) size 16x19: "1" - LayoutText {#text} at (0,0) size 596x19 - text run at (0,0) width 596: "This ordered list item should be black, because the declaration has an invalid pseudo-class selector." - LayoutBlockFlow {P} at (4,656) size 747x40 - LayoutText {#text} at (0,0) size 742x39 - text run at (0,0) width 742: "This paragraph should be black, because, in CSS1, :first-child is an invalid pseudo-class, and in CSS2, this paragraph is not" - text run at (0,20) width 80: "the first child." - LayoutBlockFlow {UL} at (4,712) size 747x40 - LayoutListItem {LI} at (40,0) size 707x40 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 706x39 - text run at (0,0) width 706: "This unordered list item should be black, because, according to CSS1, the selector is invalid, and according to CSS2," - text run at (0,20) width 175: "the selector should not apply." - LayoutBlockFlow {BLOCKQUOTE} at (44,768) size 667x40 - LayoutText {#text} at (0,0) size 663x39 - text run at (0,0) width 663: "This blockquote should be black, because, according to CSS1, the selector is invalid, and according to CSS2," - text run at (0,20) width 175: "the selector should not apply." - LayoutBlockFlow {P} at (4,824) size 747x40 - LayoutInline {ACRONYM} at (0,0) size 720x39 - LayoutText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "This acronym should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector" - text run at (0,20) width 102: "should not apply." - LayoutBlockFlow {ADDRESS} at (4,880) size 747x40 - LayoutText {#text} at (0,0) size 698x39 - text run at (0,0) width 698: "This address should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the" - text run at (0,20) width 164: "selector should not apply." - LayoutBlockFlow {P} at (4,936) size 747x40 - LayoutInline {SPAN} at (0,0) size 739x39 - LayoutText {#text} at (0,0) size 739x39 - text run at (0,0) width 739: "This span should be black, because, according to CSS1, the selector is invalid, and according to CSS2, the selector should" - text run at (0,20) width 59: "not apply." - LayoutBlockFlow {P} at (4,992) size 747x40 - LayoutText {#text} at (0,0) size 747x39 - text run at (0,0) width 631: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule. " - text run at (631,0) width 116: "However, it is valid" - text run at (0,20) width 535: "in CSS2, so if this is being viewed on a tty browser that supports CSS2, it should be red." - LayoutBlockFlow {P} at (4,1048) size 747x20 - LayoutText {#text} at (0,0) size 627x19 - text run at (0,0) width 627: "This paragraph should be black, because the style declaration that applies to it is within an invalid at-rule." - LayoutBlockFlow {P} at (4,1084) size 747x80 - LayoutText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - LayoutText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - LayoutText {#text} at (608,20) size 731x39 - text run at (608,20) width 123: " is not a valid part of" - text run at (0,40) width 22: "the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (22,43) size 32x16 - text run at (22,43) width 32: "font" - LayoutText {#text} at (54,40) size 684x39 - text run at (54,40) width 167: " property, making it invalid. " - text run at (220,40) width 464: "Therefore, this paragraph's font should be the UA default, and match the next" - text run at (0,60) width 69: "paragraph. " - text run at (69,60) width 181: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (250,63) size 32x16 - text run at (250,63) width 32: "font" - LayoutText {#text} at (282,60) size 237x19 - text run at (282,60) width 237: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (4,1180) size 747x80 - LayoutText {#text} at (0,0) size 703x19 - text run at (0,0) width 703: "The text of this paragraph should be normal (that is, it should not be underlined, overlined, stricken, or bold), because" - LayoutInline {CODE} at (0,0) size 64x16 - LayoutText {#text} at (0,23) size 64x16 - text run at (0,23) width 64: "diagonal" - LayoutText {#text} at (64,20) size 214x19 - text run at (64,20) width 214: " is not a valid keyword, making the " - LayoutInline {CODE} at (0,0) size 120x16 - LayoutText {#text} at (278,23) size 120x16 - text run at (278,23) width 120: "text-decoration" - LayoutText {#text} at (398,20) size 122x19 - text run at (398,20) width 50: " invalid. " - text run at (448,20) width 72: "In addition, " - LayoutInline {CODE} at (0,0) size 88x16 - LayoutText {#text} at (520,23) size 88x16 - text run at (520,23) width 88: "highlighted" - LayoutText {#text} at (608,20) size 731x39 - text run at (608,20) width 123: " is not a valid part of" - text run at (0,40) width 22: "the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (22,43) size 32x16 - text run at (22,43) width 32: "font" - LayoutText {#text} at (54,40) size 710x39 - text run at (54,40) width 167: " property, making it invalid. " - text run at (220,40) width 490: "Therefore, this paragraph's font should be the UA default, and match the previous" - text run at (0,60) width 69: "paragraph. " - text run at (69,60) width 181: "If this is not the case, then the " - LayoutInline {CODE} at (0,0) size 32x16 - LayoutText {#text} at (250,63) size 32x16 - text run at (250,63) width 32: "font" - LayoutText {#text} at (282,60) size 237x19 - text run at (282,60) width 237: " declaration is being improperly parsed." - LayoutBlockFlow {P} at (4,1276) size 747x60 - LayoutText {#text} at (0,0) size 503x19 - text run at (0,0) width 476: "The text of this paragraph should be normal size because the selector is invalid. " - text run at (476,0) width 27: "The " - LayoutInline {EM} at (0,0) size 103x19 - LayoutText {#text} at (503,0) size 103x19 - text run at (503,0) width 103: "emphasized text" - LayoutText {#text} at (606,0) size 52x19 - text run at (606,0) width 52: " and the " - LayoutInline {STRONG} at (0,0) size 72x19 - LayoutText {#text} at (658,0) size 72x19 - text run at (658,0) width 72: "strong text" - LayoutText {#text} at (0,20) size 722x39 - text run at (0,20) width 722: "within it should also be normal size, since the entire ruleset should be skipped (since in some future version of CSS, there" - text run at (0,40) width 499: "could be an operator within the selector that has higher precedence than a comma)." - LayoutBlockFlow {P} at (4,1352) size 747x40 - LayoutText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be black, because the line before the declaration is " - LayoutInline {STRONG} at (0,0) size 21x19 - LayoutText {#text} at (444,0) size 21x19 - text run at (444,0) width 21: "not" - LayoutText {#text} at (465,0) size 713x39 - text run at (465,0) width 248: " a comment and therefore the selector for" - text run at (0,20) width 128: "P.nineteenb is invalid." - LayoutBlockFlow {P} at (4,1408) size 747x20 [color=#0000FF] - LayoutText {#text} at (0,0) size 444x19 - text run at (0,0) width 444: "This paragraph should be blue, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1444) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1480) size 747x20 [color=#800080] - LayoutText {#text} at (0,0) size 457x19 - text run at (0,0) width 457: "This paragraph should be purple, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1516) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1552) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 452x19 - text run at (0,0) width 452: "This paragraph should be green, because only the first declaration is invalid." - LayoutBlockFlow {P} at (4,1588) size 747x20 - LayoutText {#text} at (48,0) size 571x19 - text run at (48,0) width 459: "This paragraph should be indented half an inch, but it should not be maroon. " - text run at (507,0) width 112: "It should be black." - LayoutBlockFlow {P} at (4,1624) size 747x40 - LayoutText {#text} at (0,0) size 722x39 - text run at (0,0) width 722: "This paragraph should be black, because the color declaration after the previous ruleset should be considered part of the" - text run at (0,20) width 588: "selector for this ruleset, and this ruleset therefore has an invalid selector and should not be applied." -layer at (8,921) size 769x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,913) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font-expected.png deleted file mode 100644 index 563c813..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font-expected.txt deleted file mode 100644 index 9c72654..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font-expected.txt +++ /dev/null
@@ -1,235 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4723 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4723 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4723.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4707.33 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x16 - LayoutText {#text} at (0,0) size 274x15 - text run at (0,0) width 274: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,28) size 769x180 - LayoutText {#text} at (0,0) size 399x180 - text run at (0,0) width 161: "BODY {font-size: 12px;}" - text run at (161,0) width 0: " " - text run at (0,15) width 322: ".one {font: italic small-caps 13pt Helvetica;}" - text run at (322,15) width 0: " " - text run at (0,30) width 203: ".two {font: 150%/150% serif;}" - text run at (203,30) width 0: " " - text run at (0,45) width 252: ".three {font: 150%/150% sans-serif;}" - text run at (252,45) width 0: " " - text run at (0,60) width 231: ".four {font: small/200% cursive;}" - text run at (231,60) width 0: " " - text run at (0,75) width 399: ".five {font: italic small-caps 900 150%/150% sans-serif;}" - text run at (399,75) width 0: " " - text run at (0,90) width 392: ".six {font: italic small-caps 100 150%/300% sans-serif;}" - text run at (392,90) width 0: " " - text run at (0,105) width 392: ".seven {font: italic small-caps 900 150%/2em monospace;}" - text run at (392,105) width 0: " " - text run at (0,120) width 399: ".eight {font: italic small-caps 500 150%/1in sans-serif;}" - text run at (399,120) width 0: " " - text run at (0,135) width 378: ".nine {font: oblique normal 700 18px/200% sans-serif;}" - text run at (378,135) width 0: " " - text run at (0,150) width 301: ".ten {font: normal 400 80%/2.5 sans-serif;}" - text run at (301,150) width 0: " " - text run at (0,165) width 266: "SPAN.color {background-color: silver;}" - text run at (266,165) width 0: " " - LayoutBlockFlow {P} at (0,234) size 769x16 - LayoutText {#text} at (0,0) size 721x15 - text run at (0,0) width 431: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (431,0) width 290: "This is the \"base font size\" referred to in the following tests." - LayoutBlockFlow {P} at (0,267.33) size 769x21 - LayoutText {#text} at (0,0) size 559x20 - text run at (0,0) width 559: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (0,306.33) size 769x81 - LayoutText {#text} at (0,3) size 760x74 - text run at (0,3) width 278: "This element should be in a serif font. " - text run at (278,3) width 472: "Its font-size should be 150% the base font size, and its line-height" - text run at (0,30) width 417: "should 150% of that value (18px and 27px, respectively). " - text run at (417,30) width 343: "Extra text is included for the purposes of testing" - text run at (0,57) width 151: "this more effectively." - LayoutBlockFlow {P} at (0,405.33) size 769x81 - LayoutText {#text} at (0,3) size 757x75 - text run at (0,3) width 348: "This element should be in a sans-serif font. " - text run at (348,3) width 409: "Its font-size should be 150% the base font size, and" - text run at (0,30) width 566: "its line-height should 150% of that value (18px and 27px, respectively). " - text run at (566,30) width 190: "Extra text is included for" - text run at (0,57) width 349: "the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,504.33) size 769x80 - LayoutText {#text} at (0,4) size 726x44 - text run at (0,4) width 705: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (705,4) width 21: "For" - text run at (0,30) width 189: "example, if the font-size value " - LayoutInline {CODE} at (0,0) size 30x12 - LayoutText {#text} at (189,35) size 30x12 - text run at (189,35) width 30: "small" - LayoutText {#text} at (219,30) size 753x46 - text run at (219,30) width 359: " is calculated at 10px, then the line-height should be 20px. " - text run at (578,30) width 175: "The actual value of the font-" - text run at (0,58) width 136: "size is UA-dependent. " - text run at (136,58) width 434: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,602.33) size 769x135 - LayoutText {#text} at (0,0) size 755x134 - text run at (0,0) width 720: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,27) width 221: "with a weight of 900. " - text run at (221,27) width 534: "Its font-size should be 150% the base font size, and" - text run at (0,54) width 623: "its line-height should be 150% of that value (18px and 27px," - text run at (0,81) width 149: "respectively). " - text run at (148,81) width 570: "Extra text is included for the purposes of testing this" - text run at (0,108) width 177: "more effectively." - LayoutBlockFlow {P} at (0,755.33) size 769x216 - LayoutText {#text} at (0,16) size 760x184 - text run at (0,16) width 760: "This element should be in a sans-serif font, italicized and small caps, with a weight of" - text run at (0,70) width 40: "100. " - text run at (40,70) width 681: "Its font-size should be 150% the base font size, and its line-height should be" - text run at (0,124) width 439: "300% of that value (18px and 54px, respectively). " - text run at (438,124) width 269: "Extra text is included for the" - text run at (0,178) width 377: "purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,989.33) size 769x144 - LayoutText {#text} at (0,8) size 750x128 - text run at (0,8) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of" - text run at (0,44) width 55: "900. " - text run at (55,44) width 687: "Its font-size should be 150% the base font size, and its line-height should be" - text run at (0,80) width 618: "2em, or twice the element's font size (18px and 36px, respectively). " - text run at (618,80) width 113: "Extra text is" - text run at (0,116) width 499: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1151.33) size 769x384 - LayoutText {#text} at (0,37) size 760x310 - text run at (0,37) width 760: "This element should be in a sans-serif font, italicized and small caps, with a weight of" - text run at (0,133) width 40: "500. " - text run at (40,133) width 666: "Its font-size should be 150% the base font size, or 18px, and its line-height" - text run at (0,229) width 128: "should be 1in. " - text run at (128,229) width 543: "Extra text is included for the purposes of testing this more" - text run at (0,325) width 102: "effectively." - LayoutBlockFlow {P} at (0,1553.33) size 769x144 - LayoutText {#text} at (0,7) size 752x129 - text run at (0,7) width 752: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of" - text run at (0,43) width 40: "700. " - text run at (40,43) width 663: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 177: "element's font size). " - text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 91: "effectively." - LayoutBlockFlow {P} at (0,1715.33) size 769x46 - LayoutText {#text} at (0,5) size 760x36 - text run at (0,5) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,5) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." - text run at (0,28) width 321: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1779.33) size 769x270 - LayoutInline {SPAN} at (0,0) size 760x238 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,16) size 760x238 - text run at (0,16) width 760: "This element should be in a sans-serif font, italicized and small caps, with a weight of" - text run at (0,70) width 40: "100. " - text run at (40,70) width 681: "Its font-size should be 150% the base font size, and its line-height should be" - text run at (0,124) width 699: "300% of that value (18px and 54px, respectively). The text should have a silver" - text run at (0,178) width 728: "background. The background color has been set on an inline element and should" - text run at (0,232) width 510: "therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,2067.33) size 769x2640 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2638 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x2610 - LayoutTableCell {TD} at (0,1319) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x2610.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 738x39 - text run at (0,0) width 531: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (531,0) width 207: "This is the \"base font size\" referred" - text run at (0,20) width 141: "to in the following tests." - LayoutBlockFlow {P} at (4,61.33) size 747x21 - LayoutText {#text} at (0,0) size 559x20 - text run at (0,0) width 559: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (4,106.33) size 747x144 - LayoutText {#text} at (0,4) size 725x135 - text run at (0,4) width 367: "This element should be in a serif font. " - text run at (367,4) width 358: "Its font-size should be 150% the base" - text run at (0,40) width 685: "font size, and its line-height should 150% of that value (18px and 27px," - text run at (0,76) width 136: "respectively). " - text run at (136,76) width 556: "Extra text is included for the purposes of testing this more" - text run at (0,112) width 107: "effectively." - LayoutBlockFlow {P} at (4,274.33) size 747x144 - LayoutText {#text} at (0,4) size 708x135 - text run at (0,4) width 471: "This element should be in a sans-serif font. " - text run at (471,4) width 237: "Its font-size should be" - text run at (0,40) width 685: "150% the base font size, and its line-height should 150% of that" - text run at (0,76) width 391: "value (18px and 27px, respectively). " - text run at (391,76) width 299: "Extra text is included for the" - text run at (0,112) width 430: "purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,442.33) size 747x80 - LayoutText {#text} at (0,4) size 726x44 - text run at (0,4) width 705: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (705,4) width 21: "For" - text run at (0,30) width 189: "example, if the font-size value " - LayoutInline {CODE} at (0,0) size 30x12 - LayoutText {#text} at (189,35) size 30x12 - text run at (189,35) width 30: "small" - LayoutText {#text} at (219,30) size 718x46 - text run at (219,30) width 359: " is calculated at 10px, then the line-height should be 20px. " - text run at (578,30) width 140: "The actual value of the" - text run at (0,58) width 167: "font-size is UA-dependent. " - text run at (167,58) width 434: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,546.33) size 747x216 - LayoutText {#text} at (0,1) size 744x213 - text run at (0,1) width 738: "This element should be in a sans-serif font, italicized" - text run at (0,37) width 516: "and small caps, with a weight of 900. " - text run at (515,37) width 169: "Its font-size" - text run at (0,73) width 744: "should be 150% the base font size, and its line-height" - text run at (0,109) width 622: "should be 150% of that value (18px and 27px," - text run at (0,145) width 198: "respectively). " - text run at (197,145) width 547: "Extra text is included for the purposes" - text run at (0,181) width 446: "of testing this more effectively." - LayoutBlockFlow {P} at (4,786.33) size 747x360 - LayoutText {#text} at (0,22) size 736x316 - text run at (0,22) width 683: "This element should be in a sans-serif font, italicized and" - text run at (0,94) width 394: "small caps, with a weight of 100. " - text run at (394,94) width 338: "Its font-size should be 150%" - text run at (0,166) width 731: "the base font size, and its line-height should be 300% of that" - text run at (0,238) width 423: "value (18px and 54px, respectively). " - text run at (422,238) width 314: "Extra text is included for" - text run at (0,310) width 550: "the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1170.33) size 747x156 - LayoutText {#text} at (0,8) size 740x140 - text run at (0,8) width 740: "This element should be in a monospace font, italicized and small caps, with a weight" - text run at (0,47) width 88: "of 900. " - text run at (88,47) width 620: "Its font-size should be 150% the base font size, and its line-height" - text run at (0,86) width 716: "should be 2em, or twice the element's font size (18px and 36px, respectively)." - text run at (0,125) width 636: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1350.33) size 747x480 - LayoutText {#text} at (0,34) size 732x412 - text run at (0,34) width 683: "This element should be in a sans-serif font, italicized and" - text run at (0,130) width 394: "small caps, with a weight of 500. " - text run at (394,130) width 338: "Its font-size should be 150%" - text run at (0,226) width 723: "the base font size, or 18px, and its line-height should be 1in." - text run at (0,322) width 728: "Extra text is included for the purposes of testing this more" - text run at (0,418) width 135: "effectively." - LayoutBlockFlow {P} at (4,1854.33) size 747x144 - LayoutText {#text} at (0,7) size 730x129 - text run at (0,7) width 730: "This element should be in a sans-serif font, oblique and not small-caps, with a weight" - text run at (0,43) width 62: "of 700. " - text run at (62,43) width 663: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 177: "element's font size). " - text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 91: "effectively." - LayoutBlockFlow {P} at (4,2016.33) size 747x62 - LayoutText {#text} at (0,7) size 742x47 - text run at (0,7) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,7) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,38) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,38) width 398: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,2102.33) size 747x504 - LayoutInline {SPAN} at (0,0) size 742x460 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,22) size 742x460 - text run at (0,22) width 683: "This element should be in a sans-serif font, italicized and" - text run at (0,94) width 394: "small caps, with a weight of 100. " - text run at (394,94) width 338: "Its font-size should be 150%" - text run at (0,166) width 731: "the base font size, and its line-height should be 300% of that" - text run at (0,238) width 695: "value (18px and 54px, respectively). The text should have a" - text run at (0,310) width 742: "silver background. The background color has been set on an" - text run at (0,382) width 737: "inline element and should therefore only cover the text, not" - text run at (0,454) width 256: "the interline spacing." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,228) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,220) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_family-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_family-expected.png deleted file mode 100644 index 2e9f43f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_family-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_family-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_family-expected.txt deleted file mode 100644 index 8a4db8e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_family-expected.txt +++ /dev/null
@@ -1,140 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1324 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1324 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1324 - LayoutBlockFlow {BODY} at (8,8) size 769x1308 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 312x144 - text run at (0,0) width 216: "DIV.a {font-family: serif;}" - text run at (216,0) width 0: " " - text run at (0,16) width 248: "DIV.b {font-family: monospace;}" - text run at (248,16) width 0: " " - text run at (0,32) width 208: ".one {font-family: serif;}" - text run at (208,32) width 0: " " - text run at (0,48) width 248: ".two {font-family: sans-serif;}" - text run at (248,48) width 0: " " - text run at (0,64) width 240: ".three {font-family: cursive;}" - text run at (240,64) width 0: " " - text run at (0,80) width 232: ".four {font-family: fantasy;}" - text run at (232,80) width 0: " " - text run at (0,96) width 248: ".five {font-family: monospace;}" - text run at (248,96) width 0: " " - text run at (0,112) width 312: ".six {font-family: sans-serif,cursive;}" - text run at (312,112) width 0: " " - text run at (0,128) width 304: ".seven {font-family: monospace,serif;}" - text run at (304,128) width 0: " " - LayoutBlockFlow {DIV} at (0,211) size 769x198 - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 599x19 - text run at (0,0) width 599: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,36) size 769x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,72) size 769x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,107) size 769x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,146) size 769x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,182) size 769x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (0,440) size 769x19 - LayoutText {#text} at (0,0) size 383x18 - text run at (0,0) width 383: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (0,475) size 769x18 - LayoutText {#text} at (0,0) size 550x18 - text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (0,524) size 769x210 - LayoutBlockFlow {P} at (0,0) size 769x32 - LayoutText {#text} at (0,0) size 768x32 - text run at (0,0) width 768: "This sentence is normal for the first division, which is the next five sentences; it should be a" - text run at (0,16) width 120: "monospace font." - LayoutBlockFlow {P} at (0,48) size 769x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,84) size 769x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,119) size 769x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,158) size 769x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,194) size 769x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutTable {TABLE} at (0,747) size 769x561 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x559 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x531 - LayoutTableCell {TD} at (0,279) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x531 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {DIV} at (4,4) size 747x198 - LayoutBlockFlow {P} at (0,0) size 747x20 - LayoutText {#text} at (0,0) size 599x19 - text run at (0,0) width 599: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,36) size 747x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,72) size 747x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,107) size 747x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,146) size 747x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,182) size 747x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (4,233) size 747x19 - LayoutText {#text} at (0,0) size 383x18 - text run at (0,0) width 383: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (4,268) size 747x18 - LayoutText {#text} at (0,0) size 550x18 - text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (4,317) size 747x210 - LayoutBlockFlow {P} at (0,0) size 747x32 - LayoutText {#text} at (0,0) size 728x32 - text run at (0,0) width 728: "This sentence is normal for the first division, which is the next five sentences; it should" - text run at (0,16) width 160: "be a monospace font." - LayoutBlockFlow {P} at (0,48) size 747x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,84) size 747x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,119) size 747x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,158) size 747x20 - LayoutText {#text} at (0,0) size 268x20 - text run at (0,0) width 268: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,194) size 747x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,430) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,422) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,517) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,509) size 769x2 [border: (1px inset #EEEEEE)] -layer at (25,999) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,215) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1086) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,302) size 747x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_size-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_size-expected.png deleted file mode 100644 index 412f79fb..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_size-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_size-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_size-expected.txt deleted file mode 100644 index 3b027f6..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_size-expected.txt +++ /dev/null
@@ -1,257 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2820 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2820 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2820.27 - LayoutBlockFlow {BODY} at (8,8) size 769x2804.27 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x320 - LayoutText {#text} at (0,0) size 224x320 - text run at (0,0) width 200: ".one {font-size: medium;}" - text run at (200,0) width 0: " " - text run at (0,16) width 200: ".two {font-size: larger;}" - text run at (200,16) width 0: " " - text run at (0,32) width 224: ".three {font-size: smaller;}" - text run at (224,32) width 0: " " - text run at (0,48) width 224: ".four {font-size: xx-small;}" - text run at (224,48) width 0: " " - text run at (0,64) width 216: ".five {font-size: x-small;}" - text run at (216,64) width 0: " " - text run at (0,80) width 192: ".six {font-size: small;}" - text run at (192,80) width 0: " " - text run at (0,96) width 208: ".seven {font-size: large;}" - text run at (208,96) width 0: " " - text run at (0,112) width 224: ".eight {font-size: x-large;}" - text run at (224,112) width 0: " " - text run at (0,128) width 224: ".nine {font-size: xx-large;}" - text run at (224,128) width 0: " " - text run at (0,144) width 176: ".a {font-size: 0.5in;}" - text run at (176,144) width 0: " " - text run at (0,160) width 160: ".b {font-size: 1cm;}" - text run at (160,160) width 0: " " - text run at (0,176) width 168: ".c {font-size: 10mm;}" - text run at (168,176) width 0: " " - text run at (0,192) width 168: ".d {font-size: 18pt;}" - text run at (168,192) width 0: " " - text run at (0,208) width 176: ".e {font-size: 1.5pc;}" - text run at (176,208) width 0: " " - text run at (0,224) width 160: ".f {font-size: 2em;}" - text run at (160,224) width 0: " " - text run at (0,240) width 160: ".g {font-size: 3ex;}" - text run at (160,240) width 0: " " - text run at (0,256) width 168: ".h {font-size: 25px;}" - text run at (168,256) width 0: " " - text run at (0,272) width 168: ".i {font-size: 200%;}" - text run at (168,272) width 0: " " - text run at (0,288) width 184: ".j {font-size: -0.5in;}" - text run at (184,288) width 0: " " - text run at (0,304) width 0: " " - LayoutBlockFlow {P} at (0,387) size 769x20 - LayoutText {#text} at (0,0) size 648x19 - text run at (0,0) width 648: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - LayoutBlockFlow {P} at (0,423) size 769x20 - LayoutText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This sentence has been set to " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (179,3) size 48x16 - text run at (179,3) width 48: "medium" - LayoutText {#text} at (227,0) size 343x19 - text run at (227,0) width 343: ", which may or may not be the same size as unstyled text." - LayoutBlockFlow {P} at (0,462.19) size 769x22 - LayoutText {#text} at (0,0) size 366x21 - text run at (0,0) width 366: "This sentence should be larger than unstyled text." - LayoutBlockFlow {P} at (0,503.38) size 769x16 - LayoutText {#text} at (0,0) size 273x15 - text run at (0,0) width 273: "This sentence should be smaller than unstyled text." - LayoutBlockFlow {P} at (0,532.70) size 769x20 - LayoutText {#text} at (0,5) size 303x12 - text run at (0,5) width 303: "This sentence should be very small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (303,0) size 47x19 - text run at (303,0) width 47: "medium" - LayoutText {#text} at (350,5) size 2x12 - text run at (350,5) width 2: "." - LayoutBlockFlow {P} at (0,562.70) size 769x20 - LayoutText {#text} at (0,5) size 328x12 - text run at (0,5) width 328: "This sentence should be rather small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (328,0) size 47x19 - text run at (328,0) width 47: "medium" - LayoutText {#text} at (375,5) size 3x12 - text run at (375,5) width 3: "." - LayoutBlockFlow {P} at (0,595.70) size 769x20 - LayoutText {#text} at (0,3) size 400x15 - text run at (0,3) width 400: "This sentence should be small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (400,0) size 47x19 - text run at (400,0) width 47: "medium" - LayoutText {#text} at (447,3) size 3x15 - text run at (447,3) width 3: "." - LayoutBlockFlow {P} at (0,633.70) size 769x21 - LayoutText {#text} at (0,0) size 534x20 - text run at (0,0) width 534: "This sentence should be large, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 48x19 - LayoutText {#text} at (533,1) size 48x19 - text run at (533,1) width 48: "medium" - LayoutText {#text} at (580,0) size 6x20 - text run at (580,0) width 6: "." - LayoutBlockFlow {P} at (0,678.70) size 769x56 - LayoutText {#text} at (0,0) size 766x27 - text run at (0,0) width 766: "This sentence should be rather large, but the last word in the sentence should be" - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (0,34) size 47x19 - text run at (0,34) width 47: "medium" - LayoutText {#text} at (47,28) size 6x27 - text run at (47,28) width 6: "." - LayoutBlockFlow {P} at (0,766.70) size 769x74 - LayoutText {#text} at (0,0) size 735x73 - text run at (0,0) width 735: "This sentence should be very large, but the last word in the" - text run at (0,37) width 242: "sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (242,50) size 47x19 - text run at (242,50) width 47: "medium" - LayoutText {#text} at (289,37) size 8x36 - text run at (289,37) width 8: "." - LayoutBlockFlow {P} at (0,888.70) size 769x57 - LayoutText {#text} at (0,1) size 763x55 - text run at (0,1) width 763: "This sentence should be half an inch tall." - LayoutBlockFlow {P} at (0,993.70) size 769x45 - LayoutText {#text} at (0,1) size 671x43 - text run at (0,1) width 671: "This sentence should be one centimeter tall." - LayoutBlockFlow {P} at (0,1076.48) size 769x45 - LayoutText {#text} at (0,1) size 678x43 - text run at (0,1) width 678: "This sentence should be ten millimeters tall." - LayoutBlockFlow {P} at (0,1159.27) size 769x28 - LayoutText {#text} at (0,0) size 422x27 - text run at (0,0) width 422: "This sentence should be eighteen points tall." - LayoutBlockFlow {P} at (0,1211.27) size 769x28 - LayoutText {#text} at (0,0) size 492x27 - text run at (0,0) width 492: "This sentence should be one and one half picas tall." - LayoutBlockFlow {P} at (0,1271.27) size 769x37 - LayoutText {#text} at (0,0) size 454x36 - text run at (0,0) width 454: "This sentence should be two em tall." - LayoutBlockFlow {P} at (0,1340.27) size 769x24 - LayoutText {#text} at (0,0) size 303x23 - text run at (0,0) width 303: "This sentence should be three ex tall." - LayoutBlockFlow {P} at (0,1389.27) size 769x30 - LayoutText {#text} at (0,0) size 467x29 - text run at (0,0) width 467: "This sentence should be twenty-five pixels tall." - LayoutBlockFlow {P} at (0,1451.27) size 769x37 - LayoutText {#text} at (0,0) size 533x36 - text run at (0,0) width 533: "This sentence should be twice normal size." - LayoutBlockFlow {P} at (0,1520.27) size 769x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." - LayoutTable {TABLE} at (0,1556.27) size 769x1248 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1246 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1218 - LayoutTableCell {TD} at (0,623) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1218.27 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 648x19 - text run at (0,0) width 648: "This paragraph element is unstyled, so the size of the font in this element is the default size for this user agent." - LayoutBlockFlow {P} at (4,40) size 747x20 - LayoutText {#text} at (0,0) size 179x19 - text run at (0,0) width 179: "This sentence has been set to " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (179,3) size 48x16 - text run at (179,3) width 48: "medium" - LayoutText {#text} at (227,0) size 343x19 - text run at (227,0) width 343: ", which may or may not be the same size as unstyled text." - LayoutBlockFlow {P} at (4,79.19) size 747x22 - LayoutText {#text} at (0,0) size 366x21 - text run at (0,0) width 366: "This sentence should be larger than unstyled text." - LayoutBlockFlow {P} at (4,120.38) size 747x16 - LayoutText {#text} at (0,0) size 273x15 - text run at (0,0) width 273: "This sentence should be smaller than unstyled text." - LayoutBlockFlow {P} at (4,149.70) size 747x20 - LayoutText {#text} at (0,5) size 303x12 - text run at (0,5) width 303: "This sentence should be very small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (303,0) size 47x19 - text run at (303,0) width 47: "medium" - LayoutText {#text} at (350,5) size 2x12 - text run at (350,5) width 2: "." - LayoutBlockFlow {P} at (4,179.70) size 747x20 - LayoutText {#text} at (0,5) size 328x12 - text run at (0,5) width 328: "This sentence should be rather small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (328,0) size 47x19 - text run at (328,0) width 47: "medium" - LayoutText {#text} at (375,5) size 3x12 - text run at (375,5) width 3: "." - LayoutBlockFlow {P} at (4,212.70) size 747x20 - LayoutText {#text} at (0,3) size 400x15 - text run at (0,3) width 400: "This sentence should be small, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (400,0) size 47x19 - text run at (400,0) width 47: "medium" - LayoutText {#text} at (447,3) size 3x15 - text run at (447,3) width 3: "." - LayoutBlockFlow {P} at (4,250.70) size 747x21 - LayoutText {#text} at (0,0) size 534x20 - text run at (0,0) width 534: "This sentence should be large, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 48x19 - LayoutText {#text} at (533,1) size 48x19 - text run at (533,1) width 48: "medium" - LayoutText {#text} at (580,0) size 6x20 - text run at (580,0) width 6: "." - LayoutBlockFlow {P} at (4,295.70) size 747x56 - LayoutText {#text} at (0,0) size 737x55 - text run at (0,0) width 737: "This sentence should be rather large, but the last word in the sentence should" - text run at (0,28) width 29: "be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (29,34) size 47x19 - text run at (29,34) width 47: "medium" - LayoutText {#text} at (76,28) size 6x27 - text run at (76,28) width 6: "." - LayoutBlockFlow {P} at (4,383.70) size 747x74 - LayoutText {#text} at (0,0) size 735x73 - text run at (0,0) width 735: "This sentence should be very large, but the last word in the" - text run at (0,37) width 242: "sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (242,50) size 47x19 - text run at (242,50) width 47: "medium" - LayoutText {#text} at (289,37) size 8x36 - text run at (289,37) width 8: "." - LayoutBlockFlow {P} at (4,505.70) size 747x114 - LayoutText {#text} at (0,1) size 681x112 - text run at (0,1) width 681: "This sentence should be half an inch" - text run at (0,58) width 70: "tall." - LayoutBlockFlow {P} at (4,667.70) size 747x45 - LayoutText {#text} at (0,1) size 671x43 - text run at (0,1) width 671: "This sentence should be one centimeter tall." - LayoutBlockFlow {P} at (4,750.48) size 747x45 - LayoutText {#text} at (0,1) size 678x43 - text run at (0,1) width 678: "This sentence should be ten millimeters tall." - LayoutBlockFlow {P} at (4,833.27) size 747x28 - LayoutText {#text} at (0,0) size 422x27 - text run at (0,0) width 422: "This sentence should be eighteen points tall." - LayoutBlockFlow {P} at (4,885.27) size 747x28 - LayoutText {#text} at (0,0) size 492x27 - text run at (0,0) width 492: "This sentence should be one and one half picas tall." - LayoutBlockFlow {P} at (4,945.27) size 747x37 - LayoutText {#text} at (0,0) size 454x36 - text run at (0,0) width 454: "This sentence should be two em tall." - LayoutBlockFlow {P} at (4,1014.27) size 747x24 - LayoutText {#text} at (0,0) size 303x23 - text run at (0,0) width 303: "This sentence should be three ex tall." - LayoutBlockFlow {P} at (4,1063.27) size 747x30 - LayoutText {#text} at (0,0) size 467x29 - text run at (0,0) width 467: "This sentence should be twenty-five pixels tall." - LayoutBlockFlow {P} at (4,1125.27) size 747x37 - LayoutText {#text} at (0,0) size 533x36 - text run at (0,0) width 533: "This sentence should be twice normal size." - LayoutBlockFlow {P} at (4,1194.27) size 747x20 - LayoutText {#text} at (0,0) size 638x19 - text run at (0,0) width 638: "This sentence should be normal size, since no negative values are allowed and therefore should be ignored." -layer at (8,377) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,369) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_style-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_style-expected.png deleted file mode 100644 index 73ed637b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_style-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_style-expected.txt deleted file mode 100644 index b6ee2140..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_style-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 248x64 - text run at (0,0) width 208: ".one {font-style: italic;}" - text run at (208,0) width 0: " " - text run at (0,16) width 216: ".two {font-style: oblique;}" - text run at (216,16) width 0: " " - text run at (0,32) width 248: ".three, I {font-style: normal;}" - text run at (248,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 - LayoutText {#text} at (0,0) size 508x19 - text run at (0,0) width 508: "This paragraph should be in italics, but the last word of the sentence should be " - LayoutInline {SPAN} at (0,0) size 42x19 - LayoutText {#text} at (507,0) size 42x19 - text run at (507,0) width 42: "normal" - LayoutText {#text} at (548,0) size 5x19 - text run at (548,0) width 5: "." - LayoutBlockFlow {P} at (0,167) size 784x20 - LayoutText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "This paragraph should be oblique." - LayoutBlockFlow {P} at (0,203) size 784x20 - LayoutInline {I} at (0,0) size 201x19 - LayoutText {#text} at (0,0) size 201x19 - text run at (0,0) width 201: "This paragraph should be normal." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,239) size 575x130 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 573x128 - LayoutTableRow {TR} at (0,0) size 573x28 - LayoutTableCell {TD} at (0,0) size 573x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 573x100 - LayoutTableCell {TD} at (0,64) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 561x100 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 553x20 - LayoutText {#text} at (0,0) size 508x19 - text run at (0,0) width 508: "This paragraph should be in italics, but the last word of the sentence should be " - LayoutInline {SPAN} at (0,0) size 42x19 - LayoutText {#text} at (507,0) size 42x19 - text run at (507,0) width 42: "normal" - LayoutText {#text} at (548,0) size 5x19 - text run at (548,0) width 5: "." - LayoutBlockFlow {P} at (4,40) size 553x20 - LayoutText {#text} at (0,0) size 219x19 - text run at (0,0) width 219: "This paragraph should be oblique." - LayoutBlockFlow {P} at (4,76) size 553x20 - LayoutInline {I} at (0,0) size 201x19 - LayoutText {#text} at (0,0) size 201x19 - text run at (0,0) width 201: "This paragraph should be normal." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_variant-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_variant-expected.png deleted file mode 100644 index 49e02b6..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_variant-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt deleted file mode 100644 index 41cec6e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 256x48 - text run at (0,0) width 256: ".one {font-variant: small-caps;}" - text run at (256,0) width 0: " " - text run at (0,16) width 224: ".two {font-variant: normal;}" - text run at (224,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x20 - LayoutText {#text} at (0,0) size 282x19 - text run at (0,0) width 282: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (0,151) size 784x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (609,0) size 47x19 - text run at (609,0) width 47: "Normal" - LayoutText {#text} at (655,0) size 5x19 - text run at (655,0) width 5: "." - LayoutTable {TABLE} at (0,187) size 682x94 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 680x92 - LayoutTableRow {TR} at (0,0) size 680x28 - LayoutTableCell {TD} at (0,0) size 680x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 680x64 - LayoutTableCell {TD} at (0,46) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 668x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 660x20 - LayoutText {#text} at (0,0) size 282x19 - text run at (0,0) width 282: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (4,40) size 660x20 - LayoutText {#text} at (0,0) size 610x19 - text run at (0,0) width 610: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 47x19 - LayoutText {#text} at (609,0) size 47x19 - text run at (609,0) width 47: "Normal" - LayoutText {#text} at (655,0) size 5x19 - text run at (655,0) width 5: "." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_weight-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_weight-expected.png deleted file mode 100644 index 9819bde..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_weight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt deleted file mode 100644 index e939c4d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/font_properties/font_weight-expected.txt +++ /dev/null
@@ -1,125 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1105 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1105 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1104.80 - LayoutBlockFlow {BODY} at (8,8) size 769x1088.80 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 240x176 - text run at (0,0) width 200: ".one {font-weight: bold;}" - text run at (200,0) width 0: " " - text run at (0,16) width 216: ".two {font-weight: bolder;}" - text run at (216,16) width 0: " " - text run at (0,32) width 240: ".three {font-weight: lighter;}" - text run at (240,32) width 0: " " - text run at (0,48) width 200: ".four {font-weight: 100;}" - text run at (200,48) width 0: " " - text run at (0,64) width 200: ".five {font-weight: 300;}" - text run at (200,64) width 0: " " - text run at (0,80) width 192: ".six {font-weight: 500;}" - text run at (192,80) width 0: " " - text run at (0,96) width 208: ".seven {font-weight: 700;}" - text run at (208,96) width 0: " " - text run at (0,112) width 208: ".eight {font-weight: 900;}" - text run at (208,112) width 0: " " - text run at (0,128) width 224: ".nine {font-weight: normal;}" - text run at (224,128) width 0: " " - text run at (0,144) width 200: "B {font-weight: lighter;}" - text run at (200,144) width 0: " " - text run at (0,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x20 - LayoutText {#text} at (0,0) size 195x19 - text run at (0,0) width 195: "This sentence should be bold." - LayoutBlockFlow {P} at (0,279) size 769x20 - LayoutText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This sentence should be bolder than normal." - LayoutBlockFlow {H4} at (0,320.27) size 769x20 - LayoutText {#text} at (0,0) size 129x19 - text run at (0,0) width 129: "This is a heading-4." - LayoutBlockFlow {H4} at (0,361.53) size 769x20 - LayoutText {#text} at (0,0) size 175x19 - text run at (0,0) width 175: "This is a bolder heading-4." - LayoutBlockFlow {P} at (0,402.80) size 769x20 - LayoutInline {B} at (0,0) size 335x19 - LayoutText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "This sentence should be normal (boldface made lighter)." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,438.80) size 769x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 100." - LayoutBlockFlow {P} at (0,474.80) size 769x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 300." - LayoutBlockFlow {P} at (0,510.80) size 769x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 500." - LayoutBlockFlow {P} at (0,546.80) size 769x20 - LayoutText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 700." - LayoutBlockFlow {P} at (0,582.80) size 769x20 - LayoutText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 900." - LayoutBlockFlow {P} at (0,618.80) size 769x20 - LayoutText {#text} at (0,0) size 484x19 - text run at (0,0) width 484: "This sentence should be bold, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 41x19 - LayoutText {#text} at (484,0) size 41x19 - text run at (484,0) width 41: "normal" - LayoutText {#text} at (525,0) size 4x19 - text run at (525,0) width 4: "." - LayoutTable {TABLE} at (0,654.80) size 551x434 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 549x432 - LayoutTableRow {TR} at (0,0) size 549x28 - LayoutTableCell {TD} at (0,0) size 549x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 549x404 - LayoutTableCell {TD} at (0,216) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 537x403.80 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 529x20 - LayoutText {#text} at (0,0) size 195x19 - text run at (0,0) width 195: "This sentence should be bold." - LayoutBlockFlow {P} at (4,40) size 529x20 - LayoutText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This sentence should be bolder than normal." - LayoutBlockFlow {H4} at (4,81.27) size 529x20 - LayoutText {#text} at (0,0) size 129x19 - text run at (0,0) width 129: "This is a heading-4." - LayoutBlockFlow {H4} at (4,122.53) size 529x20 - LayoutText {#text} at (0,0) size 175x19 - text run at (0,0) width 175: "This is a bolder heading-4." - LayoutBlockFlow {P} at (4,163.80) size 529x20 - LayoutInline {B} at (0,0) size 335x19 - LayoutText {#text} at (0,0) size 335x19 - text run at (0,0) width 335: "This sentence should be normal (boldface made lighter)." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,199.80) size 529x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 100." - LayoutBlockFlow {P} at (4,235.80) size 529x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 300." - LayoutBlockFlow {P} at (4,271.80) size 529x20 - LayoutText {#text} at (0,0) size 218x19 - text run at (0,0) width 218: "This sentence should be weight 500." - LayoutBlockFlow {P} at (4,307.80) size 529x20 - LayoutText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 700." - LayoutBlockFlow {P} at (4,343.80) size 529x20 - LayoutText {#text} at (0,0) size 238x19 - text run at (0,0) width 238: "This sentence should be weight 900." - LayoutBlockFlow {P} at (4,379.80) size 529x20 - LayoutText {#text} at (0,0) size 484x19 - text run at (0,0) width 484: "This sentence should be bold, but the last word in the sentence should be " - LayoutInline {SPAN} at (0,0) size 41x19 - LayoutText {#text} at (484,0) size 41x19 - text run at (484,0) width 41: "normal" - LayoutText {#text} at (525,0) size 4x19 - text run at (525,0) width 4: "." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt deleted file mode 100644 index 56881719..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/canvas-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (25,25) size 750x550 [bgcolor=#008000] - LayoutBlockFlow {P} at (0,0) size 750x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 750x32 - LayoutText {#text} at (0,0) size 552x32 - text run at (0,0) width 240: "HTML {background-color: aqua;}" - text run at (240,0) width 0: " " - text run at (0,16) width 552: "BODY {background-color: green; background-image: none; margin: 25px;}" - text run at (552,16) width 0: " " - LayoutBlockFlow {P} at (0,99) size 750x60 - LayoutText {#text} at (0,0) size 735x59 - text run at (0,0) width 368: "The body of this document should have a green background. " - text run at (368,0) width 367: "It also has a margin of 25 pixels, so the light blue background" - text run at (0,20) width 333: "set for the HTML element should surround the BODY. " - text run at (332,20) width 373: "If the BODY content is significantly shorter than the browser's" - text run at (0,40) width 411: "window height, then the bottom border may be larger than 25 pixels." - LayoutTable {TABLE} at (0,175) size 750x98 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 748x96 - LayoutTableRow {TR} at (0,0) size 748x28 - LayoutTableCell {TD} at (0,0) size 748x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 748x68 - LayoutTableCell {TD} at (0,48) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 736x68 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 728x60 - LayoutText {#text} at (0,0) size 718x59 - text run at (0,0) width 368: "The body of this document should have a green background. " - text run at (368,0) width 291: "It also has a margin of 25 pixels, so the light blue" - text run at (0,20) width 409: "background set for the HTML element should surround the BODY. " - text run at (408,20) width 310: "If the BODY content is significantly shorter than the" - text run at (0,40) width 474: "browser's window height, then the bottom border may be larger than 25 pixels." -layer at (25,106) size 750x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,81) size 750x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png deleted file mode 100644 index ac4b360..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt deleted file mode 100644 index 56157fac..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/floating_elements-expected.txt +++ /dev/null
@@ -1,725 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 6461 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x6461 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x6461 - LayoutBlockFlow {BODY} at (8,8) size 769x6445 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 480x144 - text run at (0,0) width 272: "HR.minor {clear: both; width: 5%;}" - text run at (272,0) width 0: " " - text run at (0,16) width 400: "HR.major {clear: both; width: 75%; margin: 1.5em;}" - text run at (400,16) width 0: " " - text run at (0,32) width 480: "DIV {border: 5px solid purple; padding: 0; margin: 0.125em;}" - text run at (480,32) width 0: " " - text run at (0,48) width 432: "P.left, P.right {width: 10em; padding: 1em; margin: 0;" - text run at (432,48) width 0: " " - text run at (0,64) width 424: " border: 1px solid lime; background-color: silver;}" - text run at (424,64) width 0: " " - text run at (0,80) width 456: "IMG.left, IMG.right {margin: 0; border: 3px solid black;}" - text run at (456,80) width 0: " " - text run at (0,96) width 160: ".left {float: left;}" - text run at (160,96) width 0: " " - text run at (0,112) width 176: ".right {float: right;}" - text run at (176,112) width 0: " " - text run at (0,128) width 0: " " - LayoutBlockFlow {P} at (0,211) size 769x40 - LayoutText {#text} at (0,0) size 731x39 - text run at (0,0) width 645: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (645,0) width 86: "Other than the" - text run at (0,20) width 690: "substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." - LayoutBlockFlow {DIV} at (2,301) size 765x90 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutBlockFlow (floating) {P} at (566,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (199,5) size 358x79 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 190: "The floating elements within this" - text run at (199,25) width 358: "DIV should not go beyond the left or right inner edge of this" - text run at (199,45) width 350: "DIV, which means that the borders of the floating elements" - text run at (199,65) width 324: "should not overlap the top or side borders of the DIV." - LayoutBlockFlow {DIV} at (2,410) size 765x50 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 702x39 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 541: "The floating images within this DIV should not go beyond the left or right inner edge of this" - text run at (20,25) width 667: "DIV, which means that the borders of the floating images should not overlap the top or side borders of the DIV." - LayoutBlockFlow {DIV} at (2,510) size 442x230 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 157x39 - text run at (17,17) width 157: "This is the first left-floating" - text run at (17,37) width 65: "paragraph." - LayoutBlockFlow (floating) {P} at (199,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 135x39 - text run at (17,17) width 135: "This is the second left-" - text run at (17,37) width 112: "floating paragraph." - LayoutBlockFlow (floating) {P} at (5,79) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 119x39 - text run at (17,17) width 119: "This is the third left-" - text run at (17,37) width 112: "floating paragraph." - LayoutText {#text} at (393,5) size 426x219 - text run at (393,5) width 38: "This is" - text run at (393,25) width 22: "text" - text run at (393,45) width 35: "within" - text run at (393,65) width 18: "the" - text run at (199,85) width 33: "DIV. " - text run at (231,85) width 190: "The floating elements within this" - text run at (199,105) width 222: "DIV should not go beyond the left or" - text run at (199,125) width 204: "right inner edge of this DIV, which" - text run at (199,145) width 222: "means that the borders of the floating" - text run at (5,165) width 417: "elements should not overlap the top or side borders of the DIV in any" - text run at (5,185) width 32: "way. " - text run at (36,185) width 288: "In addition, they should not overlap each other. " - text run at (323,185) width 77: "The first two" - text run at (5,205) width 414: "should be side by side, whereas the third should be on the next \"line.\"" - LayoutBlockFlow {DIV} at (2,758) size 360x210 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - LayoutText {#text} at (317,5) size 350x199 - text run at (317,5) width 38: "This is" - text run at (317,25) width 22: "text" - text run at (161,45) width 94: "within the DIV. " - text run at (254,45) width 71: "The floating" - text run at (161,65) width 178: "images within this DIV should" - text run at (5,85) width 317: "not go beyond the left or right inner edge of this DIV," - text run at (5,105) width 349: "which means that the borders of the floating images should" - text run at (5,125) width 350: "not overlap the top or side borders of the DIV in any way." - text run at (5,145) width 287: "In addition, they should not overlap each other. " - text run at (291,145) width 50: "The first" - text run at (5,165) width 333: "two should be side by side, whereas the third should be" - text run at (5,185) width 104: "on the next \"line.\"" - LayoutBlockFlow {DIV} at (2,1018) size 314x364 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutBlockFlow (floating) {P} at (115,79) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (199,5) size 303x353 - text run at (199,5) width 103: "This is text within" - text run at (199,25) width 55: "the DIV. " - text run at (253,25) width 24: "The" - text run at (199,45) width 99: "floating elements" - text run at (5,79) width 90: "within this DIV" - text run at (5,99) width 81: "should not go" - text run at (5,119) width 106: "beyond the left or" - text run at (5,139) width 108: "right inner edge of" - text run at (5,159) width 92: "this DIV, which" - text run at (5,179) width 278: "means that the borders of the floating elements" - text run at (5,199) width 291: "should not overlap the top or side borders of the" - text run at (5,219) width 102: "DIV in any way. " - text run at (106,219) width 164: "In addition, they should not" - text run at (5,239) width 272: "overlap each other in any way, nor should the" - text run at (5,259) width 290: "floated elements be overwritten by the DIV text." - text run at (5,279) width 276: "In addition, the floated elements should not be" - text run at (5,299) width 303: "side-by-side, but instead the first should be floated" - text run at (5,319) width 293: "left, and the second floated to the right below the" - text run at (5,339) width 26: "first." - LayoutBlockFlow {DIV} at (2,1400) size 410x226 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - LayoutText {#text} at (261,5) size 399x215 - text run at (261,5) width 125: "This is text within the" - text run at (5,41) width 33: "DIV. " - text run at (37,41) width 71: "The floating" - text run at (5,61) width 135: "images within this DIV" - text run at (5,81) width 399: "should not go beyond the left or right inner edge of this DIV, which" - text run at (5,101) width 382: "means that the borders of the floating images should not overlap" - text run at (5,121) width 282: "the top or side borders of the DIV in any way. " - text run at (286,121) width 98: "In addition, they" - text run at (5,141) width 383: "should not overlap each other in any way, nor should the floated" - text run at (5,161) width 249: "elements be overwritten by the DIV text. " - text run at (254,161) width 135: "In addition, the floated" - text run at (5,181) width 388: "images should not be side-by-side, but instead the first should be" - text run at (5,201) width 368: "floated left, and the second floated to the right below the first." - LayoutBlockFlow {DIV} at (2,1676) size 765x130 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (566,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 127x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (199,5) size 745x119 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 190: "The floating elements within this" - text run at (199,25) width 347: "DIV should not go beyond the top side of this DIV, which" - text run at (199,45) width 344: "means that the borders of the floating elements should not" - text run at (199,65) width 331: "overlap the top or side borders of the DIV in any way. " - text run at (529,65) width 13: "In" - text run at (199,85) width 551: "addition, the top of the left-floating box should not be higher than the top of the right-floating" - text run at (5,105) width 27: "box." - LayoutBlockFlow {DIV} at (2,1824) size 765x70 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (745,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 706x59 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 530: "The floating images within this DIV should not go beyond the top side of this DIV, which" - text run at (20,25) width 668: "means that the borders of the floating images should not overlap the top or side borders of the DIV in any way. " - text run at (687,25) width 13: "In" - text run at (5,45) width 606: "addition, the top of the left-floating image should not be higher than the top of the right-floating image." - LayoutBlockFlow {DIV} at (2,1944) size 765x130 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 170x19 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutText {#text} at (368,5) size 544x39 - text run at (368,5) width 375: " The floating elements within this DIV should not go any higher" - text run at (199,25) width 407: "than the line-box containing the inline content which precedes them. " - text run at (606,25) width 12: "* " - LayoutBlockFlow (floating) {P} at (566,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (618,25) size 752x99 - text run at (618,25) width 139: "This means that the top" - text run at (199,45) width 359: "side of each float can be, at most, as high as the top edge of" - text run at (199,65) width 326: "the inline element containing the content just before the" - text run at (5,85) width 225: "floating elements occur in the source. " - text run at (230,85) width 313: "In order to mark these points clearly, an asterisk has" - text run at (5,105) width 279: "been inserted just before each floated element." - LayoutBlockFlow {DIV} at (2,2093) size 765x90 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 170x19 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (189,5) size 723x39 - text run at (189,5) width 554: " The floating images within this DIV should not go any higher than the line-box containing the" - text run at (20,25) width 217: "inline content which precedes them. " - text run at (237,25) width 12: "* " - LayoutImage (floating) {IMG} at (745,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (249,25) size 735x59 - text run at (249,25) width 486: "This means that the top side of each float can be, at most, as high as the top edge" - text run at (5,45) width 560: "of the inline element containing the content just before the floating images occur in the source. " - text run at (565,45) width 175: "In order to mark these points" - text run at (5,65) width 406: "clearly, an asterisk has been inserted just before each floated image." - LayoutBlockFlow {DIV} at (2,2233) size 765x230 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 170x19 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutText {#text} at (368,5) size 544x39 - text run at (368,5) width 375: " The floating elements within this DIV should not go any higher" - text run at (199,25) width 407: "than the line-box containing the inline content which precedes them. " - text run at (606,25) width 12: "* " - LayoutBlockFlow (floating) {P} at (566,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (618,25) size 364x39 - text run at (618,25) width 139: "This means that the top" - text run at (393,45) width 158: "side of each float can be,*" - LayoutBlockFlow (floating) {P} at (199,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 111: "paragraph (third in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (551,45) size 367x119 - text run at (551,45) width 15: " at" - text run at (393,65) width 141: "most, as high as the top" - text run at (393,85) width 151: "edge of the inline element" - text run at (393,105) width 155: "containing the content just" - text run at (393,125) width 164: "before the floating elements" - text run at (199,145) width 122: "occur in the source. " - text run at (321,145) width 8: "*" - LayoutBlockFlow (floating) {P} at (5,145) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 119: "paragraph (fourth in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (329,145) size 556x79 - text run at (329,145) width 426: " In order to mark these points clearly, an asterisk has been inserted just" - text run at (199,165) width 174: "before each floated element. " - text run at (373,165) width 379: "If a line has room for a floated element, then the element should" - text run at (199,185) width 517: "float so that its top is aligned with the top of the line-box in which the asterisk appears." - text run at (199,205) width 380: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (2,2482) size 765x130 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 170x19 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (189,5) size 708x39 - text run at (189,5) width 554: " The floating images within this DIV should not go any higher than the line-box containing the" - text run at (35,25) width 217: "inline content which precedes them. " - text run at (252,25) width 12: "* " - LayoutImage (floating) {IMG} at (745,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (264,25) size 305x19 - text run at (264,25) width 297: "This means that the top side of each float can be, " - text run at (561,25) width 8: "*" - LayoutImage (floating) {IMG} at (20,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (569,25) size 679x39 - text run at (569,25) width 160: " at most, as high as the top" - text run at (50,45) width 593: "edge of the inline element containing the content just before the floating images occur in the source. " - text run at (643,45) width 8: "*" - LayoutImage (floating) {IMG} at (35,45) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (651,45) size 746x79 - text run at (651,45) width 69: " In order to" - text run at (50,65) width 520: "mark these points clearly, an asterisk has been inserted just before each floated image. " - text run at (569,65) width 182: "If a line has room for a floated" - text run at (5,85) width 693: "image, then the image should float so that its top is aligned with the top of the line-box in which the asterisk appears." - text run at (5,105) width 380: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (2,2662) size 490x310 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 50x19 - text run at (199,5) width 50: "This is *" - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutText {#text} at (249,5) size 12x19 - text run at (249,5) width 12: " *" - LayoutBlockFlow (floating) {P} at (291,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (261,5) size 478x299 - text run at (261,5) width 26: " text" - text run at (199,25) width 90: "within the DIV." - text run at (199,45) width 83: "Under CSS1," - text run at (199,65) width 87: "the left floating" - text run at (5,85) width 249: "element should be placed in the upper left" - text run at (5,105) width 446: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,125) width 184: "border of the floating element. " - text run at (189,125) width 265: "Similarly, the right floating element should be" - text run at (5,145) width 463: "placed in the upper right corner of the DIV, and the purple border of the DIV" - text run at (5,165) width 434: "should abut the green border of the floating element. The text of the DIV" - text run at (5,185) width 448: "element should flow between and under the two floating elements. The two" - text run at (5,205) width 434: "asterisk characters mark the insertion points of the floating elements. It is" - text run at (5,225) width 460: "expected that, under future specifications, it may be acceptable for the top of" - text run at (5,245) width 478: "floated elements to align with the top of the line-box following the insertion point" - text run at (5,265) width 456: "of the floated element to avoid floating elements appearing before text which" - text run at (5,285) width 213: "precedes it in the source document." - LayoutBlockFlow {DIV} at (2,2990) size 490x230 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 50x19 - text run at (20,5) width 50: "This is *" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (70,5) size 12x19 - text run at (70,5) width 12: " *" - LayoutImage (floating) {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (82,5) size 479x219 - text run at (82,5) width 124: " text within the DIV. " - text run at (205,5) width 257: "Under CSS1, the left floating image should" - text run at (20,25) width 443: "be placed in the upper left corner of the DIV, and the purple border of the" - text run at (5,45) width 336: "DIV should abut the green border of the floating image. " - text run at (341,45) width 106: "Similarly, the right" - text run at (5,65) width 455: "floating image should be placed in the upper right corner of the DIV, and the" - text run at (5,85) width 457: "purple border of the DIV should abut the green border of the floating image." - text run at (5,105) width 456: "The text of the DIV element should flow between and under the two floating" - text run at (5,125) width 445: "image. The two asterisk characters mark the insertion points of the floating" - text run at (5,145) width 43: "image. " - text run at (48,145) width 424: "It is expected that, under future specifications, it may be acceptable for" - text run at (5,165) width 452: "the top of floated elements to align with the top of the line-box following the" - text run at (5,185) width 479: "insertion point of the floated element to avoid floating elements appearing before" - text run at (5,205) width 278: "text which precedes it in the source document." - LayoutTable {TABLE} at (0,3270) size 769x3175 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x3173 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x3145 - LayoutTableCell {TD} at (0,1586) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x3145 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 731x39 - text run at (0,0) width 645: "On this test page, each test is performed once with floating paragraphs, and then again with floating images. " - text run at (645,0) width 86: "Other than the" - text run at (0,20) width 690: "substitution of images for pargraphs, the structure of the test is exactly the same, including the direction of the floats." - LayoutBlockFlow {DIV} at (6,94) size 743x110 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutBlockFlow (floating) {P} at (544,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (199,5) size 536x99 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 166: "The floating elements within" - text run at (199,25) width 342: "this DIV should not go beyond the left or right inner edge" - text run at (199,45) width 334: "of this DIV, which means that the borders of the floating" - text run at (199,65) width 325: "elements should not overlap the top or side borders of" - text run at (5,85) width 51: "the DIV." - LayoutBlockFlow {DIV} at (6,222) size 743x50 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 702x39 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 541: "The floating images within this DIV should not go beyond the left or right inner edge of this" - text run at (20,25) width 667: "DIV, which means that the borders of the floating images should not overlap the top or side borders of the DIV." - LayoutBlockFlow {DIV} at (6,322) size 442x230 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 157x39 - text run at (17,17) width 157: "This is the first left-floating" - text run at (17,37) width 65: "paragraph." - LayoutBlockFlow (floating) {P} at (199,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 135x39 - text run at (17,17) width 135: "This is the second left-" - text run at (17,37) width 112: "floating paragraph." - LayoutBlockFlow (floating) {P} at (5,79) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 119x39 - text run at (17,17) width 119: "This is the third left-" - text run at (17,37) width 112: "floating paragraph." - LayoutText {#text} at (393,5) size 426x219 - text run at (393,5) width 38: "This is" - text run at (393,25) width 22: "text" - text run at (393,45) width 35: "within" - text run at (393,65) width 18: "the" - text run at (199,85) width 33: "DIV. " - text run at (231,85) width 190: "The floating elements within this" - text run at (199,105) width 222: "DIV should not go beyond the left or" - text run at (199,125) width 204: "right inner edge of this DIV, which" - text run at (199,145) width 222: "means that the borders of the floating" - text run at (5,165) width 417: "elements should not overlap the top or side borders of the DIV in any" - text run at (5,185) width 32: "way. " - text run at (36,185) width 288: "In addition, they should not overlap each other. " - text run at (323,185) width 77: "The first two" - text run at (5,205) width 414: "should be side by side, whereas the third should be on the next \"line.\"" - LayoutBlockFlow {DIV} at (6,570) size 360x210 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (161,5) size 156x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (5,41) size 156x36 [border: (3px solid #000000)] - LayoutText {#text} at (317,5) size 350x199 - text run at (317,5) width 38: "This is" - text run at (317,25) width 22: "text" - text run at (161,45) width 94: "within the DIV. " - text run at (254,45) width 71: "The floating" - text run at (161,65) width 178: "images within this DIV should" - text run at (5,85) width 317: "not go beyond the left or right inner edge of this DIV," - text run at (5,105) width 349: "which means that the borders of the floating images should" - text run at (5,125) width 350: "not overlap the top or side borders of the DIV in any way." - text run at (5,145) width 287: "In addition, they should not overlap each other. " - text run at (291,145) width 50: "The first" - text run at (5,165) width 333: "two should be side by side, whereas the third should be" - text run at (5,185) width 104: "on the next \"line.\"" - LayoutBlockFlow {DIV} at (6,830) size 314x364 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutBlockFlow (floating) {P} at (115,79) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (199,5) size 303x353 - text run at (199,5) width 103: "This is text within" - text run at (199,25) width 55: "the DIV. " - text run at (253,25) width 24: "The" - text run at (199,45) width 99: "floating elements" - text run at (5,79) width 90: "within this DIV" - text run at (5,99) width 81: "should not go" - text run at (5,119) width 106: "beyond the left or" - text run at (5,139) width 108: "right inner edge of" - text run at (5,159) width 92: "this DIV, which" - text run at (5,179) width 278: "means that the borders of the floating elements" - text run at (5,199) width 291: "should not overlap the top or side borders of the" - text run at (5,219) width 102: "DIV in any way. " - text run at (106,219) width 164: "In addition, they should not" - text run at (5,239) width 272: "overlap each other in any way, nor should the" - text run at (5,259) width 290: "floated elements be overwritten by the DIV text." - text run at (5,279) width 276: "In addition, the floated elements should not be" - text run at (5,299) width 303: "side-by-side, but instead the first should be floated" - text run at (5,319) width 293: "left, and the second floated to the right below the" - text run at (5,339) width 26: "first." - LayoutBlockFlow {DIV} at (6,1212) size 410x226 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 256x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (149,41) size 256x36 [border: (3px solid #000000)] - LayoutText {#text} at (261,5) size 399x215 - text run at (261,5) width 125: "This is text within the" - text run at (5,41) width 33: "DIV. " - text run at (37,41) width 71: "The floating" - text run at (5,61) width 135: "images within this DIV" - text run at (5,81) width 399: "should not go beyond the left or right inner edge of this DIV, which" - text run at (5,101) width 382: "means that the borders of the floating images should not overlap" - text run at (5,121) width 282: "the top or side borders of the DIV in any way. " - text run at (286,121) width 98: "In addition, they" - text run at (5,141) width 383: "should not overlap each other in any way, nor should the floated" - text run at (5,161) width 249: "elements be overwritten by the DIV text. " - text run at (254,161) width 135: "In addition, the floated" - text run at (5,181) width 388: "images should not be side-by-side, but instead the first should be" - text run at (5,201) width 368: "floated left, and the second floated to the right below the first." - LayoutBlockFlow {DIV} at (6,1488) size 743x130 [border: (5px solid #800080)] - LayoutBlockFlow (floating) {P} at (544,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutBlockFlow (floating) {P} at (5,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 127x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (199,5) size 717x119 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 166: "The floating elements within" - text run at (199,25) width 332: "this DIV should not go beyond the top side of this DIV," - text run at (199,45) width 317: "which means that the borders of the floating elements" - text run at (199,65) width 336: "should not overlap the top or side borders of the DIV in" - text run at (199,85) width 57: "any way. " - text run at (255,85) width 467: "In addition, the top of the left-floating box should not be higher than the top of" - text run at (5,105) width 128: "the right-floating box." - LayoutBlockFlow {DIV} at (6,1636) size 743x70 [border: (5px solid #800080)] - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutImage (floating) {IMG} at (723,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (20,5) size 706x59 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 530: "The floating images within this DIV should not go beyond the top side of this DIV, which" - text run at (20,25) width 668: "means that the borders of the floating images should not overlap the top or side borders of the DIV in any way. " - text run at (687,25) width 13: "In" - text run at (5,45) width 606: "addition, the top of the left-floating image should not be higher than the top of the right-floating image." - LayoutBlockFlow {DIV} at (6,1756) size 743x130 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 170x19 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutText {#text} at (368,5) size 504x39 - text run at (368,5) width 335: " The floating elements within this DIV should not go any" - text run at (199,25) width 447: "higher than the line-box containing the inline content which precedes them. " - text run at (646,25) width 12: "* " - LayoutBlockFlow (floating) {P} at (544,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (658,25) size 720x99 - text run at (658,25) width 67: "This means" - text run at (199,45) width 336: "that the top side of each float can be, at most, as high as" - text run at (199,65) width 331: "the top edge of the inline element containing the content" - text run at (5,85) width 315: "just before the floating elements occur in the source. " - text run at (320,85) width 221: "In order to mark these points clearly," - text run at (5,105) width 371: "an asterisk has been inserted just before each floated element." - LayoutBlockFlow {DIV} at (6,1905) size 743x90 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 170x19 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (189,5) size 701x39 - text run at (189,5) width 532: " The floating images within this DIV should not go any higher than the line-box containing" - text run at (20,25) width 239: "the inline content which precedes them. " - text run at (259,25) width 12: "* " - LayoutImage (floating) {IMG} at (723,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (271,25) size 717x59 - text run at (271,25) width 429: "This means that the top side of each float can be, at most, as high as the" - text run at (5,45) width 617: "top edge of the inline element containing the content just before the floating images occur in the source. " - text run at (622,45) width 100: "In order to mark" - text run at (5,65) width 481: "these points clearly, an asterisk has been inserted just before each floated image." - LayoutBlockFlow {DIV} at (6,2045) size 743x290 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 170x19 - text run at (199,5) width 162: "This is text within the DIV. " - text run at (360,5) width 9: "*" - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutText {#text} at (368,5) size 504x39 - text run at (368,5) width 335: " The floating elements within this DIV should not go any" - text run at (199,25) width 447: "higher than the line-box containing the inline content which precedes them. " - text run at (646,25) width 12: "* " - LayoutBlockFlow (floating) {P} at (544,45) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (658,25) size 526x39 - text run at (658,25) width 67: "This means" - text run at (199,45) width 230: "that the top side of each float can be,*" - LayoutBlockFlow (floating) {P} at (199,65) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 111: "paragraph (third in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (429,45) size 272x119 - text run at (429,45) width 114: " at most, as high as" - text run at (393,65) width 147: "the top edge of the inline" - text run at (393,85) width 132: "element containing the" - text run at (393,105) width 134: "content just before the" - text run at (393,125) width 151: "floating elements occur in" - text run at (587,145) width 70: "the source. " - text run at (657,145) width 8: "*" - LayoutBlockFlow (floating) {P} at (393,145) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 120x59 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 119: "paragraph (fourth in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (665,145) size 733x139 - text run at (665,145) width 69: " In order to" - text run at (587,165) width 106: "mark these points" - text run at (587,185) width 134: "clearly, an asterisk has" - text run at (587,205) width 148: "been inserted just before" - text run at (587,225) width 131: "each floated element. " - text run at (718,225) width 20: "If a" - text run at (5,245) width 709: "line has room for a floated element, then the element should float so that its top is aligned with the top of the line-box in" - text run at (5,265) width 167: "which the asterisk appears. " - text run at (172,265) width 380: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (6,2353) size 743x130 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 170x19 - text run at (20,5) width 162: "This is text within the DIV. " - text run at (181,5) width 9: "*" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (189,5) size 686x39 - text run at (189,5) width 532: " The floating images within this DIV should not go any higher than the line-box containing" - text run at (35,25) width 239: "the inline content which precedes them. " - text run at (274,25) width 12: "* " - LayoutImage (floating) {IMG} at (723,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (286,25) size 305x19 - text run at (286,25) width 297: "This means that the top side of each float can be, " - text run at (583,25) width 8: "*" - LayoutImage (floating) {IMG} at (20,25) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (591,25) size 655x39 - text run at (591,25) width 114: " at most, as high as" - text run at (50,45) width 639: "the top edge of the inline element containing the content just before the floating images occur in the source. " - text run at (689,45) width 8: "*" - LayoutImage (floating) {IMG} at (35,45) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (697,45) size 722x79 - text run at (697,45) width 16: " In" - text run at (50,65) width 573: "order to mark these points clearly, an asterisk has been inserted just before each floated image. " - text run at (622,65) width 105: "If a line has room" - text run at (5,85) width 714: "for a floated image, then the image should float so that its top is aligned with the top of the line-box in which the asterisk" - text run at (5,105) width 56: "appears. " - text run at (61,105) width 380: "Otherwise, its top should align with the top of the next line-box." - LayoutBlockFlow {DIV} at (6,2533) size 490x310 [border: (5px solid #800080)] - LayoutText {#text} at (199,5) size 50x19 - text run at (199,5) width 50: "This is *" - LayoutBlockFlow (floating) {P} at (5,5) size 194x74 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 159x39 - text run at (17,17) width 120: "This is a left-floating" - text run at (17,37) width 159: "paragraph (first in source)." - LayoutText {#text} at (249,5) size 12x19 - text run at (249,5) width 12: " *" - LayoutBlockFlow (floating) {P} at (291,5) size 194x94 [bgcolor=#C0C0C0] [border: (1px solid #00FF00)] - LayoutText {#text} at (17,17) size 128x59 - text run at (17,17) width 128: "This is a right-floating" - text run at (17,37) width 127: "paragraph (second in" - text run at (17,57) width 49: "source)." - LayoutText {#text} at (261,5) size 478x299 - text run at (261,5) width 26: " text" - text run at (199,25) width 90: "within the DIV." - text run at (199,45) width 83: "Under CSS1," - text run at (199,65) width 87: "the left floating" - text run at (5,85) width 249: "element should be placed in the upper left" - text run at (5,105) width 446: "corner of the DIV, and the purple border of the DIV should abut the green" - text run at (5,125) width 184: "border of the floating element. " - text run at (189,125) width 265: "Similarly, the right floating element should be" - text run at (5,145) width 463: "placed in the upper right corner of the DIV, and the purple border of the DIV" - text run at (5,165) width 434: "should abut the green border of the floating element. The text of the DIV" - text run at (5,185) width 448: "element should flow between and under the two floating elements. The two" - text run at (5,205) width 434: "asterisk characters mark the insertion points of the floating elements. It is" - text run at (5,225) width 460: "expected that, under future specifications, it may be acceptable for the top of" - text run at (5,245) width 478: "floated elements to align with the top of the line-box following the insertion point" - text run at (5,265) width 456: "of the floated element to avoid floating elements appearing before text which" - text run at (5,285) width 213: "precedes it in the source document." - LayoutBlockFlow {DIV} at (6,2861) size 490x230 [border: (5px solid #800080)] - LayoutText {#text} at (20,5) size 50x19 - text run at (20,5) width 50: "This is *" - LayoutImage (floating) {IMG} at (5,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (70,5) size 12x19 - text run at (70,5) width 12: " *" - LayoutImage (floating) {IMG} at (470,5) size 15x36 [border: (3px solid #000000)] - LayoutText {#text} at (82,5) size 479x219 - text run at (82,5) width 124: " text within the DIV. " - text run at (205,5) width 257: "Under CSS1, the left floating image should" - text run at (20,25) width 443: "be placed in the upper left corner of the DIV, and the purple border of the" - text run at (5,45) width 336: "DIV should abut the green border of the floating image. " - text run at (341,45) width 106: "Similarly, the right" - text run at (5,65) width 455: "floating image should be placed in the upper right corner of the DIV, and the" - text run at (5,85) width 457: "purple border of the DIV should abut the green border of the floating image." - text run at (5,105) width 456: "The text of the DIV element should flow between and under the two floating" - text run at (5,125) width 445: "image. The two asterisk characters mark the insertion points of the floating" - text run at (5,145) width 43: "image. " - text run at (48,145) width 424: "It is expected that, under future specifications, it may be acceptable for" - text run at (5,165) width 452: "the top of floated elements to align with the top of the line-box following the" - text run at (5,185) width 479: "insertion point of the floated element to avoid floating elements appearing before" - text run at (5,205) width 278: "text which precedes it in the source document." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)] -layer at (32,283) size 579x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,275) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,408) size 41x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,400) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,492) size 579x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,484) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,756) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,748) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1000) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,992) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,1398) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,1390) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1658) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,1650) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,1822) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,1814) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,1926) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,1918) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2091) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2083) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,2215) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,2207) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2480) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2472) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,2644) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,2636) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (372,2988) size 41x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (364.28,2980) size 40.44x2 [border: (1px inset #EEEEEE)] -layer at (32,3252) size 579x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (24,3244) size 578.75x2 [border: (1px inset #EEEEEE)] -layer at (49,3375) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,68) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,3519) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,212) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,3603) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,296) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,3867) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,560) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,4111) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,804) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,4509) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1202) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,4769) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,1462) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,4933) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1626) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5037) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,1730) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,5202) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,1895) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5326) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,2019) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,5650) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,2343) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,5814) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,2507) size 562.25x2 [border: (1px inset #EEEEEE)] -layer at (379,6158) size 39x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (357.83,2851) size 39.34x2 [border: (1px inset #EEEEEE)] -layer at (49,6422) size 562x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (28,3115) size 562.25x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png deleted file mode 100644 index 933b998..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt deleted file mode 100644 index caae818..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/height_of_lines-expected.txt +++ /dev/null
@@ -1,135 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2345 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2345 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2345 - LayoutBlockFlow {BODY} at (8,8) size 769x2329 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x288 - LayoutText {#text} at (0,0) size 536x288 - text run at (0,0) width 344: "P.one {font-size: 14px; line-height: 20px;}" - text run at (344,0) width 0: " " - text run at (0,16) width 304: "IMG.onea {vertical-align: text-bottom;" - text run at (304,16) width 0: " " - text run at (0,32) width 272: " width: 200px; height: 200px;}" - text run at (272,32) width 0: " " - text run at (0,48) width 520: "IMG.oneb {vertical-align: text-top; width: 200px; height: 200px;}" - text run at (520,48) width 0: " " - text run at (0,64) width 0: " " - text run at (0,80) width 344: "P.two {font-size: 14px; line-height: 20px;}" - text run at (344,80) width 0: " " - text run at (0,96) width 536: "IMG.twoa {vertical-align: text-bottom; width: 100px; height: 100px;" - text run at (536,96) width 0: " " - text run at (0,112) width 312: " padding: 5px; border-style: solid;" - text run at (312,112) width 0: " " - text run at (0,128) width 312: " border-width: 10px; margin: 15px;}" - text run at (312,128) width 0: " " - text run at (0,144) width 280: "IMG.twob {vertical-align: text-top;" - text run at (280,144) width 0: " " - text run at (0,160) width 304: " width: 100px; height: 100px;" - text run at (304,160) width 0: " " - text run at (0,176) width 312: " padding: 5px; border-style: solid;" - text run at (312,176) width 0: " " - text run at (0,192) width 312: " border-width: 10px; margin: 15px;}" - text run at (312,192) width 0: " " - text run at (0,208) width 0: " " - text run at (0,224) width 480: "IMG.twoc {vertical-align: middle; width: 50px; height: 50px;" - text run at (480,224) width 0: " " - text run at (0,240) width 312: " padding: 5px; border-style: solid;" - text run at (312,240) width 0: " " - text run at (0,256) width 320: " border-width: 10px; margin: -10px;}" - text run at (320,256) width 0: " " - text run at (0,272) width 0: " " - LayoutBlockFlow {P} at (0,353) size 769x464 - LayoutText {#text} at (0,2) size 763x238 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 346: "This means that the lines of text within it should be separated" - text run at (0,22) width 371: "by six pixels, three of which are part of the line-box of each line. " - text run at (371,22) width 373: "Any images within the paragraph should increase the height of the" - text run at (0,224) width 294: "line-box so that they fit within the line box, such as " - LayoutImage {IMG} at (294,40) size 200x200 - LayoutText {#text} at (494,224) size 28x16 - text run at (494,224) width 28: " and " - LayoutImage {IMG} at (522,224) size 200x200 - LayoutText {#text} at (722,224) size 768x238 - text run at (722,224) width 8: ". " - text run at (730,224) width 38: "This is" - text run at (0,426) width 725: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top" - text run at (0,446) width 43: "aligned." - LayoutBlockFlow {P} at (0,831) size 769x484 - LayoutText {#text} at (0,2) size 763x198 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 346: "This means that the lines of text within it should be separated" - text run at (0,22) width 78: "by six pixels. " - text run at (78,22) width 683: "Any images within the paragraph should increase the height of the line-box so that they fit, including their padding (5px)," - text run at (0,184) width 357: "border (10px) and margins (15px) within the line box, such as " - LayoutImage {IMG} at (371.73,55) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (516,184) size 29x16 - text run at (516,184) width 29: " and " - LayoutImage {IMG} at (559.73,199) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (704,184) size 768x256 - text run at (704,184) width 9: ". " - text run at (712,184) width 39: "This is" - text run at (0,346) width 725: "additional text to make sure that there is enough room left below the image so that this line does not hit the image that is text-top" - text run at (0,366) width 47: "aligned. " - text run at (47,366) width 700: "It is the outer edge of the margin that should be text-bottom and text-top aligned in this paragraph, so for the first image the" - text run at (0,386) width 768: "bottom border of the image should begin 15px above the bottom of the text, and for the second image the top border should begin 15px" - text run at (0,424) width 143: "below the top of the text " - LayoutImage {IMG} at (133,394) size 80x80 [border: (10px solid #000000)] - LayoutText {#text} at (203,424) size 764x58 - text run at (203,424) width 8: ". " - text run at (211,424) width 553: "The last image in this paragraph has -10px margins set on it, so that should pull the text in toward" - text run at (0,466) width 392: "the image in the vertical direction, and also in the horizontal direction." - LayoutTable {TABLE} at (0,1329) size 769x1000 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x998 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x970 - LayoutTableCell {TD} at (0,499) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x970 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x464 - LayoutText {#text} at (0,2) size 726x238 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 289: "This means that the lines of text within it should be" - text run at (0,22) width 428: "separated by six pixels, three of which are part of the line-box of each line. " - text run at (428,22) width 298: "Any images within the paragraph should increase the" - text run at (0,224) width 369: "height of the line-box so that they fit within the line box, such as " - LayoutImage {IMG} at (369,40) size 200x200 - LayoutText {#text} at (569,224) size 28x16 - text run at (569,224) width 28: " and " - LayoutImage {IMG} at (0,244) size 200x200 - LayoutText {#text} at (200,244) size 738x218 - text run at (200,244) width 8: ". " - text run at (208,244) width 530: "This is additional text to make sure that there is enough room left below the image so that this" - text run at (0,446) width 280: "line does not hit the image that is text-top aligned." - LayoutBlockFlow {P} at (4,482) size 747x484 - LayoutText {#text} at (0,2) size 731x198 - text run at (0,2) width 417: "This paragraph should have a font size of 14px and a line height of 20px. " - text run at (417,2) width 289: "This means that the lines of text within it should be" - text run at (0,22) width 135: "separated by six pixels. " - text run at (135,22) width 596: "Any images within the paragraph should increase the height of the line-box so that they fit, including their" - text run at (0,184) width 444: "padding (5px), border (10px) and margins (15px) within the line box, such as " - LayoutImage {IMG} at (458.73,55) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (603,184) size 29x16 - text run at (603,184) width 29: " and " - LayoutImage {IMG} at (15,219) size 130x130 [border: (10px solid #000000)] - LayoutText {#text} at (160,204) size 729x236 - text run at (160,204) width 8: ". " - text run at (168,204) width 553: "This is additional text to make sure that there is enough room left below the image so that this line" - text run at (0,366) width 261: "does not hit the image that is text-top aligned. " - text run at (261,366) width 468: "It is the outer edge of the margin that should be text-bottom and text-top aligned in" - text run at (0,386) width 728: "this paragraph, so for the first image the bottom border of the image should begin 15px above the bottom of the text, and for the" - text run at (0,424) width 415: "second image the top border should begin 15px below the top of the text " - LayoutImage {IMG} at (405,394) size 80x80 [border: (10px solid #000000)] - LayoutText {#text} at (475,424) size 723x58 - text run at (475,424) width 8: ". " - text run at (483,424) width 240: "The last image in this paragraph has -10px" - text run at (0,466) width 705: "margins set on it, so that should pull the text in toward the image in the vertical direction, and also in the horizontal direction." -layer at (8,345) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,337) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png deleted file mode 100644 index 58adac3..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/horizontal_formatting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png deleted file mode 100644 index 325a77f8..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt deleted file mode 100644 index ef1ee75..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/inline_elements-expected.txt +++ /dev/null
@@ -1,97 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 791 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x790 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x790.33 - LayoutBlockFlow {BODY} at (8,8) size 769x774.33 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 560x112 - text run at (0,0) width 208: "P.one {line-height: 200%;}" - text run at (208,0) width 0: " " - text run at (0,16) width 552: "SPAN.two {border-style: solid; border-width: 10px; border-color: red;" - text run at (552,16) width 0: " " - text run at (0,32) width 304: " padding: 2pt; margin: 30pt;}" - text run at (304,32) width 0: " " - text run at (0,48) width 360: "P.three {font-size: 10pt; line-height: 12pt;}" - text run at (360,48) width 0: " " - text run at (0,64) width 560: "SPAN.four {border-style: solid; border-width: 12px; border-color: red;" - text run at (560,64) width 0: " " - text run at (0,80) width 192: " padding: 2pt;}" - text run at (192,80) width 0: " " - text run at (0,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 769x192 - LayoutText {#text} at (0,6) size 179x19 - text run at (0,6) width 179: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 763x173 [border: (10px solid #FF0000)] - LayoutText {#text} at (231,6) size 763x147 - text run at (231,6) width 531: "very long span in it, and the span has a 10px red border separated from the span by 2pt," - text run at (0,38) width 133: "and a margin of 30pt. " - text run at (132,38) width 622: "The padding and border should be present on all sides of the span (although vertical lines should appear" - text run at (0,70) width 421: "only at the beginning and the end of the whole span, not on each line). " - text run at (421,70) width 342: "The padding, border, and margin should all be noticeable" - text run at (0,102) width 223: "at the beginning and end of the span. " - text run at (223,102) width 527: "However, the line height should not be changed by any of them, so the margin should be" - text run at (0,134) width 374: "unnoticeable and the border should overlap text on other lines." - LayoutText {#text} at (426,134) size 729x51 - text run at (426,134) width 4: " " - text run at (430,134) width 299: "The line spacing in the whole paragraph should be" - text run at (0,166) width 132: "200% of the font size." - LayoutBlockFlow {P} at (0,387) size 769x64 - LayoutText {#text} at (0,0) size 160x15 - text run at (0,0) width 160: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 757x93 [border: (12px solid #FF0000)] - LayoutText {#text} at (174,0) size 757x63 - text run at (174,0) width 547: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 752: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the padding" - text run at (0,32) width 237: "and border should not effect the line height. " - text run at (236,32) width 521: "The span's border should have vertical lines only at the beginning and end of the whole span, not" - text run at (0,48) width 67: "on each line." - LayoutText {#text} at (81,48) size 405x15 - text run at (81,48) width 3: " " - text run at (84,48) width 402: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." - LayoutTable {TABLE} at (0,464.33) size 769x310 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x308 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x280 - LayoutTableCell {TD} at (0,154) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x192 - LayoutText {#text} at (0,6) size 179x19 - text run at (0,6) width 179: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 744x173 [border: (10px solid #FF0000)] - LayoutText {#text} at (231,6) size 744x147 - text run at (231,6) width 503: "very long span in it, and the span has a 10px red border separated from the span by" - text run at (0,38) width 161: "2pt, and a margin of 30pt. " - text run at (160,38) width 576: "The padding and border should be present on all sides of the span (although vertical lines should" - text run at (0,70) width 467: "appear only at the beginning and the end of the whole span, not on each line). " - text run at (467,70) width 277: "The padding, border, and margin should all be" - text run at (0,102) width 288: "noticeable at the beginning and end of the span. " - text run at (288,102) width 421: "However, the line height should not be changed by any of them, so the" - text run at (0,134) width 480: "margin should be unnoticeable and the border should overlap text on other lines." - LayoutText {#text} at (531,134) size 708x51 - text run at (531,134) width 5: " " - text run at (535,134) width 173: "The line spacing in the whole" - text run at (0,166) width 259: "paragraph should be 200% of the font size." - LayoutBlockFlow {P} at (4,212) size 747x64 - LayoutText {#text} at (0,0) size 160x15 - text run at (0,0) width 160: "This is a paragraph that has a " - LayoutInline {SPAN} at (0,0) size 721x93 [border: (12px solid #FF0000)] - LayoutText {#text} at (174,0) size 721x63 - text run at (174,0) width 547: "very long span in it, and the span has a 12px red border separated from the span by 2pt of padding (the" - text run at (0,16) width 705: "difference between the line-height and the font-size), which should overlap with the lines of text above and below the span, since the" - text run at (0,32) width 284: "padding and border should not effect the line height. " - text run at (283,32) width 433: "The span's border should have vertical lines only at the beginning and end of the" - text run at (0,48) width 155: "whole span, not on each line." - LayoutText {#text} at (169,48) size 405x15 - text run at (169,48) width 3: " " - text run at (172,48) width 402: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png deleted file mode 100644 index fac07a90..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt deleted file mode 100644 index c30297f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/replaced_elements-expected.txt +++ /dev/null
@@ -1,88 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2377 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2377 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2377 - LayoutBlockFlow {BODY} at (8,8) size 769x2361 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x128 - LayoutText {#text} at (0,0) size 504x128 - text run at (0,0) width 208: "IMG.one {display: inline;}" - text run at (208,0) width 0: " " - text run at (0,16) width 200: "IMG.two {display: block;}" - text run at (200,16) width 0: " " - text run at (0,32) width 208: "IMG.three {display: block;" - text run at (208,32) width 0: " " - text run at (0,48) width 504: " margin-right: auto; margin-left: auto; width: auto;}" - text run at (504,48) width 0: " " - text run at (0,64) width 200: "IMG.four {display: block;" - text run at (200,64) width 0: " " - text run at (0,80) width 488: " margin-right: auto; margin-left: auto; width: 50%;}" - text run at (488,80) width 0: " " - text run at (0,96) width 200: "IMG.five {display: block;" - text run at (200,96) width 0: " " - text run at (0,112) width 464: " margin-right: 0; margin-left: auto; width: 50%;}" - text run at (464,112) width 0: " " - LayoutBlockFlow {P} at (0,195) size 769x20 - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 411x19 - text run at (15,0) width 411: "The image at the beginning of this sentence should be a 15px square." - LayoutImage {IMG} at (0,231) size 15x15 - LayoutBlockFlow {P} at (0,262) size 769x20 - LayoutText {#text} at (0,0) size 467x19 - text run at (0,0) width 467: "The above image should be a 15px square with the same left edge as this text." - LayoutImage {IMG} at (377,298) size 15x15 - LayoutBlockFlow {P} at (0,329) size 769x20 - LayoutText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "The above image should be a 15px square aligned at the center." - LayoutImage {IMG} at (192.25,365) size 384.50x384.50 - LayoutBlockFlow {P} at (0,765.50) size 769x40 - LayoutText {#text} at (0,0) size 750x39 - text run at (0,0) width 750: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within the" - text run at (0,20) width 95: "parent element: " - text run at (95,20) width 375: "the document body in the first half, and the table in the second." - LayoutImage {IMG} at (384.50,821.50) size 384.50x384.50 - LayoutBlockFlow {P} at (0,1222) size 769x40 - LayoutText {#text} at (0,0) size 765x39 - text run at (0,0) width 765: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the parent" - text run at (0,20) width 53: "element: " - text run at (53,20) width 375: "the document body in the first half, and the table in the second." - LayoutTable {TABLE} at (0,1278) size 769x1083 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1081 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1053 - LayoutTableCell {TD} at (0,540) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1053 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutImage {IMG} at (0,0) size 15x15 - LayoutText {#text} at (15,0) size 411x19 - text run at (15,0) width 411: "The image at the beginning of this sentence should be a 15px square." - LayoutImage {IMG} at (4,40) size 15x15 - LayoutBlockFlow {P} at (4,71) size 747x20 - LayoutText {#text} at (0,0) size 467x19 - text run at (0,0) width 467: "The above image should be a 15px square with the same left edge as this text." - LayoutImage {IMG} at (370,107) size 15x15 - LayoutBlockFlow {P} at (4,138) size 747x20 - LayoutText {#text} at (0,0) size 383x19 - text run at (0,0) width 383: "The above image should be a 15px square aligned at the center." - LayoutImage {IMG} at (190.75,174) size 373.50x373.50 - LayoutBlockFlow {P} at (4,563.50) size 747x40 - LayoutText {#text} at (0,0) size 728x39 - text run at (0,0) width 728: "The above image should be a square resized so its width is 50% of the its parent element, and centered horizontally within" - text run at (0,20) width 117: "the parent element: " - text run at (117,20) width 375: "the document body in the first half, and the table in the second." - LayoutImage {IMG} at (377.50,619.50) size 373.50x373.50 - LayoutBlockFlow {P} at (4,1009) size 747x40 - LayoutText {#text} at (0,0) size 723x39 - text run at (0,0) width 723: "The above image should be a square resized so its width is 50% of its parent element, and aligned at the right edge of the" - text run at (0,20) width 95: "parent element: " - text run at (95,20) width 375: "the document body in the first half, and the table in the second." -layer at (8,185) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,177) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png deleted file mode 100644 index ccdfc33..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt deleted file mode 100644 index b672604..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/formatting_model/vertical_formatting-expected.txt +++ /dev/null
@@ -1,172 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2579 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2579 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2578.78 - LayoutBlockFlow {BODY} at (8,8) size 769x2562.78 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x320 - LayoutText {#text} at (0,0) size 496x320 - text run at (0,0) width 368: "P.one {margin-bottom: 2cm; padding-bottom: 0;}" - text run at (368,0) width 0: " " - text run at (0,16) width 320: "P.two {margin-top: 2cm; padding-top: 0;}" - text run at (320,16) width 0: " " - text run at (0,32) width 320: "P.three {margin-top: 0; padding-top: 0;}" - text run at (320,32) width 0: " " - text run at (0,48) width 344: "P.four {margin-top: -1cm; margin-bottom: 0;" - text run at (344,48) width 0: " " - text run at (0,64) width 344: " padding-top: 0; padding-bottom: 0;}" - text run at (344,64) width 0: " " - text run at (0,80) width 368: "DIV.five {margin-top: 1cm; margin-bottom: 1cm;" - text run at (368,80) width 0: " " - text run at (0,96) width 376: " padding-top: 1cm; padding-bottom: 0;}" - text run at (376,96) width 0: " " - text run at (0,112) width 344: "P.six {margin-top: 1cm; margin-bottom: 1cm;" - text run at (344,112) width 0: " " - text run at (0,128) width 336: " padding-top: 0; padding-bottom: 0;}" - text run at (336,128) width 0: " " - text run at (0,144) width 336: "P.seven {margin-top: 1cm; padding-top: 0;}" - text run at (336,144) width 0: " " - text run at (0,160) width 408: "P.eight {margin-bottom: -1cm; padding-bottom: 2cm;}" - text run at (408,160) width 0: " " - text run at (0,176) width 344: "P.nine {margin-top: -1cm; padding-top: 1cm;" - text run at (344,176) width 0: " " - text run at (0,192) width 376: " padding-bottom: 0; margin-bottom: 1cm;}" - text run at (376,192) width 0: " " - text run at (0,208) width 304: "P.ten {margin-top: 1cm;padding-top: 0;" - text run at (304,208) width 0: " " - text run at (0,224) width 248: " float: left;width: 50%;}" - text run at (248,224) width 0: " " - text run at (0,240) width 448: "P.eleven {margin-top: 1cm; padding-top: 0; clear: none;}" - text run at (448,240) width 0: " " - text run at (0,256) width 496: "P.twelve {margin-bottom: 0; padding-bottom: 1cm; clear: both;}" - text run at (496,256) width 0: " " - text run at (0,272) width 360: "P.thirteen {margin-top: 0; padding-top: 1cm;}" - text run at (360,272) width 0: " " - text run at (0,288) width 160: "TABLE {clear: both;}" - text run at (160,288) width 0: " " - text run at (0,304) width 0: " " - LayoutBlockFlow {P} at (0,387) size 769x40 - LayoutText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" - text run at (0,20) width 240: "collapse to the maximum of the margins." - LayoutBlockFlow {P} at (0,502.58) size 769x20 - LayoutText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." - LayoutBlockFlow {P} at (0,538.58) size 769x20 - LayoutText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "There should be a two-centimeter margin between this paragraph and the next." - LayoutBlockFlow {P} at (0,634.16) size 769x20 - LayoutText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." - LayoutBlockFlow {P} at (0,670.16) size 769x40 - LayoutText {#text} at (0,0) size 756x39 - text run at (0,0) width 756: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative margin, the" - text run at (0,20) width 371: "two margins should be added (the minus sign should be kept)." - LayoutBlockFlow {P} at (0,747.95) size 769x20 - LayoutText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." - LayoutBlockFlow {DIV} at (0,805.73) size 769x115.56 - LayoutBlockFlow {P} at (0,75.56) size 769x40 - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 750: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the text" - text run at (0,20) width 752: "below, because vertical margins of nested elements should collapse only if there is no border or padding between the margins." - LayoutBlockFlow {P} at (0,959.08) size 769x20 - LayoutText {#text} at (0,0) size 103x19 - text run at (0,0) width 103: "This is more text." - LayoutBlockFlow {P} at (0,995.08) size 769x115.58 - LayoutText {#text} at (0,0) size 747x39 - text run at (0,0) width 747: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a negative" - text run at (0,20) width 376: "margin with the largest absolute value of the margins collapsed." - LayoutBlockFlow {P} at (0,1072.88) size 769x77.78 - LayoutText {#text} at (0,37) size 753x40 - text run at (0,37) width 753: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the one" - text run at (0,57) width 146: "below it and to the right." - LayoutBlockFlow (floating) {P} at (0,1226.22) size 384.50x60 - LayoutText {#text} at (0,0) size 366x59 - text run at (0,0) width 366: "There should be two centimeters between this paragraph and" - text run at (0,20) width 346: "the one above it, since margins do not collapse on floating" - text run at (0,40) width 56: "elements." - LayoutBlockFlow {P} at (0,1188.44) size 769x60 - LayoutText {#text} at (384,0) size 382x59 - text run at (384,0) width 382: "There should be one centimeter between this paragraph and the" - text run at (384,20) width 375: "(non-floating) one above it, since the float should not effect the" - text run at (384,40) width 115: "paragraph spacing." - LayoutBlockFlow {P} at (0,1302.22) size 769x77.78 - LayoutText {#text} at (0,0) size 765x39 - text run at (0,0) width 530: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (529,0) width 236: "Padding does not collapse, and there is" - text run at (0,20) width 177: "1cm of padding on each side." - LayoutBlockFlow {P} at (0,1380) size 769x57.78 - LayoutText {#text} at (0,37) size 158x20 - text run at (0,37) width 158: "This is the next paragraph." - LayoutTable {TABLE} at (0,1453.78) size 769x1109 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1107 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1079 - LayoutTableCell {TD} at (0,553) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1078.78 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 720x39 - text run at (0,0) width 720: "There should be a two-centimeter margin between this paragraph and the next, because adjacent vertical margins should" - text run at (0,20) width 240: "collapse to the maximum of the margins." - LayoutBlockFlow {P} at (4,119.58) size 747x20 - LayoutText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." - LayoutBlockFlow {P} at (4,155.58) size 747x20 - LayoutText {#text} at (0,0) size 472x19 - text run at (0,0) width 472: "There should be a two-centimeter margin between this paragraph and the next." - LayoutBlockFlow {P} at (4,251.16) size 747x20 - LayoutText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." - LayoutBlockFlow {P} at (4,287.16) size 747x40 - LayoutText {#text} at (0,0) size 734x39 - text run at (0,0) width 734: "There should be a one-centimeter margin between this paragraph and the next, because when there is one negative margin," - text run at (0,20) width 393: "the two margins should be added (the minus sign should be kept)." - LayoutBlockFlow {P} at (4,364.95) size 747x20 - LayoutText {#text} at (0,0) size 156x19 - text run at (0,0) width 156: "This is another paragraph." - LayoutBlockFlow {DIV} at (4,422.73) size 747x135.56 - LayoutBlockFlow {P} at (0,75.56) size 747x60 - LayoutText {#text} at (0,0) size 724x59 - text run at (0,0) width 724: "There should be three centimeters between this text and the text above, but only one centimeter between this text and the" - text run at (0,20) width 724: "text below, because vertical margins of nested elements should collapse only if there is no border or padding between the" - text run at (0,40) width 50: "margins." - LayoutBlockFlow {P} at (4,596.08) size 747x20 - LayoutText {#text} at (0,0) size 103x19 - text run at (0,0) width 103: "This is more text." - LayoutBlockFlow {P} at (4,632.08) size 747x115.58 - LayoutText {#text} at (0,0) size 747x39 - text run at (0,0) width 747: "There should be two centimeters between this paragraph and the one below, because negative margins collapse to a negative" - text run at (0,20) width 376: "margin with the largest absolute value of the margins collapsed." - LayoutBlockFlow {P} at (4,709.88) size 747x77.78 - LayoutText {#text} at (0,37) size 727x40 - text run at (0,37) width 727: "This is a paragraph, which I should make very long so that you can easily see how much space there is between it and the" - text run at (0,57) width 172: "one below it and to the right." - LayoutBlockFlow (floating) {P} at (4,863.22) size 373.50x60 - LayoutText {#text} at (0,0) size 366x59 - text run at (0,0) width 366: "There should be two centimeters between this paragraph and" - text run at (0,20) width 346: "the one above it, since margins do not collapse on floating" - text run at (0,40) width 56: "elements." - LayoutBlockFlow {P} at (4,825.44) size 747x60 - LayoutText {#text} at (373,0) size 360x59 - text run at (373,0) width 360: "There should be one centimeter between this paragraph and" - text run at (373,20) width 338: "the (non-floating) one above it, since the float should not" - text run at (373,40) width 174: "effect the paragraph spacing." - LayoutBlockFlow {P} at (4,939.22) size 747x77.78 - LayoutText {#text} at (0,0) size 718x39 - text run at (0,0) width 530: "There should be two centimeters of padding between this paragraph and the one below. " - text run at (529,0) width 189: "Padding does not collapse, and" - text run at (0,20) width 224: "there is 1cm of padding on each side." - LayoutBlockFlow {P} at (4,1017) size 747x57.78 - LayoutText {#text} at (0,37) size 158x20 - text run at (0,37) width 158: "This is the next paragraph." -layer at (8,377) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,369) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/anchor-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/anchor-expected.png deleted file mode 100644 index 2cad599..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/anchor-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/anchor-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/anchor-expected.txt deleted file mode 100644 index 623f025..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/anchor-expected.txt +++ /dev/null
@@ -1,163 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 737 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x737 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x737 - LayoutBlockFlow {BODY} at (8,8) size 769x721 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x96 - LayoutText {#text} at (0,0) size 200x96 - text run at (0,0) width 136: "A {color: green;}" - text run at (136,0) width 0: " " - text run at (0,16) width 184: "A:link {color: purple;}" - text run at (184,16) width 0: " " - text run at (0,32) width 192: "A:visited {color: lime;}" - text run at (192,32) width 0: " " - text run at (0,48) width 200: "A:active {color: maroon;}" - text run at (200,48) width 0: " " - text run at (0,64) width 176: "#one {color: #006600;}" - text run at (176,64) width 0: " " - text run at (0,80) width 0: " " - LayoutBlockFlow {P} at (0,163) size 769x20 - LayoutText {#text} at (0,0) size 477x19 - text run at (0,0) width 477: "The following anchors should appear as described; none of them should be red." - LayoutBlockFlow {UL} at (0,199) size 769x160 - LayoutListItem {LI} at (40,0) size 729x120 - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 534x19 - text run at (0,0) width 534: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - LayoutBlockFlow {UL} at (0,20) size 729x100 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 108x19 [color=#800080] - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "W3C Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,20) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 109x19 [color=#800080] - LayoutText {#text} at (0,0) size 109x19 - text run at (0,0) width 109: "NIST Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,40) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 121x19 [color=#800080] - LayoutText {#text} at (0,0) size 121x19 - text run at (0,0) width 121: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,60) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 45x19 [color=#800080] - LayoutText {#text} at (0,0) size 45x19 - text run at (0,0) width 45: "Yahoo!" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,80) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 54x19 [color=#800080] - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Erewhon" - LayoutText {#text} at (54,0) size 209x19 - text run at (54,0) width 209: " (don't click on it, it goes nowhere)" - LayoutListItem {LI} at (40,120) size 729x40 - LayoutBlockFlow (anonymous) at (0,0) size 729x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "Dark green in any circumstance:" - LayoutBlockFlow {UL} at (0,20) size 729x20 - LayoutListItem {LI} at (40,0) size 689x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 121x19 [color=#006600] - LayoutText {#text} at (0,0) size 121x19 - text run at (0,0) width 121: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,375) size 769x40 - LayoutText {#text} at (0,0) size 114x19 - text run at (0,0) width 114: "The quoted word \"" - LayoutInline {A} at (0,0) size 41x19 [color=#008000] - LayoutText {#text} at (114,0) size 41x19 - text run at (114,0) width 41: "anchor" - LayoutText {#text} at (155,0) size 755x39 - text run at (155,0) width 360: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (514,0) width 241: "It's a named anchor, and styles declared" - text run at (0,20) width 283: "for the A tag are applied to them under CSS1. " - text run at (283,20) width 310: "It also should NOT turn orange when clicked upon." - LayoutTable {TABLE} at (0,431) size 769x290 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x288 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x260 - LayoutTableCell {TD} at (0,144) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x260 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 477x19 - text run at (0,0) width 477: "The following anchors should appear as described; none of them should be red." - LayoutBlockFlow {UL} at (4,40) size 747x160 - LayoutListItem {LI} at (40,0) size 707x120 - LayoutBlockFlow (anonymous) at (0,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 534x19 - text run at (0,0) width 534: "Purple unvisited, lime (light green) visited, maroon (dark red) while active (being clicked):" - LayoutBlockFlow {UL} at (0,20) size 707x100 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 108x19 [color=#800080] - LayoutText {#text} at (0,0) size 108x19 - text run at (0,0) width 108: "W3C Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,20) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 109x19 [color=#800080] - LayoutText {#text} at (0,0) size 109x19 - text run at (0,0) width 109: "NIST Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,40) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 121x19 [color=#800080] - LayoutText {#text} at (0,0) size 121x19 - text run at (0,0) width 121: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,60) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 45x19 [color=#800080] - LayoutText {#text} at (0,0) size 45x19 - text run at (0,0) width 45: "Yahoo!" - LayoutText {#text} at (0,0) size 0x0 - LayoutListItem {LI} at (40,80) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 54x19 [color=#800080] - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Erewhon" - LayoutText {#text} at (54,0) size 209x19 - text run at (54,0) width 209: " (don't click on it, it goes nowhere)" - LayoutListItem {LI} at (40,120) size 707x40 - LayoutBlockFlow (anonymous) at (0,0) size 707x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 192x19 - text run at (0,0) width 192: "Dark green in any circumstance:" - LayoutBlockFlow {UL} at (0,20) size 707x20 - LayoutListItem {LI} at (40,0) size 667x20 - LayoutListMarker (anonymous) at (-18,0) size 7x19: white bullet - LayoutInline {A} at (0,0) size 121x19 [color=#006600] - LayoutText {#text} at (0,0) size 121x19 - text run at (0,0) width 121: "CWRU Web server" - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,216) size 747x40 - LayoutText {#text} at (0,0) size 114x19 - text run at (0,0) width 114: "The quoted word \"" - LayoutInline {A} at (0,0) size 41x19 [color=#008000] - LayoutText {#text} at (114,0) size 41x19 - text run at (114,0) width 41: "anchor" - LayoutText {#text} at (155,0) size 699x39 - text run at (155,0) width 360: "\" should be green, NOT purple, since it's part of an anchor. " - text run at (514,0) width 185: "It's a named anchor, and styles" - text run at (0,20) width 339: "declared for the A tag are applied to them under CSS1. " - text run at (339,20) width 310: "It also should NOT turn orange when clicked upon." -layer at (8,153) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,145) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstletter-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstletter-expected.png deleted file mode 100644 index dfe5098..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstletter-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt deleted file mode 100644 index 8b383a45..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstletter-expected.txt +++ /dev/null
@@ -1,94 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 751 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x751 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x751 - LayoutBlockFlow {BODY} at (8,8) size 769x735 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 328x19 - text run at (9,0) width 328: "he style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 312x64 - text run at (0,0) width 248: "P:first-letter {color: maroon;}" - text run at (248,0) width 0: " " - text run at (0,16) width 288: ".two:first-letter {font-size: 200%;}" - text run at (288,16) width 0: " " - text run at (0,32) width 312: "P.three:first-letter {font-size: 350%;}" - text run at (312,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 758x59 - text run at (9,0) width 414: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (423,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 609: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" - text run at (0,40) width 24: "line." - LayoutBlockFlow {P} at (0,207) size 769x77 - LayoutInline {<pseudo:first-letter>} at (0,0) size 19x36 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 19x36 - text run at (0,0) width 19: "T" - LayoutTextFragment {#text} at (19,13) size 766x63 - text run at (19,13) width 582: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (600,13) width 158: "If this precise combination" - text run at (0,37) width 327: "does not occur, then the user agent has failed this test. " - text run at (326,37) width 440: "Remember that in order to ensure a complete test, the paragraph must be" - text run at (0,57) width 194: "displayed on more than one line." - LayoutBlockFlow {P} at (0,300) size 769x106 - LayoutInline {<pseudo:first-letter>} at (0,0) size 75x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - LayoutTextFragment {#text} at (75,36) size 768x69 - text run at (75,36) width 305: "e should check for quotation support,\" it was said. " - text run at (380,36) width 388: "The first two characters in this paragraph-- a double-quote mark" - text run at (0,66) width 525: "and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (525,66) width 209: "Note that this is not required under" - text run at (0,86) width 182: "CSS1, but it is recommended." - LayoutTable {TABLE} at (0,422) size 769x313 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x311 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x283 - LayoutTableCell {TD} at (0,155) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x283 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 732x59 - text run at (9,0) width 414: "he first letter of this paragraph, and only that one, should be maroon. " - text run at (423,0) width 306: "If this precise combination does not occur, then the" - text run at (0,20) width 178: "user agent has failed this test. " - text run at (178,20) width 554: "Remember that in order to ensure a complete test, the paragraph must be displayed on more" - text run at (0,40) width 79: "than one line." - LayoutBlockFlow {P} at (4,80) size 747x77 - LayoutInline {<pseudo:first-letter>} at (0,0) size 19x36 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 19x36 - text run at (0,0) width 19: "T" - LayoutTextFragment {#text} at (19,13) size 727x63 - text run at (19,13) width 582: "he first letter of this paragraph, and only that one, should be a larger font size, as well as maroon. " - text run at (600,13) width 81: "If this precise" - text run at (0,37) width 404: "combination does not occur, then the user agent has failed this test. " - text run at (403,37) width 324: "Remember that in order to ensure a complete test, the" - text run at (0,57) width 310: "paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,173) size 747x106 - LayoutInline {<pseudo:first-letter>} at (0,0) size 75x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - LayoutTextFragment {#text} at (75,36) size 733x69 - text run at (75,36) width 305: "e should check for quotation support,\" it was said. " - text run at (380,36) width 353: "The first two characters in this paragraph-- a double-quote" - text run at (0,66) width 560: "mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon. " - text run at (560,66) width 171: "Note that this is not required" - text run at (0,86) width 220: "under CSS1, but it is recommended." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.png deleted file mode 100644 index b62d3a4..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.txt deleted file mode 100644 index 8600fd1..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/firstline-expected.txt +++ /dev/null
@@ -1,84 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 699 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x699 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x699 - LayoutBlockFlow {BODY} at (8,8) size 769x683 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 360x64 - text run at (0,0) width 224: "P:first-line {color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 272: ".two:first-line {font-size: 200%;}" - text run at (272,16) width 0: " " - text run at (0,32) width 360: ".three:first-line {font-variant: small-caps;}" - text run at (360,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x60 - LayoutText {#text} at (0,0) size 758x59 - text run at (0,0) width 400: "The first line of this paragraph, and only that one, should be green. " - text run at (400,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 609: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" - text run at (0,40) width 24: "line." - LayoutBlockFlow {P} at (0,207) size 769x77 - LayoutText {#text} at (0,0) size 759x76 - text run at (0,0) width 749: "The first line of this paragraph, and only that one, should be" - text run at (0,37) width 205: "a larger font size as well as green. " - text run at (204,37) width 489: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (692,37) width 67: "Remember" - text run at (0,57) width 567: "that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,300) size 769x80 - LayoutText {#text} at (0,0) size 763x59 - text run at (0,0) width 646: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (645,0) width 118: "Thus, if the first" - text run at (0,20) width 760: "line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although" - text run at (0,40) width 157: "the problem might be that " - LayoutInline {CODE} at (0,0) size 80x16 - LayoutText {#text} at (157,43) size 80x16 - text run at (157,43) width 80: "small-caps" - LayoutText {#text} at (237,40) size 725x39 - text run at (237,40) width 218: " is not supported by your browser). " - text run at (455,40) width 270: "This is extra text included for the purposes of" - text run at (0,60) width 372: "making the paragraph long enough to have more than one line." - LayoutTable {TABLE} at (0,396) size 769x287 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x285 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x257 - LayoutTableCell {TD} at (0,142) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x257 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutText {#text} at (0,0) size 735x59 - text run at (0,0) width 400: "The first line of this paragraph, and only that one, should be green. " - text run at (400,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 583: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than" - text run at (0,40) width 50: "one line." - LayoutBlockFlow {P} at (4,80) size 747x77 - LayoutText {#text} at (0,0) size 711x76 - text run at (0,0) width 711: "The first line of this paragraph, and only that one, should" - text run at (0,37) width 224: "be a larger font size as well as green. " - text run at (223,37) width 485: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,57) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,173) size 747x80 - LayoutText {#text} at (0,0) size 727x59 - text run at (0,0) width 646: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (645,0) width 81: "Thus, if the" - text run at (0,20) width 727: "first line is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test" - text run at (0,40) width 216: "(although the problem might be that " - LayoutInline {CODE} at (0,0) size 80x16 - LayoutText {#text} at (216,43) size 80x16 - text run at (216,43) width 80: "small-caps" - LayoutText {#text} at (296,40) size 709x39 - text run at (296,40) width 218: " is not supported by your browser). " - text run at (514,40) width 195: "This is extra text included for the" - text run at (0,60) width 447: "purposes of making the paragraph long enough to have more than one line." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png deleted file mode 100644 index 79b7509..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt deleted file mode 100644 index dd895dd..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt +++ /dev/null
@@ -1,103 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1069 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1069 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1069 - LayoutBlockFlow {BODY} at (8,8) size 769x1053 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 328x19 - text run at (9,0) width 328: "he style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 368x112 - text run at (0,0) width 224: "P:first-line {color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 248: "P:first-letter {color: maroon;}" - text run at (248,16) width 0: " " - text run at (0,32) width 272: ".two:first-line {font-size: 200%;}" - text run at (272,32) width 0: " " - text run at (0,48) width 288: ".two:first-letter {font-size: 350%;}" - text run at (288,48) width 0: " " - text run at (0,64) width 312: "P.three:first-letter {font-size: 350%;}" - text run at (312,64) width 0: " " - text run at (0,80) width 368: "P.three:first-line {font-variant: small-caps;}" - text run at (368,80) width 0: " " - text run at (0,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 769x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 769x59 - text run at (9,0) width 727: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be green. " - text run at (736,0) width 33: "If this" - text run at (0,20) width 451: "precise combination does not occur, then the user agent has failed this test. " - text run at (450,20) width 302: "Remember that in order to ensure a complete test," - text run at (0,40) width 332: "the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,255) size 769x192 - LayoutInline {<pseudo:first-letter>} at (0,0) size 68x127 [color=#800000] - LayoutTextFragment (anonymous) at (0,2) size 68x127 - text run at (0,2) width 68: "T" - LayoutTextFragment {#text} at (68,74) size 762x117 - text run at (68,74) width 621: "he first letter of this paragraph, and only that one," - text run at (0,132) width 762: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line should be" - text run at (0,152) width 223: "200% bigger than normal and green. " - text run at (223,152) width 484: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,172) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,463) size 769x126 - LayoutInline {<pseudo:first-letter>} at (0,0) size 75x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - LayoutTextFragment {#text} at (75,36) size 769x89 - text run at (75,36) width 359: "e should check for quotation support,\" it was said. " - text run at (433,36) width 327: "The first two characters in this paragraph-- a" - text run at (0,66) width 711: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (711,66) width 57: "Note that" - text run at (0,86) width 757: "the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended. " - text run at (757,86) width 12: "In" - text run at (0,106) width 410: "addition, the entire first line should be in a small-caps font and green." - LayoutTable {TABLE} at (0,605) size 769x448 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x446 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x418 - LayoutTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 747x59 - text run at (9,0) width 727: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be green. " - text run at (736,0) width 9: "If" - text run at (0,20) width 475: "this precise combination does not occur, then the user agent has failed this test. " - text run at (474,20) width 273: "Remember that in order to ensure a complete" - text run at (0,40) width 361: "test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,80) size 747x192 - LayoutInline {<pseudo:first-letter>} at (0,0) size 68x127 [color=#800000] - LayoutTextFragment (anonymous) at (0,2) size 68x127 - text run at (0,2) width 68: "T" - LayoutTextFragment {#text} at (68,74) size 743x117 - text run at (68,74) width 621: "he first letter of this paragraph, and only that one," - text run at (0,132) width 743: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line should" - text run at (0,152) width 242: "be 200% bigger than normal and green. " - text run at (242,152) width 484: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,172) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,288) size 747x126 - LayoutInline {<pseudo:first-letter>} at (0,0) size 75x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - LayoutTextFragment {#text} at (75,36) size 742x89 - text run at (75,36) width 359: "e should check for quotation support,\" it was said. " - text run at (433,36) width 309: "The first two characters in this paragraph-" - text run at (0,66) width 728: "- a double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red)." - text run at (0,86) width 720: "Note that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is" - text run at (0,106) width 94: "recommended. " - text run at (94,106) width 426: "In addition, the entire first line should be in a small-caps font and green." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png deleted file mode 100644 index fd9df271..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt deleted file mode 100644 index 3db0314..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/pseudo/pseudo_elements_in_selectors-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 605 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x605 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x605 - LayoutBlockFlow {BODY} at (8,8) size 769x589 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 373x19 - text run at (0,0) width 373: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 264x64 - text run at (0,0) width 264: "P:first-line {font-weight: bold;}" - text run at (264,0) width 0: " " - text run at (0,16) width 256: "P.two:first-line {color: green;}" - text run at (256,16) width 0: " " - text run at (0,32) width 256: "P:first-line.three {color: red;}" - text run at (256,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x40 - LayoutText {#text} at (0,0) size 714x39 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 378: "This test is included simply to establish a baseline for the" - text run at (0,20) width 604: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - LayoutBlockFlow {P} at (0,187) size 769x40 - LayoutText {#text} at (0,0) size 752x39 - text run at (0,0) width 552: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (551,0) width 201: "If this is not the case, then the" - text run at (0,20) width 541: "user agent may have failed to properly parse the selector, or it may simply not support the " - LayoutInline {TT} at (0,0) size 89x16 - LayoutText {#text} at (540,23) size 89x16 - text run at (540,23) width 89: ":first-line" - LayoutText {#text} at (628,20) size 105x19 - text run at (628,20) width 105: " pseudo-element." - LayoutBlockFlow {P} at (0,243) size 769x80 - LayoutText {#text} at (0,0) size 757x79 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 413: "If it is red, then the user agent has violated the specification in" - text run at (0,20) width 413: "allowing pseudo-elements at a point other than the end of a selector. " - text run at (412,20) width 321: "If neither is the case, then the user agent has correctly" - text run at (0,40) width 757: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have failed" - text run at (0,60) width 47: "the test." - LayoutTable {TABLE} at (0,339) size 769x250 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x248 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x220 - LayoutTableCell {TD} at (0,124) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x220 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 714x39 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 378: "This test is included simply to establish a baseline for the" - text run at (0,20) width 604: "following tests, since if this test fails, then the rest of the tests on this page are expected to fail as well." - LayoutBlockFlow {P} at (4,60) size 747x60 - LayoutText {#text} at (0,0) size 727x39 - text run at (0,0) width 552: "The first line of this sentence should be boldfaced and green, thanks to its selector. " - text run at (551,0) width 176: "If this is not the case, then" - text run at (0,20) width 563: "the user agent may have failed to properly parse the selector, or it may simply not support the " - LayoutInline {TT} at (0,0) size 89x16 - LayoutText {#text} at (562,23) size 89x16 - text run at (562,23) width 89: ":first-line" - LayoutText {#text} at (650,20) size 705x39 - text run at (650,20) width 55: " pseudo-" - text run at (0,40) width 50: "element." - LayoutBlockFlow {P} at (4,136) size 747x80 - LayoutText {#text} at (0,0) size 747x79 - text run at (0,0) width 336: "The first line of this sentence should be boldfaced. " - text run at (336,0) width 397: "If it is red, then the user agent has violated the specification" - text run at (0,20) width 427: "in allowing pseudo-elements at a point other than the end of a selector. " - text run at (426,20) width 321: "If neither is the case, then the user agent has correctly" - text run at (0,40) width 721: "ignored the incorrect selector, but has suppressed other styles which are valid, and therefore must be considered to have" - text run at (0,60) width 83: "failed the test." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png deleted file mode 100644 index d14bfeb4..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt deleted file mode 100644 index 28a3cd6e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/letter_spacing-expected.txt +++ /dev/null
@@ -1,139 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1461 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1461 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1461 - LayoutBlockFlow {BODY} at (8,8) size 769x1445 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 264x176 - text run at (0,0) width 232: ".one {letter-spacing: 0.3in;}" - text run at (232,0) width 0: " " - text run at (0,16) width 232: ".two {letter-spacing: 0.5cm;}" - text run at (232,16) width 0: " " - text run at (0,32) width 232: ".three {letter-spacing: 5mm;}" - text run at (232,32) width 0: " " - text run at (0,48) width 224: ".four {letter-spacing: 3pt;}" - text run at (224,48) width 0: " " - text run at (0,64) width 248: ".five {letter-spacing: 0.25pc;}" - text run at (248,64) width 0: " " - text run at (0,80) width 216: ".six {letter-spacing: 1em;}" - text run at (216,80) width 0: " " - text run at (0,96) width 232: ".seven {letter-spacing: 1ex;}" - text run at (232,96) width 0: " " - text run at (0,112) width 232: ".eight {letter-spacing: 5px;}" - text run at (232,112) width 0: " " - text run at (0,128) width 248: ".nine {letter-spacing: normal;}" - text run at (248,128) width 0: " " - text run at (0,144) width 224: ".ten {letter-spacing: 300%;}" - text run at (224,144) width 0: " " - text run at (0,160) width 264: ".eleven {letter-spacing: -0.1em;}" - text run at (264,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x80 - LayoutText {#text} at (0,0) size 703x79 - text run at (0,0) width 679: "This letters in this" - text run at (0,20) width 703: "sentence should have" - text run at (0,40) width 672: "extra space between" - text run at (0,60) width 177: "them." - LayoutBlockFlow {P} at (0,339) size 769x60 - LayoutText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." - LayoutBlockFlow {P} at (0,415) size 769x60 - LayoutText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." - LayoutBlockFlow {P} at (0,491) size 769x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,527) size 769x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,563) size 769x60 - LayoutText {#text} at (0,0) size 695x59 - text run at (0,0) width 623: "This letters in this sentence" - text run at (0,20) width 695: "should have extra space between" - text run at (0,40) width 113: "them." - LayoutBlockFlow {P} at (0,639) size 769x40 - LayoutText {#text} at (0,0) size 678x39 - text run at (0,0) width 678: "This letters in this sentence should have extra space" - text run at (0,20) width 179: "between them." - LayoutBlockFlow {P} at (0,695) size 769x40 - LayoutText {#text} at (0,0) size 734x39 - text run at (0,0) width 734: "This letters in this sentence should have extra space between them," - text run at (0,20) width 424: "but the last few words in the sentence " - LayoutInline {SPAN} at (0,0) size 169x19 - LayoutText {#text} at (424,20) size 169x19 - text run at (424,20) width 169: "should show normal spacing" - LayoutText {#text} at (593,20) size 9x19 - text run at (593,20) width 9: "." - LayoutBlockFlow {P} at (0,751) size 769x20 - LayoutText {#text} at (0,0) size 754x19 - text run at (0,0) width 754: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this property." - LayoutBlockFlow {P} at (0,787) size 769x20 - LayoutText {#text} at (0,0) size 529x19 - text run at (0,0) width 529: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." - LayoutTable {TABLE} at (0,823) size 769x622 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x620 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x592 - LayoutTableCell {TD} at (0,310) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x592 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x80 - LayoutText {#text} at (0,0) size 703x79 - text run at (0,0) width 679: "This letters in this" - text run at (0,20) width 703: "sentence should have" - text run at (0,40) width 672: "extra space between" - text run at (0,60) width 177: "them." - LayoutBlockFlow {P} at (4,100) size 747x60 - LayoutText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." - LayoutBlockFlow {P} at (4,176) size 747x60 - LayoutText {#text} at (0,0) size 708x59 - text run at (0,0) width 708: "This letters in this sentence" - text run at (0,20) width 579: "should have extra space" - text run at (0,40) width 334: "between them." - LayoutBlockFlow {P} at (4,252) size 747x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,288) size 747x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This letters in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,324) size 747x60 - LayoutText {#text} at (0,0) size 695x59 - text run at (0,0) width 623: "This letters in this sentence" - text run at (0,20) width 695: "should have extra space between" - text run at (0,40) width 113: "them." - LayoutBlockFlow {P} at (4,400) size 747x40 - LayoutText {#text} at (0,0) size 678x39 - text run at (0,0) width 678: "This letters in this sentence should have extra space" - text run at (0,20) width 179: "between them." - LayoutBlockFlow {P} at (4,456) size 747x40 - LayoutText {#text} at (0,0) size 734x39 - text run at (0,0) width 734: "This letters in this sentence should have extra space between them," - text run at (0,20) width 424: "but the last few words in the sentence " - LayoutInline {SPAN} at (0,0) size 169x19 - LayoutText {#text} at (424,20) size 169x19 - text run at (424,20) width 169: "should show normal spacing" - LayoutText {#text} at (593,20) size 9x19 - text run at (593,20) width 9: "." - LayoutBlockFlow {P} at (4,512) size 747x40 - LayoutText {#text} at (0,0) size 695x39 - text run at (0,0) width 695: "This letters in this sentence should have normal space between them, since percentage values are not allowed on this" - text run at (0,20) width 55: "property." - LayoutBlockFlow {P} at (4,568) size 747x20 - LayoutText {#text} at (0,0) size 529x19 - text run at (0,0) width 529: "This letters in this sentence should have reduced space between them, since negative values are allowed on this property." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/line_height-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/line_height-expected.png deleted file mode 100644 index dca6c0c..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/line_height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/line_height-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/line_height-expected.txt deleted file mode 100644 index db9bcba..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/line_height-expected.txt +++ /dev/null
@@ -1,182 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 2641 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x2641 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x2641 - LayoutBlockFlow {BODY} at (8,8) size 769x2625 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x224 - LayoutText {#text} at (0,0) size 400x224 - text run at (0,0) width 344: ".one {line-height: 0.5in; font-size: 12px;}" - text run at (344,0) width 0: " " - text run at (0,16) width 328: ".two {line-height: 2cm; font-size: 12px;}" - text run at (328,16) width 0: " " - text run at (0,32) width 352: ".three {line-height: 20mm; font-size: 12px;}" - text run at (352,32) width 0: " " - text run at (0,48) width 344: ".four {line-height: 24pt; font-size: 12px;}" - text run at (344,48) width 0: " " - text run at (0,64) width 336: ".five {line-height: 2pc; font-size: 12px;}" - text run at (336,64) width 0: " " - text run at (0,80) width 328: ".six {line-height: 2em; font-size: 12px;}" - text run at (328,80) width 0: " " - text run at (0,96) width 344: ".seven {line-height: 3ex; font-size: 12px;}" - text run at (344,96) width 0: " " - text run at (0,112) width 352: ".eight {line-height: 200%; font-size: 12px;}" - text run at (352,112) width 0: " " - text run at (0,128) width 320: ".nine {line-height: 2; font-size: 12px;}" - text run at (320,128) width 0: " " - text run at (0,144) width 336: ".ten {line-height: 50px; font-size: 12px;}" - text run at (336,144) width 0: " " - text run at (0,160) width 360: ".eleven {line-height: -1em; font-size: 12px;}" - text run at (360,160) width 0: " " - text run at (0,176) width 400: "TABLE .ten {line-height: normal; font-size: 12px;}" - text run at (400,176) width 0: " " - text run at (0,192) width 248: "DIV {background-color: silver;}" - text run at (248,192) width 0: " " - text run at (0,208) width 304: "SPAN.color {background-color: silver;}" - text run at (304,208) width 0: " " - LayoutBlockFlow {P} at (0,287) size 769x48 - LayoutText {#text} at (0,16) size 511x15 - text run at (0,16) width 511: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,347) size 769x75 - LayoutText {#text} at (0,30) size 533x15 - text run at (0,30) width 533: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,434) size 769x75 - LayoutText {#text} at (0,30) size 547x15 - text run at (0,30) width 547: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,521) size 769x32 - LayoutText {#text} at (0,8) size 549x15 - text run at (0,8) width 549: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,565) size 769x32 - LayoutText {#text} at (0,8) size 503x15 - text run at (0,8) width 503: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,609) size 769x24 - LayoutText {#text} at (0,4) size 492x15 - text run at (0,4) width 492: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,645) size 769x14 - LayoutText {#text} at (0,-1) size 493x15 - text run at (0,-1) width 493: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,671) size 769x24 - LayoutText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (0,707) size 769x168 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 769x24 - LayoutText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 769x72 - LayoutText {#text} at (0,-2) size 752x75 - text run at (0,-2) width 737: "This sentence should have a line-height of twice the DIV's font size, or 28px;" - text run at (0,22) width 752: "this should not cause extra spacing between the lines, since the line-height and" - text run at (0,46) width 359: "font-size should have the same value." - LayoutBlockFlow (anonymous) at (0,144) size 769x24 - LayoutText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,887) size 769x24 - LayoutText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (0,923) size 769x240 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 769x24 - LayoutText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 769x144 - LayoutText {#text} at (0,10) size 737x123 - text run at (0,10) width 737: "This sentence should have a line-height of twice the font size, which is 200%" - text run at (0,58) width 732: "normal thanks to an inline style; this should cause extra spacing between the" - text run at (0,106) width 640: "lines, as the font-size will be 28px and the line-height will be 56px." - LayoutBlockFlow (anonymous) at (0,216) size 769x24 - LayoutText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,1175) size 769x100 - LayoutText {#text} at (0,17) size 756x65 - text run at (0,17) width 599: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (599,17) width 157: "In the second section (within the" - text run at (0,67) width 183: "table) its line-height should be normal." - LayoutBlockFlow {P} at (0,1287) size 769x16 - LayoutText {#text} at (0,0) size 515x15 - text run at (0,0) width 515: "This sentence should have a normal line-height, because negative values are not permitted for this property." - LayoutBlockFlow {P} at (0,1315) size 769x150 - LayoutInline {SPAN} at (0,0) size 767x90 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,30) size 767x90 - text run at (0,30) width 767: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver, but no" - text run at (0,105) width 672: "padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1477) size 769x1148 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x1146 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x1118 - LayoutTableCell {TD} at (0,573) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x1118 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x48 - LayoutText {#text} at (0,16) size 511x15 - text run at (0,16) width 511: "This sentence should have a line-height of half an inch, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,64) size 747x75 - LayoutText {#text} at (0,30) size 533x15 - text run at (0,30) width 533: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,151) size 747x75 - LayoutText {#text} at (0,30) size 547x15 - text run at (0,30) width 547: "This sentence should have a line-height of twenty millimeters, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,238) size 747x32 - LayoutText {#text} at (0,8) size 549x15 - text run at (0,8) width 549: "This sentence should have a line-height of twenty-four points, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,282) size 747x32 - LayoutText {#text} at (0,8) size 503x15 - text run at (0,8) width 503: "This sentence should have a line-height of two picas, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,326) size 747x24 - LayoutText {#text} at (0,4) size 492x15 - text run at (0,4) width 492: "This sentence should have a line-height of two em, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,362) size 747x14 - LayoutText {#text} at (0,-1) size 493x15 - text run at (0,-1) width 493: "This sentence should have a line-height of three ex, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,388) size 747x24 - LayoutText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (4,424) size 747x168 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 747x24 - LayoutText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 747x72 - LayoutText {#text} at (0,-2) size 737x75 - text run at (0,-2) width 737: "This sentence should have a line-height of twice the DIV's font size, or 28px;" - text run at (0,22) width 711: "this should not cause extra spacing between the lines, since the line-height" - text run at (0,46) width 400: "and font-size should have the same value." - LayoutBlockFlow (anonymous) at (0,144) size 747x24 - LayoutText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,604) size 747x24 - LayoutText {#text} at (0,4) size 545x15 - text run at (0,4) width 545: "This sentence should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {DIV} at (4,640) size 747x240 [bgcolor=#C0C0C0] - LayoutBlockFlow (anonymous) at (0,0) size 747x24 - LayoutText {#text} at (0,4) size 602x15 - text run at (0,4) width 602: "This first part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (0,48) size 747x144 - LayoutText {#text} at (0,10) size 737x123 - text run at (0,10) width 737: "This sentence should have a line-height of twice the font size, which is 200%" - text run at (0,58) width 732: "normal thanks to an inline style; this should cause extra spacing between the" - text run at (0,106) width 640: "lines, as the font-size will be 28px and the line-height will be 56px." - LayoutBlockFlow (anonymous) at (0,216) size 747x24 - LayoutText {#text} at (0,4) size 615x15 - text run at (0,4) width 615: "This second part of the DIV should have a line-height of twice the font size, which should cause extra spacing between the lines." - LayoutBlockFlow {P} at (4,892) size 747x32 - LayoutText {#text} at (0,0) size 738x31 - text run at (0,0) width 599: "This paragraph should have a line-height of 50 pixels in the first section, which should cause extra spacing between the lines. " - text run at (599,0) width 139: "In the second section (within" - text run at (0,16) width 201: "the table) its line-height should be normal." - LayoutBlockFlow {P} at (4,936) size 747x16 - LayoutText {#text} at (0,0) size 515x15 - text run at (0,0) width 515: "This sentence should have a normal line-height, because negative values are not permitted for this property." - LayoutBlockFlow {P} at (4,964) size 747x150 - LayoutInline {SPAN} at (0,0) size 733x90 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,30) size 733x90 - text run at (0,30) width 733: "This sentence should have a line-height of two centimeters, which should cause extra spacing between the lines. The text has a background color of silver," - text run at (0,105) width 706: "but no padding or border. The background color has been set on an inline element and should therefore only cover the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,281) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,273) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_align-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_align-expected.png deleted file mode 100644 index 7e87caf..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_align-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_align-expected.txt deleted file mode 100644 index 6943d4b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_align-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x80 - LayoutText {#text} at (0,0) size 224x80 - text run at (0,0) width 192: ".one {text-align: left;}" - text run at (192,0) width 0: " " - text run at (0,16) width 200: ".two {text-align: right;}" - text run at (200,16) width 0: " " - text run at (0,32) width 224: ".three {text-align: center;}" - text run at (224,32) width 0: " " - text run at (0,48) width 224: ".four {text-align: justify;}" - text run at (224,48) width 0: " " - text run at (0,64) width 0: " " - LayoutBlockFlow {P} at (0,147) size 784x20 - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This sentence should be left-justified." - LayoutBlockFlow {P} at (0,183) size 784x20 - LayoutText {#text} at (555,0) size 229x19 - text run at (555,0) width 229: "This sentence should be right-justified." - LayoutBlockFlow {P} at (0,219) size 784x20 - LayoutText {#text} at (290,0) size 204x19 - text run at (290,0) width 204: "This sentence should be centered." - LayoutBlockFlow {P} at (0,255) size 784x40 - LayoutText {#text} at (0,0) size 784x39 - text run at (0,0) width 784: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no matter how" - text run at (0,20) width 722: "long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western languages." - LayoutTable {TABLE} at (0,311) size 784x186 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x184 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x156 - LayoutTableCell {TD} at (0,92) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x156 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 - LayoutText {#text} at (0,0) size 221x19 - text run at (0,0) width 221: "This sentence should be left-justified." - LayoutBlockFlow {P} at (4,40) size 762x20 - LayoutText {#text} at (533,0) size 229x19 - text run at (533,0) width 229: "This sentence should be right-justified." - LayoutBlockFlow {P} at (4,76) size 762x20 - LayoutText {#text} at (279,0) size 204x19 - text run at (279,0) width 204: "This sentence should be centered." - LayoutBlockFlow {P} at (4,112) size 762x40 - LayoutText {#text} at (0,0) size 762x39 - text run at (0,0) width 762: "This sentence should be fully justified, which means that the right and left margins of this paragraph should line up, no matter" - text run at (0,20) width 752: "how long the paragraph becomes; the exception, of course, is the last line, which should be left-justified in Western languages." -layer at (8,137) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png deleted file mode 100644 index 8159a35..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_decoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt deleted file mode 100644 index 48475740..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_decoration-expected.txt +++ /dev/null
@@ -1,199 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1205 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1205 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1205 - LayoutBlockFlow {BODY} at (8,8) size 769x1189 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x128 - LayoutText {#text} at (0,0) size 464x128 - text run at (0,0) width 272: ".one {text-decoration: underline;}" - text run at (272,0) width 0: " " - text run at (0,16) width 264: ".two {text-decoration: overline;}" - text run at (264,16) width 0: " " - text run at (0,32) width 312: ".three {text-decoration: line-through;}" - text run at (312,32) width 0: " " - text run at (0,48) width 248: ".four {text-decoration: blink;}" - text run at (248,48) width 0: " " - text run at (0,64) width 248: "B.five {text-decoration: none;}" - text run at (248,64) width 0: " " - text run at (0,80) width 344: ".six {text-decoration: underline overline;}" - text run at (344,80) width 0: " " - text run at (0,96) width 464: ".seven {text-decoration: underline overline line-through;}" - text run at (464,96) width 0: " " - text run at (0,112) width 0: " " - LayoutBlockFlow {P} at (0,195) size 769x20 - LayoutText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "This sentence should be underlined." - LayoutBlockFlow {P} at (0,231) size 769x20 - LayoutText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "This sentence should be overlined." - LayoutBlockFlow {P} at (0,267) size 769x20 - LayoutText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This sentence should have stricken text (linethrough)." - LayoutBlockFlow {P} at (0,303) size 769x20 - LayoutText {#text} at (0,0) size 559x19 - text run at (0,0) width 195: "This element should be blinking. " - text run at (195,0) width 364: "(It is not required, however, that UAs support this behavior.)" - LayoutBlockFlow {P} at (0,339) size 769x40 - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 273: "The text in this element should be underlined. " - text run at (273,0) width 205: "The boldfaced text in this element " - LayoutInline {B} at (0,0) size 168x19 - LayoutText {#text} at (478,0) size 168x19 - text run at (478,0) width 168: "should also be underlined" - LayoutText {#text} at (646,0) size 767x39 - text run at (646,0) width 8: ". " - text run at (654,0) width 113: "This is because the" - text run at (0,20) width 600: "parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - LayoutBlockFlow {P} at (0,395) size 769x20 - LayoutText {#text} at (0,0) size 298x19 - text run at (0,0) width 298: "This sentence should be underlined and overlined." - LayoutBlockFlow {P} at (0,431) size 769x20 - LayoutText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This sentence should be underlined, overlined, and stricken." - LayoutBlockFlow {P} at (0,467) size 769x0 - LayoutBlockFlow {P} at (0,467) size 769x40 - LayoutText {#text} at (0,0) size 739x39 - text run at (0,0) width 739: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with class of" - text run at (0,20) width 43: "seven)." - LayoutBlockFlow {P} at (0,523) size 769x40 - LayoutText {#text} at (0,0) size 603x19 - text run at (0,0) width 603: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - LayoutInline {EM} at (0,0) size 22x19 - LayoutText {#text} at (602,0) size 22x19 - text run at (602,0) width 22: "not" - LayoutText {#text} at (623,0) size 86x19 - text run at (623,0) width 86: " be overlined: " - LayoutImage {IMG} at (708.88,0) size 15x15 - LayoutText {#text} at (723,0) size 755x39 - text run at (723,0) width 9: ". " - text run at (731,0) width 24: "The" - text run at (0,20) width 726: "underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child elements." - LayoutBlockFlow {P} at (0,579) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 95x19 - text run at (0,0) width 95: "The underlining " - LayoutInline {SPAN} at (0,0) size 90x19 [color=#0000FF] - LayoutText {#text} at (95,0) size 90x19 - text run at (95,0) width 90: "in this sentence" - LayoutText {#text} at (185,0) size 223x19 - text run at (185,0) width 223: " should be green, no matter what the " - LayoutInline {SPAN} at (0,0) size 105x19 [color=#000000] - LayoutText {#text} at (408,0) size 105x19 - text run at (408,0) width 105: "text color may be" - LayoutText {#text} at (513,0) size 4x19 - text run at (513,0) width 4: "." - LayoutBlockFlow {P} at (0,615) size 769x40 - LayoutText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "The colors of the " - LayoutInline {SPAN} at (0,0) size 64x19 [color=#800080] - LayoutText {#text} at (106,0) size 64x19 - text run at (106,0) width 64: "underlining" - LayoutText {#text} at (170,0) size 18x19 - text run at (170,0) width 18: " in " - LayoutInline {SPAN} at (0,0) size 76x19 [color=#0000FF] - LayoutText {#text} at (188,0) size 76x19 - text run at (188,0) width 76: "this sentence" - LayoutText {#text} at (264,0) size 66x19 - text run at (264,0) width 66: " should be " - LayoutInline {SPAN} at (0,0) size 202x19 [color=#808080] - LayoutText {#text} at (330,0) size 202x19 - text run at (330,0) width 202: "the same as that of the parent text" - LayoutText {#text} at (532,0) size 760x39 - text run at (532,0) width 228: " (that is, the first word in the sentence," - text run at (0,20) width 143: "which should be black)." - LayoutTable {TABLE} at (0,671) size 769x518 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x516 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x488 - LayoutTableCell {TD} at (0,258) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x488 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 213x19 - text run at (0,0) width 213: "This sentence should be underlined." - LayoutBlockFlow {P} at (4,40) size 747x20 - LayoutText {#text} at (0,0) size 206x19 - text run at (0,0) width 206: "This sentence should be overlined." - LayoutBlockFlow {P} at (4,76) size 747x20 - LayoutText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This sentence should have stricken text (linethrough)." - LayoutBlockFlow {P} at (4,112) size 747x20 - LayoutText {#text} at (0,0) size 559x19 - text run at (0,0) width 195: "This element should be blinking. " - text run at (195,0) width 364: "(It is not required, however, that UAs support this behavior.)" - LayoutBlockFlow {P} at (4,148) size 747x40 - LayoutText {#text} at (0,0) size 478x19 - text run at (0,0) width 273: "The text in this element should be underlined. " - text run at (273,0) width 205: "The boldfaced text in this element " - LayoutInline {B} at (0,0) size 168x19 - LayoutText {#text} at (478,0) size 168x19 - text run at (478,0) width 168: "should also be underlined" - LayoutText {#text} at (646,0) size 745x39 - text run at (646,0) width 8: ". " - text run at (654,0) width 91: "This is because" - text run at (0,20) width 622: "the parent's underline will 'span' the boldfaced text, even if the inline element has no underline of its own." - LayoutBlockFlow {P} at (4,204) size 747x20 - LayoutText {#text} at (0,0) size 298x19 - text run at (0,0) width 298: "This sentence should be underlined and overlined." - LayoutBlockFlow {P} at (4,240) size 747x20 - LayoutText {#text} at (0,0) size 357x19 - text run at (0,0) width 357: "This sentence should be underlined, overlined, and stricken." - LayoutBlockFlow {P} at (4,276) size 747x0 - LayoutBlockFlow {P} at (4,276) size 747x40 - LayoutText {#text} at (0,0) size 739x39 - text run at (0,0) width 739: "There should be nothing visible between this sentence and the one above (there is an empty paragraph element with class of" - text run at (0,20) width 43: "seven)." - LayoutBlockFlow {P} at (4,332) size 747x60 - LayoutText {#text} at (0,0) size 603x19 - text run at (0,0) width 603: "Text decorations only apply to the text of an element, so the image at the end of this sentence should " - LayoutInline {EM} at (0,0) size 22x19 - LayoutText {#text} at (602,0) size 22x19 - text run at (602,0) width 22: "not" - LayoutText {#text} at (623,0) size 86x19 - text run at (623,0) width 86: " be overlined: " - LayoutImage {IMG} at (708.88,0) size 15x15 - LayoutText {#text} at (723,0) size 728x59 - text run at (723,0) width 5: "." - text run at (0,20) width 693: "The underline of the parent element should hold true beneath the image, however, since text-decoration 'spans' child" - text run at (0,40) width 56: "elements." - LayoutBlockFlow {P} at (4,408) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 95x19 - text run at (0,0) width 95: "The underlining " - LayoutInline {SPAN} at (0,0) size 90x19 [color=#0000FF] - LayoutText {#text} at (95,0) size 90x19 - text run at (95,0) width 90: "in this sentence" - LayoutText {#text} at (185,0) size 223x19 - text run at (185,0) width 223: " should be green, no matter what the " - LayoutInline {SPAN} at (0,0) size 105x19 [color=#000000] - LayoutText {#text} at (408,0) size 105x19 - text run at (408,0) width 105: "text color may be" - LayoutText {#text} at (513,0) size 4x19 - text run at (513,0) width 4: "." - LayoutBlockFlow {P} at (4,444) size 747x40 - LayoutText {#text} at (0,0) size 106x19 - text run at (0,0) width 106: "The colors of the " - LayoutInline {SPAN} at (0,0) size 64x19 [color=#800080] - LayoutText {#text} at (106,0) size 64x19 - text run at (106,0) width 64: "underlining" - LayoutText {#text} at (170,0) size 18x19 - text run at (170,0) width 18: " in " - LayoutInline {SPAN} at (0,0) size 76x19 [color=#0000FF] - LayoutText {#text} at (188,0) size 76x19 - text run at (188,0) width 76: "this sentence" - LayoutText {#text} at (264,0) size 66x19 - text run at (264,0) width 66: " should be " - LayoutInline {SPAN} at (0,0) size 202x19 [color=#808080] - LayoutText {#text} at (330,0) size 202x19 - text run at (330,0) width 202: "the same as that of the parent text" - LayoutText {#text} at (532,0) size 700x39 - text run at (532,0) width 168: " (that is, the first word in the" - text run at (0,20) width 203: "sentence, which should be black)." -layer at (8,185) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,177) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_indent-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_indent-expected.png deleted file mode 100644 index d44b1d1..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_indent-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt deleted file mode 100644 index 0a5fff13..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_indent-expected.txt +++ /dev/null
@@ -1,137 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1329 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1329 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1329 - LayoutBlockFlow {BODY} at (8,8) size 769x1313 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 384x176 - text run at (0,0) width 352: ".one {text-indent: 0.5in; background: aqua;}" - text run at (352,0) width 0: " " - text run at (0,16) width 336: ".two {text-indent: 2cm; background: aqua;}" - text run at (336,16) width 0: " " - text run at (0,32) width 360: ".three {text-indent: 20mm; background: aqua;}" - text run at (360,32) width 0: " " - text run at (0,48) width 352: ".four {text-indent: 24pt; background: aqua;}" - text run at (352,48) width 0: " " - text run at (0,64) width 344: ".five {text-indent: 2pc; background: aqua;}" - text run at (344,64) width 0: " " - text run at (0,80) width 336: ".six {text-indent: 2em; background: aqua;}" - text run at (336,80) width 0: " " - text run at (0,96) width 352: ".seven {text-indent: 2ex; background: aqua;}" - text run at (352,96) width 0: " " - text run at (0,112) width 352: ".eight {text-indent: 50%; background: aqua;}" - text run at (352,112) width 0: " " - text run at (0,128) width 352: ".nine {text-indent: 25px; background: aqua;}" - text run at (352,128) width 0: " " - text run at (0,144) width 384: "blockquote {text-indent: 50%; background: aqua;}" - text run at (384,144) width 0: " " - text run at (0,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 361x19 - text run at (48,0) width 361: "The first line of this sentence should be indented half an inch." - LayoutBlockFlow {P} at (0,279) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 390x19 - text run at (75,0) width 390: "The first line of this sentence should be indented two centimeters." - LayoutBlockFlow {P} at (0,315) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 402x19 - text run at (75,0) width 402: "The first line of this sentence should be indented twenty millimeters." - LayoutBlockFlow {P} at (0,351) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 404x19 - text run at (32,0) width 404: "The first line of this sentence should be indented twenty-four points." - LayoutBlockFlow {P} at (0,387) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 352x19 - text run at (32,0) width 352: "The first line of this sentence should be indented two picas." - LayoutBlockFlow {P} at (0,423) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 339x19 - text run at (32,0) width 339: "The first line of this sentence should be indented two em." - LayoutBlockFlow {P} at (0,459) size 769x20 [bgcolor=#00FFFF] - LayoutText {#text} at (14,0) size 335x19 - text run at (14,0) width 335: "The first line of this sentence should be indented two ex." - LayoutBlockFlow {P} at (0,495) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (384,0) size 764x39 - text run at (384,0) width 380: "The first line of this sentence should be indented halfway across" - text run at (0,20) width 483: "the page, but the rest of it should be flush with the normal left margin of the page." - LayoutBlockFlow {P} at (0,551) size 769x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 764x39 - text run at (25,0) width 739: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left margin of the" - text run at (0,20) width 33: "page." - LayoutBlockFlow {P} at (0,607) size 769x60 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 389x19 - text run at (48,0) width 389: "Only the first line of this sentence should be indented half an inch," - LayoutBR {BR} at (437,15) size 0x0 - LayoutText {#text} at (0,20) size 246x19 - text run at (0,20) width 246: "no matter where the lines might start, and" - LayoutBR {BR} at (246,35) size 0x0 - LayoutInline {EM} at (0,0) size 201x19 - LayoutText {#text} at (0,40) size 201x19 - text run at (0,40) width 201: "regardless of any other markup" - LayoutText {#text} at (200,40) size 140x19 - text run at (200,40) width 140: " which may be present." - LayoutBlockFlow {BLOCKQUOTE} at (40,683) size 689x60 [bgcolor=#00FFFF] - LayoutText {#text} at (384,0) size 614x59 - text run at (384,0) width 210: "In the first half of the test page, this" - text run at (0,20) width 614: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,40) width 480: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." - LayoutTable {TABLE} at (0,759) size 769x554 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x552 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x524 - LayoutTableCell {TD} at (0,276) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x524 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 361x19 - text run at (48,0) width 361: "The first line of this sentence should be indented half an inch." - LayoutBlockFlow {P} at (4,40) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 390x19 - text run at (75,0) width 390: "The first line of this sentence should be indented two centimeters." - LayoutBlockFlow {P} at (4,76) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (75,0) size 402x19 - text run at (75,0) width 402: "The first line of this sentence should be indented twenty millimeters." - LayoutBlockFlow {P} at (4,112) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 404x19 - text run at (32,0) width 404: "The first line of this sentence should be indented twenty-four points." - LayoutBlockFlow {P} at (4,148) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 352x19 - text run at (32,0) width 352: "The first line of this sentence should be indented two picas." - LayoutBlockFlow {P} at (4,184) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (32,0) size 339x19 - text run at (32,0) width 339: "The first line of this sentence should be indented two em." - LayoutBlockFlow {P} at (4,220) size 747x20 [bgcolor=#00FFFF] - LayoutText {#text} at (14,0) size 335x19 - text run at (14,0) width 335: "The first line of this sentence should be indented two ex." - LayoutBlockFlow {P} at (4,256) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (373,0) size 710x39 - text run at (373,0) width 337: "The first line of this sentence should be indented halfway" - text run at (0,20) width 526: "across the page, but the rest of it should be flush with the normal left margin of the page." - LayoutBlockFlow {P} at (4,312) size 747x40 [bgcolor=#00FFFF] - LayoutText {#text} at (25,0) size 742x39 - text run at (25,0) width 717: "The first line of this sentence should be indented 25 pixels, but the rest of it should be flush with the normal left margin of" - text run at (0,20) width 55: "the page." - LayoutBlockFlow {P} at (4,368) size 747x60 [bgcolor=#00FFFF] - LayoutText {#text} at (48,0) size 389x19 - text run at (48,0) width 389: "Only the first line of this sentence should be indented half an inch," - LayoutBR {BR} at (437,15) size 0x0 - LayoutText {#text} at (0,20) size 246x19 - text run at (0,20) width 246: "no matter where the lines might start, and" - LayoutBR {BR} at (246,35) size 0x0 - LayoutInline {EM} at (0,0) size 201x19 - LayoutText {#text} at (0,40) size 201x19 - text run at (0,40) width 201: "regardless of any other markup" - LayoutText {#text} at (200,40) size 140x19 - text run at (200,40) width 140: " which may be present." - LayoutBlockFlow {BLOCKQUOTE} at (44,444) size 667x60 [bgcolor=#00FFFF] - LayoutText {#text} at (373,0) size 614x59 - text run at (373,0) width 210: "In the first half of the test page, this" - text run at (0,20) width 614: "BLOCKQUOTE element should have a text indent equal to 50% of the BODY element's width, since" - text run at (0,40) width 480: "BLOCKQUOTE is a child of BODY; in the second half, it is a child of TABLE." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.png deleted file mode 100644 index 7e83f39..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt deleted file mode 100644 index a074378b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/text_transform-expected.txt +++ /dev/null
@@ -1,105 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 745 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x745 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x745 - LayoutBlockFlow {BODY} at (8,8) size 769x729 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x80 - LayoutText {#text} at (0,0) size 272x80 - text run at (0,0) width 224: ".ttn {text-transform: none;}" - text run at (224,0) width 0: " " - text run at (0,16) width 272: ".cap {text-transform: capitalize;}" - text run at (272,16) width 0: " " - text run at (0,32) width 264: ".upp {text-transform: uppercase;}" - text run at (264,32) width 0: " " - text run at (0,48) width 264: ".low {text-transform: lowercase;}" - text run at (264,48) width 0: " " - text run at (0,64) width 0: " " - LayoutBlockFlow {P} at (0,147) size 769x20 - LayoutText {#text} at (0,0) size 740x19 - text run at (0,0) width 740: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear normal." - LayoutBlockFlow {P} at (0,183) size 769x60 - LayoutText {#text} at (0,0) size 762x59 - text run at (0,0) width 762: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That Are In" - text run at (0,20) width 744: "Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-Breaking Space" - text run at (0,40) width 420: "(&Nbsp;). Both Those Characters Appear In The Previous Sentence." - LayoutBlockFlow {P} at (0,259) size 769x40 - LayoutText {#text} at (0,0) size 765x39 - text run at (0,0) width 765: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this sentence" - text run at (0,20) width 233: "should have one, and only one, capital " - LayoutInline {SPAN} at (0,0) size 36x19 - LayoutText {#text} at (233,20) size 16x19 - text run at (233,20) width 16: "Le" - LayoutInline {SPAN} at (0,0) size 8x19 - LayoutText {#text} at (249,20) size 8x19 - text run at (249,20) width 8: "tt" - LayoutText {#text} at (257,20) size 12x19 - text run at (257,20) width 12: "er" - LayoutText {#text} at (269,20) size 4x19 - text run at (269,20) width 4: "." - LayoutBlockFlow {P} at (0,315) size 769x60 - LayoutText {#text} at (0,0) size 748x39 - text run at (0,0) width 748: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5}) SHOULD" - text run at (0,20) width 272: "THEREFORE APPEAR IN UPPERCASE. " - text run at (272,20) width 269: "IN THE LAST SENTENCE, HOWEVER, " - LayoutInline {SPAN} at (0,0) size 742x39 - LayoutText {#text} at (541,20) size 742x39 - text run at (541,20) width 201: "the last eight words should not be" - text run at (0,40) width 62: "uppercase" - LayoutText {#text} at (62,40) size 4x19 - text run at (62,40) width 4: "." - LayoutBlockFlow {P} at (0,391) size 769x20 - LayoutText {#text} at (0,0) size 700x19 - text run at (0,0) width 700: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." - LayoutTable {TABLE} at (0,427) size 769x302 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x300 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x272 - LayoutTableCell {TD} at (0,150) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x272 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 740x19 - text run at (0,0) width 740: "This page tests the 'text-transform' property of CSS1. This paragraph has no text transformation and should appear normal." - LayoutBlockFlow {P} at (4,40) size 747x60 - LayoutText {#text} at (0,0) size 746x59 - text run at (0,0) width 746: "This Paragraph Is Capitalized And The First Letter In Each Word Should Therefore Appear In Uppercase. Words That Are" - text run at (0,20) width 664: "In Uppercase In The Source (E.G. USA) Should Remain So. There Should Be A Capital Letter After A Non-" - text run at (0,40) width 520: "Breaking Space (&Nbsp;). Both Those Characters Appear In The Previous Sentence." - LayoutBlockFlow {P} at (4,116) size 747x40 - LayoutText {#text} at (0,0) size 709x39 - text run at (0,0) width 709: "Words with inline elements inside them should only capitalize the first letter of the word. Therefore, the last word in this" - text run at (0,20) width 289: "sentence should have one, and only one, capital " - LayoutInline {SPAN} at (0,0) size 36x19 - LayoutText {#text} at (289,20) size 16x19 - text run at (289,20) width 16: "Le" - LayoutInline {SPAN} at (0,0) size 8x19 - LayoutText {#text} at (305,20) size 8x19 - text run at (305,20) width 8: "tt" - LayoutText {#text} at (313,20) size 12x19 - text run at (313,20) width 12: "er" - LayoutText {#text} at (325,20) size 4x19 - text run at (325,20) width 4: "." - LayoutBlockFlow {P} at (4,172) size 747x60 - LayoutText {#text} at (0,0) size 681x39 - text run at (0,0) width 681: "THIS PARAGRAPH IS UPPERCASED AND SMALL CHARACTERS IN THE SOURCE (E.G. A AND \x{C5})" - text run at (0,20) width 339: "SHOULD THEREFORE APPEAR IN UPPERCASE. " - text run at (339,20) width 269: "IN THE LAST SENTENCE, HOWEVER, " - LayoutInline {SPAN} at (0,0) size 724x39 - LayoutText {#text} at (608,20) size 724x39 - text run at (608,20) width 116: "the last eight words" - text run at (0,40) width 147: "should not be uppercase" - LayoutText {#text} at (147,40) size 4x19 - text run at (147,40) width 4: "." - LayoutBlockFlow {P} at (4,248) size 747x20 - LayoutText {#text} at (0,0) size 700x19 - text run at (0,0) width 700: "this paragraph is lowercased and capital characters in the source (e.g. a and \x{E5}) should therefore appear in lowercase." -layer at (8,137) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png deleted file mode 100644 index 89dbb74..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/vertical_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt deleted file mode 100644 index 8722c3c..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/vertical_align-expected.txt +++ /dev/null
@@ -1,717 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4501 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4501 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4501.31 - LayoutBlockFlow {BODY} at (8,8) size 769x4485.31 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x288 - LayoutText {#text} at (0,0) size 512x288 - text run at (0,0) width 160: "P {font-size: 12pt;}" - text run at (160,0) width 0: " " - text run at (0,16) width 216: ".one {vertical-align: sub;}" - text run at (216,16) width 0: " " - text run at (0,32) width 232: ".two {vertical-align: super;}" - text run at (232,32) width 0: " " - text run at (0,48) width 368: ".three {vertical-align: top; font-size: 12pt;}" - text run at (368,48) width 0: " " - text run at (0,64) width 400: ".four {vertical-align: text-top; font-size: 12pt;}" - text run at (400,64) width 0: " " - text run at (0,80) width 384: ".five {vertical-align: middle; font-size: 12pt;}" - text run at (384,80) width 0: " " - text run at (0,96) width 376: ".six {vertical-align: bottom; font-size: 12pt;}" - text run at (376,96) width 0: " " - text run at (0,112) width 432: ".seven {vertical-align: text-bottom; font-size: 12pt;}" - text run at (432,112) width 0: " " - text run at (0,128) width 408: ".eight {vertical-align: baseline; font-size: 12pt;}" - text run at (408,128) width 0: " " - text run at (0,144) width 512: ".nine {vertical-align: 50%; font-size: 12px; line-height: 16px;}" - text run at (512,144) width 0: " " - text run at (0,160) width 0: " " - text run at (0,176) width 224: "P.example {font-size: 14pt;}" - text run at (224,176) width 0: " " - text run at (0,192) width 176: "BIG {font-size: 16pt;}" - text run at (176,192) width 0: " " - text run at (0,208) width 192: "SMALL {font-size: 12pt;}" - text run at (192,208) width 0: " " - text run at (0,224) width 304: ".ttopalign {vertical-align: text-top;}" - text run at (304,224) width 0: " " - text run at (0,240) width 256: ".topalign {vertical-align: top;}" - text run at (256,240) width 0: " " - text run at (0,256) width 280: ".midalign {vertical-align: middle;}" - text run at (280,256) width 0: " " - text run at (0,272) width 0: " " - LayoutBlockFlow {P} at (0,355) size 769x79 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (15,39) size 119x19 - text run at (15,39) width 119: "The first four words" - LayoutText {#text} at (134,35) size 767x43 - text run at (134,35) width 270: " in this sentence should be subscript-aligned. " - text run at (404,35) width 363: "The font size of the superscripted text should not be different" - text run at (0,59) width 188: "from that of the parent element." - LayoutBlockFlow {P} at (0,450) size 769x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (15,29) size 119x19 - text run at (15,29) width 119: "The first four words" - LayoutText {#text} at (134,35) size 767x39 - text run at (134,35) width 282: " in this sentence should be superscript-aligned. " - text run at (416,35) width 351: "The font size of the subscripted text should not be different" - text run at (0,55) width 188: "from that of the parent element." - LayoutBlockFlow {P} at (0,541) size 769x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (15,0) size 119x19 - text run at (15,0) width 119: "The first four words" - LayoutText {#text} at (134,35) size 757x39 - text run at (134,35) width 623: " in this sentence should be top-aligned, which will align their tops with the top of the tallest element in the" - text run at (0,55) width 217: "line (probably the orange rectangle)." - LayoutBlockFlow {P} at (0,632) size 769x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 764x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (19,22) size 119x19 - text run at (19,22) width 119: "The first four words" - LayoutText {#text} at (138,22) size 764x110 - text run at (138,22) width 626: " in this sentence should be text-top-aligned, which" - text run at (0,59) width 733: "should align their tops with the top of the tallest text in the" - text run at (0,96) width 55: "line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,781) size 769x70 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 756x56 - text run at (15,13) width 741: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point defined as" - text run at (0,50) width 227: "the text baseline plus half the x-height." - LayoutBlockFlow {P} at (0,867) size 769x124 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 716x123 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (19,30) size 119x19 - text run at (19,30) width 119: "The first four words" - LayoutText {#text} at (138,0) size 716x123 - text run at (138,0) width 532: " in this sentence should be 12pt in size and" - text run at (0,50) width 716: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 506: "bottom of the lowest element in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1007) size 769x161 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 718x160 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 276x19 - LayoutText {#text} at (19,16) size 276x19 - text run at (19,16) width 276: "The first eight words (\"eight\" has a descender)" - LayoutText {#text} at (295,0) size 718x160 - text run at (295,0) width 423: " in this sentence should be 12pt in" - text run at (0,50) width 675: "size and text-bottom-aligned, which should align their" - text run at (0,87) width 657: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 288: "descenders) in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1184) size 769x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 742x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (19,35) size 119x19 - text run at (19,35) width 119: "The first four words" - LayoutText {#text} at (138,22) size 742x110 - text run at (138,22) width 532: " in this sentence should be 12pt in size and" - text run at (0,59) width 742: "baseline-aligned, which should align their baseline with the" - text run at (0,96) width 511: "baseline of the rest of the text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1333) size 769x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 98x15 - LayoutText {#text} at (15,30) size 98x15 - text run at (15,30) width 98: "The first four words" - LayoutText {#text} at (113,35) size 760x39 - text run at (113,35) width 647: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned, which" - text run at (0,55) width 316: "should raise them 8px relative to the natural baseline." - LayoutBlockFlow {P} at (0,1424) size 769x40 - LayoutText {#text} at (0,0) size 761x39 - text run at (0,0) width 761: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first section of" - text run at (0,20) width 561: "text, whereas any size text should be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (0,1482.66) size 769x328 - LayoutText {#text} at (0,27) size 117x21 - text run at (0,27) width 117: "This paragraph " - LayoutImage {IMG} at (117,27) size 9x30 - LayoutText {#text} at (126,27) size 5x21 - text run at (126,27) width 5: " " - LayoutInline {SPAN} at (0,0) size 413x53 - LayoutText {#text} at (131,1) size 413x53 - text run at (131,1) width 413: "contains many images" - LayoutText {#text} at (544,27) size 5x21 - text run at (544,27) width 5: " " - LayoutImage {IMG} at (549,27) size 15x50 - LayoutText {#text} at (564,27) size 5x21 - text run at (564,27) width 5: " " - LayoutInline {BIG} at (0,0) size 148x23 - LayoutText {#text} at (569,25) size 148x23 - text run at (569,25) width 148: "of varying heights" - LayoutText {#text} at (717,27) size 5x21 - text run at (717,27) width 5: " " - LayoutImage {IMG} at (722,27) size 3x10 - LayoutText {#text} at (725,27) size 5x21 - text run at (725,27) width 5: " " - LayoutInline {SMALL} at (0,0) size 752x117 - LayoutText {#text} at (730,28) size 752x117 - text run at (730,28) width 22: "and" - text run at (0,126) width 39: "widths" - LayoutText {#text} at (39,125) size 5x21 - text run at (39,125) width 5: " " - LayoutImage {IMG} at (44,125) size 6x20 - LayoutText {#text} at (50,125) size 96x21 - text run at (50,125) width 96: " all of which " - LayoutImage {IMG} at (146,125) size 19.50x65 - LayoutText {#text} at (165,125) size 6x21 - text run at (165,125) width 6: " " - LayoutInline {SPAN} at (0,0) size 255x42 - LayoutText {#text} at (170,108) size 255x42 - text run at (170,108) width 255: "should be aligned" - LayoutText {#text} at (424,125) size 6x21 - text run at (424,125) width 6: " " - LayoutImage {IMG} at (429.50,125) size 10.50x35 - LayoutText {#text} at (440,125) size 119x21 - text run at (440,125) width 119: " with the top of " - LayoutImage {IMG} at (559,125) size 9x30 - LayoutText {#text} at (568,125) size 5x21 - text run at (568,125) width 5: " " - LayoutInline {SPAN} at (0,0) size 685x146 - LayoutText {#text} at (573,115) size 19x33 - text run at (573,115) width 19: "a " - LayoutInline {SPAN} at (0,0) size 685x193 - LayoutText {#text} at (592,78) size 685x193 - text run at (592,78) width 93: "14-" - text run at (0,191) width 142: "point" - LayoutText {#text} at (142,228) size 142x33 - text run at (142,228) width 142: " text element" - LayoutText {#text} at (284,238) size 5x21 - text run at (284,238) width 5: " " - LayoutImage {IMG} at (289,238) size 15x50 - LayoutText {#text} at (304,238) size 5x21 - text run at (304,238) width 5: " " - LayoutInline {SMALL} at (0,0) size 176x19 - LayoutText {#text} at (309,239) size 176x19 - text run at (309,239) width 176: "regardless of the line in which" - LayoutText {#text} at (485,238) size 5x21 - text run at (485,238) width 5: " " - LayoutImage {IMG} at (490,238) size 4.50x15 - LayoutText {#text} at (494,238) size 6x21 - text run at (494,238) width 6: " " - LayoutInline {BIG} at (0,0) size 152x23 - LayoutText {#text} at (499,236) size 152x23 - text run at (499,236) width 152: "the images appear." - LayoutText {#text} at (650,238) size 6x21 - text run at (650,238) width 6: " " - LayoutImage {IMG} at (655.31,238) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,1829.31) size 769x40 - LayoutText {#text} at (0,0) size 751x39 - text run at (0,0) width 751: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be aligned" - text run at (0,20) width 292: "with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (0,1885.31) size 769x233 - LayoutText {#text} at (0,22) size 94x19 - text run at (0,22) width 94: "This paragraph " - LayoutImage {IMG} at (94,19) size 9x30 - LayoutText {#text} at (103,22) size 4x19 - text run at (103,22) width 4: " " - LayoutInline {SPAN} at (0,0) size 352x46 - LayoutText {#text} at (107,1) size 352x46 - text run at (107,1) width 352: "contains many images" - LayoutText {#text} at (459,22) size 4x19 - text run at (459,22) width 4: " " - LayoutImage {IMG} at (463,9) size 15x50 - LayoutText {#text} at (478,22) size 112x19 - text run at (478,22) width 112: " of varying heights " - LayoutImage {IMG} at (590,29) size 3x10 - LayoutText {#text} at (593,22) size 4x19 - text run at (593,22) width 4: " " - LayoutInline {SMALL} at (0,0) size 65x19 - LayoutText {#text} at (597,22) size 65x19 - text run at (597,22) width 65: "and widths" - LayoutText {#text} at (662,22) size 4x19 - text run at (662,22) width 4: " " - LayoutImage {IMG} at (666,24) size 6x20 - LayoutText {#text} at (672,22) size 76x19 - text run at (672,22) width 76: " all of which " - LayoutImage {IMG} at (748,1) size 19.50x65 - LayoutText {#text} at (0,106) size 108x19 - text run at (0,106) width 108: "should be aligned " - LayoutImage {IMG} at (108,100) size 10.50x35 - LayoutText {#text} at (118,106) size 5x19 - text run at (118,106) width 5: " " - LayoutInline {SPAN} at (0,0) size 232x36 - LayoutText {#text} at (122,93) size 232x36 - text run at (122,93) width 232: "with the middle of" - LayoutText {#text} at (353,106) size 5x19 - text run at (353,106) width 5: " " - LayoutImage {IMG} at (357.50,93) size 15x50 - LayoutText {#text} at (372,106) size 5x19 - text run at (372,106) width 5: " " - LayoutInline {SPAN} at (0,0) size 346x27 - LayoutText {#text} at (376,100) size 18x27 - text run at (376,100) width 18: "a " - LayoutInline {SPAN} at (0,0) size 204x68 - LayoutText {#text} at (393,67) size 204x68 - text run at (393,67) width 204: "14-point" - LayoutText {#text} at (596,100) size 126x27 - text run at (596,100) width 126: " text element" - LayoutText {#text} at (721,106) size 5x19 - text run at (721,106) width 5: " " - LayoutImage {IMG} at (725.50,93) size 15x50 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SMALL} at (0,0) size 176x19 - LayoutText {#text} at (0,176) size 176x19 - text run at (0,176) width 176: "regardless of the line in which" - LayoutText {#text} at (176,176) size 4x19 - text run at (176,176) width 4: " " - LayoutImage {IMG} at (180,180) size 4.50x15 - LayoutText {#text} at (184,176) size 5x19 - text run at (184,176) width 5: " " - LayoutInline {BIG} at (0,0) size 152x23 - LayoutText {#text} at (188,173) size 152x23 - text run at (188,173) width 152: "the images appear." - LayoutText {#text} at (339,176) size 5x19 - text run at (339,176) width 5: " " - LayoutImage {IMG} at (343.31,143) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (0,2134.31) size 769x40 - LayoutText {#text} at (0,0) size 753x39 - text run at (0,0) width 753: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that element is" - text run at (0,20) width 101: "an image or not. " - text run at (101,20) width 532: "Each fragment of text has been SPANned appropriately in order to cause this to happen." - LayoutBlockFlow {P} at (0,2190.31) size 769x203 - LayoutInline {SPAN} at (0,0) size 90x19 - LayoutText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "This paragraph" - LayoutText {#text} at (90,0) size 4x19 - text run at (90,0) width 4: " " - LayoutImage {IMG} at (94,0) size 3x10 - LayoutText {#text} at (97,0) size 4x19 - text run at (97,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 352x46 - LayoutText {#text} at (101,1) size 352x46 - text run at (101,1) width 352: "contains many images" - LayoutText {#text} at (453,0) size 4x19 - text run at (453,0) width 4: " " - LayoutImage {IMG} at (457,0) size 3x10 - LayoutText {#text} at (460,0) size 4x19 - text run at (460,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 84x19 - LayoutText {#text} at (464,0) size 84x19 - text run at (464,0) width 84: "and some text" - LayoutText {#text} at (548,0) size 4x19 - text run at (548,0) width 4: " " - LayoutImage {IMG} at (552,0) size 3x10 - LayoutText {#text} at (555,0) size 4x19 - text run at (555,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 104x19 - LayoutText {#text} at (559,0) size 104x19 - text run at (559,0) width 104: "of varying heights" - LayoutText {#text} at (663,0) size 4x19 - text run at (663,0) width 4: " " - LayoutImage {IMG} at (667,0) size 3x10 - LayoutText {#text} at (670,0) size 4x19 - text run at (670,0) width 4: " " - LayoutInline {BIG} at (0,0) size 89x23 - LayoutText {#text} at (674,0) size 89x23 - text run at (674,0) width 89: "and widths" - LayoutText {#text} at (763,0) size 4x19 - text run at (763,0) width 4: " " - LayoutImage {IMG} at (0,48) size 6x20 - LayoutText {#text} at (6,48) size 4x19 - text run at (6,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 68x19 - LayoutText {#text} at (10,48) size 68x19 - text run at (10,48) width 68: "all of which" - LayoutText {#text} at (78,48) size 4x19 - text run at (78,48) width 4: " " - LayoutImage {IMG} at (82,48) size 19.50x65 - LayoutText {#text} at (101,48) size 5x19 - text run at (101,48) width 5: " " - LayoutInline {SPAN} at (0,0) size 105x19 - LayoutText {#text} at (105,48) size 105x19 - text run at (105,48) width 105: "should be aligned" - LayoutText {#text} at (209,48) size 5x19 - text run at (209,48) width 5: " " - LayoutImage {IMG} at (213.50,48) size 10.50x35 - LayoutText {#text} at (224,48) size 4x19 - text run at (224,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 185x36 - LayoutText {#text} at (228,48) size 185x36 - text run at (228,48) width 185: "with the top of" - LayoutText {#text} at (413,48) size 4x19 - text run at (413,48) width 4: " " - LayoutImage {IMG} at (417,48) size 15x50 - LayoutText {#text} at (432,48) size 4x19 - text run at (432,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 120x19 - LayoutText {#text} at (436,48) size 120x19 - text run at (436,48) width 120: "the tallest element in" - LayoutText {#text} at (556,48) size 4x19 - text run at (556,48) width 4: " " - LayoutImage {IMG} at (560,48) size 4.50x15 - LayoutText {#text} at (564,48) size 5x19 - text run at (564,48) width 5: " " - LayoutInline {BIG} at (0,0) size 720x88 - LayoutText {#text} at (568,48) size 720x88 - text run at (568,48) width 152: "whichever line the" - text run at (0,113) width 136: "elements appear." - LayoutText {#text} at (135,113) size 5x19 - text run at (135,113) width 5: " " - LayoutImage {IMG} at (139.81,113) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,2409.31) size 769x2076 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2074 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x2046 - LayoutTableCell {TD} at (0,1037) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x2046.31 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x79 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (15,39) size 119x19 - text run at (15,39) width 119: "The first four words" - LayoutText {#text} at (134,35) size 714x43 - text run at (134,35) width 270: " in this sentence should be subscript-aligned. " - text run at (404,35) width 310: "The font size of the superscripted text should not be" - text run at (0,59) width 241: "different from that of the parent element." - LayoutBlockFlow {P} at (4,99) size 747x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (15,29) size 119x19 - text run at (15,29) width 119: "The first four words" - LayoutText {#text} at (134,35) size 714x39 - text run at (134,35) width 282: " in this sentence should be superscript-aligned. " - text run at (416,35) width 298: "The font size of the subscripted text should not be" - text run at (0,55) width 241: "different from that of the parent element." - LayoutBlockFlow {P} at (4,190) size 747x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (15,0) size 119x19 - text run at (15,0) width 119: "The first four words" - LayoutText {#text} at (134,35) size 735x39 - text run at (134,35) width 601: " in this sentence should be top-aligned, which will align their tops with the top of the tallest element in" - text run at (0,55) width 239: "the line (probably the orange rectangle)." - LayoutBlockFlow {P} at (4,281) size 747x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 739x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (19,22) size 119x19 - text run at (19,22) width 119: "The first four words" - LayoutText {#text} at (138,22) size 739x110 - text run at (138,22) width 542: " in this sentence should be text-top-aligned," - text run at (0,59) width 739: "which should align their tops with the top of the tallest text" - text run at (0,96) width 133: "in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,430) size 747x70 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 739x56 - text run at (15,13) width 724: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point defined" - text run at (0,50) width 244: "as the text baseline plus half the x-height." - LayoutBlockFlow {P} at (4,516) size 747x124 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 716x123 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (19,30) size 119x19 - text run at (19,30) width 119: "The first four words" - LayoutText {#text} at (138,0) size 716x123 - text run at (138,0) width 532: " in this sentence should be 12pt in size and" - text run at (0,50) width 716: "bottom-aligned, which should align their bottom with the" - text run at (0,87) width 506: "bottom of the lowest element in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,656) size 747x161 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,13) size 4x19 - text run at (15,13) width 4: " " - LayoutInline {SPAN} at (0,0) size 718x160 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 276x19 - LayoutText {#text} at (19,16) size 276x19 - text run at (19,16) width 276: "The first eight words (\"eight\" has a descender)" - LayoutText {#text} at (295,0) size 718x160 - text run at (295,0) width 423: " in this sentence should be 12pt in" - text run at (0,50) width 675: "size and text-bottom-aligned, which should align their" - text run at (0,87) width 657: "bottom with the bottom of the lowest text (including" - text run at (0,124) width 288: "descenders) in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,833) size 747x133 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutText {#text} at (15,35) size 4x19 - text run at (15,35) width 4: " " - LayoutInline {SPAN} at (0,0) size 742x110 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SPAN} at (0,0) size 119x19 - LayoutText {#text} at (19,35) size 119x19 - text run at (19,35) width 119: "The first four words" - LayoutText {#text} at (138,22) size 742x110 - text run at (138,22) width 532: " in this sentence should be 12pt in size and" - text run at (0,59) width 742: "baseline-aligned, which should align their baseline with the" - text run at (0,96) width 511: "baseline of the rest of the text in the line." - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,982) size 747x75 - LayoutImage {IMG} at (0,0) size 15x50 - LayoutInline {SPAN} at (0,0) size 98x15 - LayoutText {#text} at (15,30) size 98x15 - text run at (15,30) width 98: "The first four words" - LayoutText {#text} at (113,35) size 721x39 - text run at (113,35) width 608: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," - text run at (0,55) width 355: "which should raise them 8px relative to the natural baseline." - LayoutBlockFlow {P} at (4,1073) size 747x40 - LayoutText {#text} at (0,0) size 745x39 - text run at (0,0) width 745: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first section" - text run at (0,20) width 577: "of text, whereas any size text should be aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (4,1131.66) size 747x328 - LayoutText {#text} at (0,27) size 117x21 - text run at (0,27) width 117: "This paragraph " - LayoutImage {IMG} at (117,27) size 9x30 - LayoutText {#text} at (126,27) size 5x21 - text run at (126,27) width 5: " " - LayoutInline {SPAN} at (0,0) size 413x53 - LayoutText {#text} at (131,1) size 413x53 - text run at (131,1) width 413: "contains many images" - LayoutText {#text} at (544,27) size 5x21 - text run at (544,27) width 5: " " - LayoutImage {IMG} at (549,27) size 15x50 - LayoutText {#text} at (564,27) size 5x21 - text run at (564,27) width 5: " " - LayoutInline {BIG} at (0,0) size 148x23 - LayoutText {#text} at (569,25) size 148x23 - text run at (569,25) width 148: "of varying heights" - LayoutText {#text} at (717,27) size 5x21 - text run at (717,27) width 5: " " - LayoutImage {IMG} at (722,27) size 3x10 - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {SMALL} at (0,0) size 65x19 - LayoutText {#text} at (0,126) size 65x19 - text run at (0,126) width 65: "and widths" - LayoutText {#text} at (65,125) size 5x21 - text run at (65,125) width 5: " " - LayoutImage {IMG} at (70,125) size 6x20 - LayoutText {#text} at (76,125) size 96x21 - text run at (76,125) width 96: " all of which " - LayoutImage {IMG} at (172,125) size 19.50x65 - LayoutText {#text} at (191,125) size 6x21 - text run at (191,125) width 6: " " - LayoutInline {SPAN} at (0,0) size 255x42 - LayoutText {#text} at (196,108) size 255x42 - text run at (196,108) width 255: "should be aligned" - LayoutText {#text} at (450,125) size 6x21 - text run at (450,125) width 6: " " - LayoutImage {IMG} at (455.50,125) size 10.50x35 - LayoutText {#text} at (466,125) size 119x21 - text run at (466,125) width 119: " with the top of " - LayoutImage {IMG} at (585,125) size 9x30 - LayoutText {#text} at (594,125) size 5x21 - text run at (594,125) width 5: " " - LayoutInline {SPAN} at (0,0) size 711x146 - LayoutText {#text} at (599,115) size 19x33 - text run at (599,115) width 19: "a " - LayoutInline {SPAN} at (0,0) size 711x193 - LayoutText {#text} at (618,78) size 711x193 - text run at (618,78) width 93: "14-" - text run at (0,191) width 142: "point" - LayoutText {#text} at (142,228) size 142x33 - text run at (142,228) width 142: " text element" - LayoutText {#text} at (284,238) size 5x21 - text run at (284,238) width 5: " " - LayoutImage {IMG} at (289,238) size 15x50 - LayoutText {#text} at (304,238) size 5x21 - text run at (304,238) width 5: " " - LayoutInline {SMALL} at (0,0) size 176x19 - LayoutText {#text} at (309,239) size 176x19 - text run at (309,239) width 176: "regardless of the line in which" - LayoutText {#text} at (485,238) size 5x21 - text run at (485,238) width 5: " " - LayoutImage {IMG} at (490,238) size 4.50x15 - LayoutText {#text} at (494,238) size 6x21 - text run at (494,238) width 6: " " - LayoutInline {BIG} at (0,0) size 152x23 - LayoutText {#text} at (499,236) size 152x23 - text run at (499,236) width 152: "the images appear." - LayoutText {#text} at (650,238) size 6x21 - text run at (650,238) width 6: " " - LayoutImage {IMG} at (655.31,238) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,1478.31) size 747x40 - LayoutText {#text} at (0,0) size 705x39 - text run at (0,0) width 705: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be" - text run at (0,20) width 338: "aligned with the text baseline (which is the default value)." - LayoutBlockFlow {P} at (4,1534.31) size 747x233 - LayoutText {#text} at (0,22) size 94x19 - text run at (0,22) width 94: "This paragraph " - LayoutImage {IMG} at (94,19) size 9x30 - LayoutText {#text} at (103,22) size 4x19 - text run at (103,22) width 4: " " - LayoutInline {SPAN} at (0,0) size 352x46 - LayoutText {#text} at (107,1) size 352x46 - text run at (107,1) width 352: "contains many images" - LayoutText {#text} at (459,22) size 4x19 - text run at (459,22) width 4: " " - LayoutImage {IMG} at (463,9) size 15x50 - LayoutText {#text} at (478,22) size 112x19 - text run at (478,22) width 112: " of varying heights " - LayoutImage {IMG} at (590,29) size 3x10 - LayoutText {#text} at (593,22) size 4x19 - text run at (593,22) width 4: " " - LayoutInline {SMALL} at (0,0) size 65x19 - LayoutText {#text} at (597,22) size 65x19 - text run at (597,22) width 65: "and widths" - LayoutText {#text} at (662,22) size 4x19 - text run at (662,22) width 4: " " - LayoutImage {IMG} at (666,24) size 6x20 - LayoutText {#text} at (672,22) size 72x19 - text run at (672,22) width 72: " all of which" - LayoutImage {IMG} at (0,78) size 19.50x65 - LayoutText {#text} at (19,99) size 113x19 - text run at (19,99) width 113: " should be aligned " - LayoutImage {IMG} at (131.50,93) size 10.50x35 - LayoutText {#text} at (142,99) size 4x19 - text run at (142,99) width 4: " " - LayoutInline {SPAN} at (0,0) size 231x36 - LayoutText {#text} at (146,86) size 231x36 - text run at (146,86) width 231: "with the middle of" - LayoutText {#text} at (377,99) size 4x19 - text run at (377,99) width 4: " " - LayoutImage {IMG} at (381,86) size 15x50 - LayoutText {#text} at (396,99) size 4x19 - text run at (396,99) width 4: " " - LayoutInline {SPAN} at (0,0) size 345x27 - LayoutText {#text} at (400,93) size 17x27 - text run at (400,93) width 17: "a " - LayoutInline {SPAN} at (0,0) size 203x68 - LayoutText {#text} at (417,60) size 203x68 - text run at (417,60) width 203: "14-point" - LayoutText {#text} at (620,93) size 125x27 - text run at (620,93) width 125: " text element" - LayoutText {#text} at (0,0) size 0x0 - LayoutImage {IMG} at (0,163) size 15x50 - LayoutText {#text} at (15,176) size 4x19 - text run at (15,176) width 4: " " - LayoutInline {SMALL} at (0,0) size 176x19 - LayoutText {#text} at (19,176) size 176x19 - text run at (19,176) width 176: "regardless of the line in which" - LayoutText {#text} at (195,176) size 4x19 - text run at (195,176) width 4: " " - LayoutImage {IMG} at (199,180) size 4.50x15 - LayoutText {#text} at (203,176) size 5x19 - text run at (203,176) width 5: " " - LayoutInline {BIG} at (0,0) size 152x23 - LayoutText {#text} at (207,173) size 152x23 - text run at (207,173) width 152: "the images appear." - LayoutText {#text} at (358,176) size 5x19 - text run at (358,176) width 5: " " - LayoutImage {IMG} at (362.31,143) size 27x90 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {P} at (4,1783.31) size 747x40 - LayoutText {#text} at (0,0) size 740x39 - text run at (0,0) width 740: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that element" - text run at (0,20) width 114: "is an image or not. " - text run at (114,20) width 532: "Each fragment of text has been SPANned appropriately in order to cause this to happen." - LayoutBlockFlow {P} at (4,1839.31) size 747x203 - LayoutInline {SPAN} at (0,0) size 90x19 - LayoutText {#text} at (0,0) size 90x19 - text run at (0,0) width 90: "This paragraph" - LayoutText {#text} at (90,0) size 4x19 - text run at (90,0) width 4: " " - LayoutImage {IMG} at (94,0) size 3x10 - LayoutText {#text} at (97,0) size 4x19 - text run at (97,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 352x46 - LayoutText {#text} at (101,1) size 352x46 - text run at (101,1) width 352: "contains many images" - LayoutText {#text} at (453,0) size 4x19 - text run at (453,0) width 4: " " - LayoutImage {IMG} at (457,0) size 3x10 - LayoutText {#text} at (460,0) size 4x19 - text run at (460,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 84x19 - LayoutText {#text} at (464,0) size 84x19 - text run at (464,0) width 84: "and some text" - LayoutText {#text} at (548,0) size 4x19 - text run at (548,0) width 4: " " - LayoutImage {IMG} at (552,0) size 3x10 - LayoutText {#text} at (555,0) size 4x19 - text run at (555,0) width 4: " " - LayoutInline {SPAN} at (0,0) size 104x19 - LayoutText {#text} at (559,0) size 104x19 - text run at (559,0) width 104: "of varying heights" - LayoutText {#text} at (663,0) size 4x19 - text run at (663,0) width 4: " " - LayoutImage {IMG} at (667,0) size 3x10 - LayoutText {#text} at (670,0) size 4x19 - text run at (670,0) width 4: " " - LayoutInline {BIG} at (0,0) size 703x71 - LayoutText {#text} at (674,0) size 703x71 - text run at (674,0) width 29: "and" - text run at (0,48) width 55: "widths" - LayoutText {#text} at (55,48) size 4x19 - text run at (55,48) width 4: " " - LayoutImage {IMG} at (59,48) size 6x20 - LayoutText {#text} at (65,48) size 4x19 - text run at (65,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 68x19 - LayoutText {#text} at (69,48) size 68x19 - text run at (69,48) width 68: "all of which" - LayoutText {#text} at (137,48) size 4x19 - text run at (137,48) width 4: " " - LayoutImage {IMG} at (141,48) size 19.50x65 - LayoutText {#text} at (160,48) size 5x19 - text run at (160,48) width 5: " " - LayoutInline {SPAN} at (0,0) size 105x19 - LayoutText {#text} at (164,48) size 105x19 - text run at (164,48) width 105: "should be aligned" - LayoutText {#text} at (268,48) size 5x19 - text run at (268,48) width 5: " " - LayoutImage {IMG} at (272.50,48) size 10.50x35 - LayoutText {#text} at (283,48) size 4x19 - text run at (283,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 185x36 - LayoutText {#text} at (287,48) size 185x36 - text run at (287,48) width 185: "with the top of" - LayoutText {#text} at (472,48) size 4x19 - text run at (472,48) width 4: " " - LayoutImage {IMG} at (476,48) size 15x50 - LayoutText {#text} at (491,48) size 4x19 - text run at (491,48) width 4: " " - LayoutInline {SPAN} at (0,0) size 120x19 - LayoutText {#text} at (495,48) size 120x19 - text run at (495,48) width 120: "the tallest element in" - LayoutText {#text} at (615,48) size 4x19 - text run at (615,48) width 4: " " - LayoutImage {IMG} at (619,48) size 4.50x15 - LayoutText {#text} at (623,48) size 5x19 - text run at (623,48) width 5: " " - LayoutInline {BIG} at (0,0) size 713x88 - LayoutText {#text} at (627,48) size 713x88 - text run at (627,48) width 86: "whichever" - text run at (0,113) width 202: "line the elements appear." - LayoutText {#text} at (201,113) size 5x19 - text run at (201,113) width 5: " " - LayoutImage {IMG} at (205.81,113) size 27x90 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,345) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,337) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png deleted file mode 100644 index fc2db37..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/word_spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt deleted file mode 100644 index de9319d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/text_properties/word_spacing-expected.txt +++ /dev/null
@@ -1,118 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1057 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1057 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1057 - LayoutBlockFlow {BODY} at (8,8) size 769x1041 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x192 - LayoutText {#text} at (0,0) size 248x192 - text run at (0,0) width 216: ".one {word-spacing: 0.3in;}" - text run at (216,0) width 0: " " - text run at (0,16) width 216: ".two {word-spacing: 0.5cm;}" - text run at (216,16) width 0: " " - text run at (0,32) width 216: ".three {word-spacing: 5mm;}" - text run at (216,32) width 0: " " - text run at (0,48) width 208: ".four {word-spacing: 3pt;}" - text run at (208,48) width 0: " " - text run at (0,64) width 232: ".five {word-spacing: 0.25pc;}" - text run at (232,64) width 0: " " - text run at (0,80) width 200: ".six {word-spacing: 1em;}" - text run at (200,80) width 0: " " - text run at (0,96) width 216: ".seven {word-spacing: 1ex;}" - text run at (216,96) width 0: " " - text run at (0,112) width 216: ".eight {word-spacing: 5px;}" - text run at (216,112) width 0: " " - text run at (0,128) width 232: ".nine {word-spacing: normal;}" - text run at (232,128) width 0: " " - text run at (0,144) width 208: ".ten {word-spacing: 300%;}" - text run at (208,144) width 0: " " - text run at (0,160) width 248: ".eleven {word-spacing: -0.2em;}" - text run at (248,160) width 0: " " - text run at (0,176) width 0: " " - LayoutBlockFlow {P} at (0,259) size 769x20 - LayoutText {#text} at (0,0) size 689x19 - text run at (0,0) width 689: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,295) size 769x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,331) size 769x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,367) size 769x20 - LayoutText {#text} at (0,0) size 441x19 - text run at (0,0) width 441: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,403) size 769x20 - LayoutText {#text} at (0,0) size 441x19 - text run at (0,0) width 441: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,439) size 769x20 - LayoutText {#text} at (0,0) size 561x19 - text run at (0,0) width 561: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,475) size 769x20 - LayoutText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (0,511) size 769x40 - LayoutText {#text} at (0,0) size 729x19 - text run at (0,0) width 729: "This words in this sentence should have extra space between them, but the last few words in the sentence " - LayoutInline {SPAN} at (0,0) size 768x39 - LayoutText {#text} at (729,0) size 768x39 - text run at (729,0) width 39: "should" - text run at (0,20) width 122: "have normal spacing" - LayoutText {#text} at (122,20) size 4x19 - text run at (122,20) width 4: "." - LayoutBlockFlow {P} at (0,567) size 769x20 - LayoutText {#text} at (0,0) size 636x19 - text run at (0,0) width 636: "This sentence should have normal word-spacing, since percentage values are not allowed on this property." - LayoutBlockFlow {P} at (0,603) size 769x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." - LayoutTable {TABLE} at (0,639) size 769x402 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x400 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x372 - LayoutTableCell {TD} at (0,200) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x372 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 689x19 - text run at (0,0) width 689: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,40) size 747x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,76) size 747x20 - LayoutText {#text} at (0,0) size 590x19 - text run at (0,0) width 590: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,112) size 747x20 - LayoutText {#text} at (0,0) size 441x19 - text run at (0,0) width 441: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,148) size 747x20 - LayoutText {#text} at (0,0) size 441x19 - text run at (0,0) width 441: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,184) size 747x20 - LayoutText {#text} at (0,0) size 561x19 - text run at (0,0) width 561: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,220) size 747x20 - LayoutText {#text} at (0,0) size 471x19 - text run at (0,0) width 471: "This words in this sentence should have extra space between them." - LayoutBlockFlow {P} at (4,256) size 747x40 - LayoutText {#text} at (0,0) size 720x19 - text run at (0,0) width 720: "This words in this sentence should have extra space between them, but the last few words in the sentence" - LayoutInline {SPAN} at (0,0) size 165x19 - LayoutText {#text} at (0,20) size 165x19 - text run at (0,20) width 165: "should have normal spacing" - LayoutText {#text} at (165,20) size 4x19 - text run at (165,20) width 4: "." - LayoutBlockFlow {P} at (4,312) size 747x20 - LayoutText {#text} at (0,0) size 636x19 - text run at (0,0) width 636: "This sentence should have normal word-spacing, since percentage values are not allowed on this property." - LayoutBlockFlow {P} at (4,348) size 747x20 - LayoutText {#text} at (0,0) size 667x19 - text run at (0,0) width 667: "This words in this sentence should have reduced space between them, since negative values are allowed on this property." -layer at (8,249) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,241) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/color_units-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/color_units-expected.png deleted file mode 100644 index 0bebd3f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/color_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/color_units-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/color_units-expected.txt deleted file mode 100644 index 6d7f0f2..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/color_units-expected.txt +++ /dev/null
@@ -1,236 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1745 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1745 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1745 - LayoutBlockFlow {BODY} at (8,8) size 769x1729 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x192 - LayoutText {#text} at (0,0) size 288x192 - text run at (0,0) width 160: "BODY {color: black;}" - text run at (160,0) width 0: " " - text run at (0,16) width 152: ".one {color: #080;}" - text run at (152,16) width 0: " " - text run at (0,32) width 176: ".two {color: #008000;}" - text run at (176,32) width 0: " " - text run at (0,48) width 232: ".three {color: rgb(0,128,0);}" - text run at (232,48) width 0: " " - text run at (0,64) width 240: ".four {color: rgb(0%,50%,0%);}" - text run at (240,64) width 0: " " - text run at (0,80) width 288: ".five {color: rgb(0.0%,50.0%,0.0%);}" - text run at (288,80) width 0: " " - text run at (0,96) width 160: ".six {color: green;}" - text run at (160,96) width 0: " " - text run at (0,112) width 232: ".seven {color: invalidValue;}" - text run at (232,112) width 0: " " - text run at (0,128) width 256: ".eight {color: rgb(0,128,1280);}" - text run at (256,128) width 0: " " - text run at (0,144) width 240: ".nine {color: rgb(0,128,255);}" - text run at (240,144) width 0: " " - text run at (0,160) width 264: ".ten {color: rgb(50%,-500%,60%);}" - text run at (264,160) width 0: " " - text run at (0,176) width 264: ".eleven {color: rgb(50%,0%,60%);}" - text run at (264,176) width 0: " " - LayoutBlockFlow {P} at (0,259) size 769x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (0,295) size 769x20 [color=#008800] - LayoutText {#text} at (0,0) size 473x19 - text run at (0,0) width 473: "This sentence should be green, although slightly different from those that follow." - LayoutBlockFlow {P} at (0,331) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,367) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,403) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,439) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,475) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (0,511) size 769x20 - LayoutText {#text} at (0,0) size 387x19 - text run at (0,0) width 387: "This sentence should be black, because the value given for class " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (387,3) size 48x16 - text run at (387,3) width 48: ".seven" - LayoutText {#text} at (435,0) size 59x19 - text run at (435,0) width 59: " is invalid." - LayoutBlockFlow {P} at (0,547) size 769x20 [color=#0080FF] - LayoutText {#text} at (0,0) size 757x19 - text run at (0,0) width 757: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next paragraph." - LayoutBlockFlow {P} at (0,583) size 769x40 [color=#0080FF] - LayoutText {#text} at (0,0) size 714x39 - text run at (0,0) width 714: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 65: "paragraph." - LayoutBlockFlow {P} at (0,639) size 769x20 [color=#800099] - LayoutText {#text} at (0,0) size 731x19 - text run at (0,0) width 731: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next paragraph." - LayoutBlockFlow {P} at (0,675) size 769x20 [color=#800099] - LayoutText {#text} at (0,0) size 757x19 - text run at (0,0) width 757: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous paragraph." - LayoutBlockFlow {P} at (0,711) size 769x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (0,747) size 769x20 [color=#008800] - LayoutText {#text} at (0,0) size 376x19 - text run at (0,0) width 376: "This sentence should be a slightly different green, and used the " - LayoutInline {TT} at (0,0) size 41x16 - LayoutText {#text} at (375,3) size 41x16 - text run at (375,3) width 41: "style" - LayoutText {#text} at (415,0) size 58x19 - text run at (415,0) width 58: " attribute." - LayoutBlockFlow {P} at (0,783) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (0,819) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (0,855) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (0,891) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (0,927) size 769x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutTable {TABLE} at (0,963) size 769x766 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x764 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x736 - LayoutTableCell {TD} at (0,382) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x736 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (4,40) size 747x20 [color=#008800] - LayoutText {#text} at (0,0) size 473x19 - text run at (0,0) width 473: "This sentence should be green, although slightly different from those that follow." - LayoutBlockFlow {P} at (4,76) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,112) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,148) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,184) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,220) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be green." - LayoutBlockFlow {P} at (4,256) size 747x20 - LayoutText {#text} at (0,0) size 387x19 - text run at (0,0) width 387: "This sentence should be black, because the value given for class " - LayoutInline {CODE} at (0,0) size 48x16 - LayoutText {#text} at (387,3) size 48x16 - text run at (387,3) width 48: ".seven" - LayoutText {#text} at (435,0) size 59x19 - text run at (435,0) width 59: " is invalid." - LayoutBlockFlow {P} at (4,292) size 747x40 [color=#0080FF] - LayoutText {#text} at (0,0) size 688x39 - text run at (0,0) width 688: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the next" - text run at (0,20) width 65: "paragraph." - LayoutBlockFlow {P} at (4,348) size 747x40 [color=#0080FF] - LayoutText {#text} at (0,0) size 714x39 - text run at (0,0) width 714: "This sentence should be a shade of blue-green which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 65: "paragraph." - LayoutBlockFlow {P} at (4,404) size 747x20 [color=#800099] - LayoutText {#text} at (0,0) size 731x19 - text run at (0,0) width 731: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the next paragraph." - LayoutBlockFlow {P} at (4,440) size 747x40 [color=#800099] - LayoutText {#text} at (0,0) size 688x39 - text run at (0,0) width 688: "This sentence should be a shade of purple which, on a typical RGB computer display, exactly matches the previous" - text run at (0,20) width 65: "paragraph." - LayoutBlockFlow {P} at (4,496) size 747x20 - LayoutText {#text} at (0,0) size 184x19 - text run at (0,0) width 184: "This sentence should be black." - LayoutBlockFlow {P} at (4,532) size 747x20 [color=#008800] - LayoutText {#text} at (0,0) size 376x19 - text run at (0,0) width 376: "This sentence should be a slightly different green, and used the " - LayoutInline {TT} at (0,0) size 41x16 - LayoutText {#text} at (375,3) size 41x16 - text run at (375,3) width 41: "style" - LayoutText {#text} at (415,0) size 58x19 - text run at (415,0) width 58: " attribute." - LayoutBlockFlow {P} at (4,568) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (4,604) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (4,640) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (4,676) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." - LayoutBlockFlow {P} at (4,712) size 747x20 [color=#008000] - LayoutText {#text} at (0,0) size 268x19 - text run at (0,0) width 268: "This sentence should be green, and used the " - LayoutInline {TT} at (0,0) size 40x16 - LayoutText {#text} at (268,3) size 40x16 - text run at (268,3) width 40: "style" - LayoutText {#text} at (308,0) size 57x19 - text run at (308,0) width 57: " attribute." -layer at (8,249) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,241) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/length_units-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/length_units-expected.png deleted file mode 100644 index 5948a84..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/length_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/length_units-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/length_units-expected.txt deleted file mode 100644 index 9aa43b4f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/length_units-expected.txt +++ /dev/null
@@ -1,173 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1673 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1673 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1673 - LayoutBlockFlow {BODY} at (8,8) size 769x1657 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x176 - LayoutText {#text} at (0,0) size 624x176 - text run at (0,0) width 184: ".zero {margin-left: 0;}" - text run at (184,0) width 0: " " - text run at (0,16) width 192: ".one {margin-left: 3em;}" - text run at (192,16) width 0: " " - text run at (0,32) width 192: ".two {margin-left: 3ex;}" - text run at (192,32) width 0: " " - text run at (0,48) width 216: ".three {margin-left: 36px;}" - text run at (216,48) width 0: " " - text run at (0,64) width 216: ".four {margin-left: 0.5in;}" - text run at (216,64) width 0: " " - text run at (0,80) width 224: ".five {margin-left: 1.27cm;}" - text run at (224,80) width 0: " " - text run at (0,96) width 216: ".six {margin-left: 12.7mm;}" - text run at (216,96) width 0: " " - text run at (0,112) width 216: ".seven {margin-left: 36pt;}" - text run at (216,112) width 0: " " - text run at (0,128) width 208: ".eight {margin-left: 3pc;}" - text run at (208,128) width 0: " " - text run at (0,144) width 208: ".nine {margin-left: +3pc;}" - text run at (208,144) width 0: " " - text run at (0,160) width 624: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}" - text run at (624,160) width 0: " " - LayoutBlockFlow {P} at (0,243) size 769x40 - LayoutText {#text} at (0,0) size 758x39 - text run at (0,0) width 758: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges should" - text run at (0,20) width 288: "therefore be appropriately shifted to the right of " - LayoutInline {EM} at (0,0) size 23x19 - LayoutText {#text} at (288,20) size 23x19 - text run at (288,20) width 23: "this" - LayoutText {#text} at (311,20) size 133x19 - text run at (311,20) width 133: " paragraph's left edge." - LayoutBlockFlow {P} at (48,299) size 721x20 - LayoutText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This paragraph should have a left margin of 3em." - LayoutBlockFlow {P} at (21,335) size 748x20 - LayoutText {#text} at (0,0) size 288x19 - text run at (0,0) width 288: "This paragraph should have a left margin of 3ex." - LayoutBlockFlow {P} at (36,371) size 733x20 - LayoutText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "This paragraph should have a left margin of 36 pixels." - LayoutBlockFlow {P} at (48,407) size 721x20 - LayoutText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have a left margin of half an inch." - LayoutBlockFlow {P} at (48,443) size 721x20 - LayoutText {#text} at (0,0) size 312x19 - text run at (0,0) width 312: "This paragraph should have a left margin of 1.27cm." - LayoutBlockFlow {P} at (48,479) size 721x20 - LayoutText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This paragraph should have a left margin of 12.7mm." - LayoutBlockFlow {P} at (48,515) size 721x20 - LayoutText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a left margin of 36 points." - LayoutBlockFlow {P} at (48,551) size 721x20 - LayoutText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "This paragraph should have a left margin of 3 picas." - LayoutBlockFlow {P} at (48,587) size 721x20 - LayoutText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - LayoutBlockFlow {P} at (0,647) size 769x240 [bgcolor=#00FFFF] [border: none (18px solid #800080)] - LayoutText {#text} at (18,1) size 306x46 - text run at (18,1) width 306: "This element has a " - LayoutInline {CODE} at (0,0) size 216x42 - LayoutText {#text} at (324,6) size 216x42 - text run at (324,6) width 216: "font-size" - LayoutText {#text} at (540,1) size 51x46 - text run at (540,1) width 51: " of " - LayoutInline {CODE} at (0,0) size 96x42 - LayoutText {#text} at (591,6) size 96x42 - text run at (591,6) width 96: "40px" - LayoutText {#text} at (687,1) size 737x94 - text run at (687,1) width 68: " and" - text run at (18,49) width 28: "a " - LayoutInline {CODE} at (0,0) size 264x42 - LayoutText {#text} at (46,54) size 264x42 - text run at (46,54) width 264: "border-left" - LayoutText {#text} at (310,49) size 51x46 - text run at (310,49) width 51: " of " - LayoutInline {CODE} at (0,0) size 384x42 - LayoutText {#text} at (361,54) size 384x42 - text run at (361,54) width 384: "1ex solid purple" - LayoutText {#text} at (745,49) size 737x190 - text run at (745,49) width 10: "." - text run at (18,97) width 663: "This should make the left border the same" - text run at (18,145) width 700: "number of pixels as the lower-case 'x' in this" - text run at (18,193) width 603: "element's font, as well as solid purple." - LayoutTable {TABLE} at (0,927) size 769x730 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x728 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x700 - LayoutTableCell {TD} at (0,364) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x700 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 715x39 - text run at (0,0) width 715: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges" - text run at (0,20) width 331: "should therefore be appropriately shifted to the right of " - LayoutInline {EM} at (0,0) size 23x19 - LayoutText {#text} at (331,20) size 23x19 - text run at (331,20) width 23: "this" - LayoutText {#text} at (354,20) size 133x19 - text run at (354,20) width 133: " paragraph's left edge." - LayoutBlockFlow {P} at (52,60) size 699x20 - LayoutText {#text} at (0,0) size 292x19 - text run at (0,0) width 292: "This paragraph should have a left margin of 3em." - LayoutBlockFlow {P} at (25,96) size 726x20 - LayoutText {#text} at (0,0) size 288x19 - text run at (0,0) width 288: "This paragraph should have a left margin of 3ex." - LayoutBlockFlow {P} at (40,132) size 711x20 - LayoutText {#text} at (0,0) size 320x19 - text run at (0,0) width 320: "This paragraph should have a left margin of 36 pixels." - LayoutBlockFlow {P} at (52,168) size 699x20 - LayoutText {#text} at (0,0) size 333x19 - text run at (0,0) width 333: "This paragraph should have a left margin of half an inch." - LayoutBlockFlow {P} at (52,204) size 699x20 - LayoutText {#text} at (0,0) size 312x19 - text run at (0,0) width 312: "This paragraph should have a left margin of 1.27cm." - LayoutBlockFlow {P} at (52,240) size 699x20 - LayoutText {#text} at (0,0) size 316x19 - text run at (0,0) width 316: "This paragraph should have a left margin of 12.7mm." - LayoutBlockFlow {P} at (52,276) size 699x20 - LayoutText {#text} at (0,0) size 322x19 - text run at (0,0) width 322: "This paragraph should have a left margin of 36 points." - LayoutBlockFlow {P} at (52,312) size 699x20 - LayoutText {#text} at (0,0) size 309x19 - text run at (0,0) width 309: "This paragraph should have a left margin of 3 picas." - LayoutBlockFlow {P} at (52,348) size 699x20 - LayoutText {#text} at (0,0) size 558x19 - text run at (0,0) width 558: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." - LayoutBlockFlow {P} at (4,408) size 747x288 [bgcolor=#00FFFF] [border: none (18px solid #800080)] - LayoutText {#text} at (18,1) size 306x46 - text run at (18,1) width 306: "This element has a " - LayoutInline {CODE} at (0,0) size 216x42 - LayoutText {#text} at (324,6) size 216x42 - text run at (324,6) width 216: "font-size" - LayoutText {#text} at (540,1) size 51x46 - text run at (540,1) width 51: " of " - LayoutInline {CODE} at (0,0) size 96x42 - LayoutText {#text} at (591,6) size 96x42 - text run at (591,6) width 96: "40px" - LayoutText {#text} at (18,49) size 96x46 - text run at (18,49) width 96: "and a " - LayoutInline {CODE} at (0,0) size 264x42 - LayoutText {#text} at (114,54) size 264x42 - text run at (114,54) width 264: "border-left" - LayoutText {#text} at (378,49) size 51x46 - text run at (378,49) width 51: " of " - LayoutInline {CODE} at (0,0) size 627x90 - LayoutText {#text} at (429,54) size 627x90 - text run at (429,54) width 216: "1ex solid" - text run at (18,102) width 144: "purple" - LayoutText {#text} at (162,97) size 698x190 - text run at (162,97) width 20: ". " - text run at (182,97) width 513: "This should make the left border" - text run at (18,145) width 698: "the same number of pixels as the lower-case" - text run at (18,193) width 634: "'x' in this element's font, as well as solid" - text run at (18,241) width 111: "purple." -layer at (8,233) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,225) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/percentage_units-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/percentage_units-expected.png deleted file mode 100644 index edc8c87..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/percentage_units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/percentage_units-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/percentage_units-expected.txt deleted file mode 100644 index fd94554..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/percentage_units-expected.txt +++ /dev/null
@@ -1,65 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x80 - LayoutText {#text} at (0,0) size 504x80 - text run at (0,0) width 224: ".zero { background: yellow }" - text run at (224,0) width 0: " " - text run at (0,16) width 504: ".one { margin-left: 25%; margin-right: 25%; background: white }" - text run at (504,16) width 0: " " - text run at (0,32) width 496: ".two { margin-left: 50%; margin-right: 0%; background: white }" - text run at (496,32) width 0: " " - text run at (0,48) width 208: ".three {margin-left: 25%;}" - text run at (208,48) width 0: " " - text run at (0,64) width 0: " " - LayoutBlockFlow {DIV} at (0,147) size 784x116 [bgcolor=#FFFF00] - LayoutBlockFlow {DIV} at (196,0) size 392x40 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 392x40 - LayoutText {#text} at (0,0) size 371x39 - text run at (0,0) width 371: "This paragraph should be centered within its yellow containing" - text run at (0,20) width 345: "block and its width should be half of the containing block." - LayoutBlockFlow {DIV} at (392,56) size 392x60 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 392x60 - LayoutText {#text} at (0,0) size 367x59 - text run at (0,0) width 329: "This paragraph should be right-aligned within its yellow" - text run at (0,20) width 367: "containing block and its width should be half of the containing" - text run at (0,40) width 38: "block." - LayoutBlockFlow {P} at (196,279) size 588x40 - LayoutText {#text} at (0,0) size 561x39 - text run at (0,0) width 561: "This paragraph should have a left margin of 25% the width of its parent element, which should" - text run at (0,20) width 297: "require some extra text in order to test effectively." - LayoutTable {TABLE} at (0,335) size 784x210 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x208 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x180 - LayoutTableCell {TD} at (0,104) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x180 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {DIV} at (4,4) size 762x116 [bgcolor=#FFFF00] - LayoutBlockFlow {DIV} at (190.50,0) size 381x40 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 381x40 - LayoutText {#text} at (0,0) size 371x39 - text run at (0,0) width 371: "This paragraph should be centered within its yellow containing" - text run at (0,20) width 345: "block and its width should be half of the containing block." - LayoutBlockFlow {DIV} at (381,56) size 381x60 [bgcolor=#FFFFFF] - LayoutBlockFlow {P} at (0,0) size 381x60 - LayoutText {#text} at (0,0) size 367x59 - text run at (0,0) width 329: "This paragraph should be right-aligned within its yellow" - text run at (0,20) width 367: "containing block and its width should be half of the containing" - text run at (0,40) width 38: "block." - LayoutBlockFlow {P} at (194.50,136) size 571.50x40 - LayoutText {#text} at (0,0) size 561x39 - text run at (0,0) width 561: "This paragraph should have a left margin of 25% the width of its parent element, which should" - text run at (0,20) width 297: "require some extra text in order to test effectively." -layer at (8,137) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,129) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/urls-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/urls-expected.txt deleted file mode 100644 index be5b6ee..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/css1/units/urls-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x64 - LayoutText {#text} at (0,0) size 648x64 - text run at (0,0) width 648: "<LINK rel=\"stylesheet\" type=\"text/css\" media=\"screen\" href=\"../resources/bg.gif\">" - text run at (648,0) width 0: " " - text run at (0,16) width 296: "@import url(../resources/sec642.css);" - text run at (296,16) width 0: " " - text run at (0,32) width 352: "BODY {background: url(../resources/bg.gif);}" - text run at (352,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 784x20 - LayoutText {#text} at (0,0) size 368x19 - text run at (0,0) width 368: "This page should have a green grid pattern as its background." - LayoutBlockFlow {P} at (0,167) size 784x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 778x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 174: "If an image, in this case a red" - text run at (0,20) width 778: "square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the document's" - text run at (0,40) width 188: "URL, not the stylesheet's URL." - LayoutBlockFlow {P} at (0,243) size 784x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 778x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 174: "If an image, in this case a red" - text run at (0,20) width 778: "square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the document's" - text run at (0,40) width 188: "URL, not the stylesheet's URL." - LayoutTable {TABLE} at (0,319) size 784x210 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 782x208 - LayoutTableRow {TR} at (0,0) size 782x28 - LayoutTableCell {TD} at (0,0) size 782x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 782x180 - LayoutTableCell {TD} at (0,104) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 770x180 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 762x20 - LayoutText {#text} at (0,0) size 368x19 - text run at (0,0) width 368: "This page should have a green grid pattern as its background." - LayoutBlockFlow {P} at (4,40) size 762x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 741x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 150: "If an image, in this case a" - text run at (0,20) width 730: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,40) width 260: "document's URL, not the stylesheet's URL." - LayoutBlockFlow {P} at (4,116) size 762x60 [bgcolor=#FFFFFF] - LayoutText {#text} at (0,0) size 741x59 - text run at (0,0) width 591: "This paragraph should have a white background, but NO image should appear in the background. " - text run at (591,0) width 150: "If an image, in this case a" - text run at (0,20) width 730: "red square-- or, indeed, any red at all-- is seen there, then the browser has incorrectly interpreted a URL in relation to the" - text run at (0,40) width 260: "document's URL, not the stylesheet's URL." -layer at (8,121) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/023-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/023-expected.png deleted file mode 100644 index a53b6f329..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/023-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/040-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/040-expected.png deleted file mode 100644 index a25251f..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/040-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png deleted file mode 100644 index 8bb0003..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/100-percent-cell-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png deleted file mode 100644 index 7034dbb..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/add-before-anonymous-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png deleted file mode 100644 index 377291e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_fixed-bg-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png deleted file mode 100644 index a8a5acd..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-opacity-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png deleted file mode 100644 index a8a5acd..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-opacity-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png deleted file mode 100644 index 5474bdb..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png deleted file mode 100644 index 460cc2d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/backgr_layers-show-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png deleted file mode 100644 index 869fe38..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png deleted file mode 100644 index 1dffd3e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png deleted file mode 100644 index 492bfae..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/002-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/003-vertical-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/003-vertical-expected.png deleted file mode 100644 index d1055857..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/003-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png deleted file mode 100644 index 0d98c30d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png deleted file mode 100644 index cc45f88..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png deleted file mode 100644 index 1b3980b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/border-collapsing-head-foot-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png deleted file mode 100644 index d315e5b9..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png deleted file mode 100644 index 7b40b8b..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png deleted file mode 100644 index 0cb187d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/cell-absolute-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png deleted file mode 100644 index 092a182..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/click-near-anonymous-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/edge-offsets-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/edge-offsets-expected.png deleted file mode 100644 index 9e9ab81..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/edge-offsets-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/empty-cells-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/empty-cells-expected.png deleted file mode 100644 index 9eaa688..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/empty-cells-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png deleted file mode 100644 index b1cf960a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/empty-table-percent-height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png deleted file mode 100644 index 6c7e654..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/fixed-table-non-cell-in-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/form-with-table-style-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/form-with-table-style-expected.png deleted file mode 100644 index 83fe29e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/form-with-table-style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/generated-caption-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/generated-caption-expected.png deleted file mode 100644 index 551669a..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/generated-caption-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png deleted file mode 100644 index e1621ce..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-before-anonymous-ancestors-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png deleted file mode 100644 index 30d296a5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-cell-before-form-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png deleted file mode 100644 index 30d296a5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/insert-row-before-form-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png deleted file mode 100644 index 04d7291d..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/multiple-captions-display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png deleted file mode 100644 index 9675f9b0..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/prepend-in-anonymous-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/row-height-recalc-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/row-height-recalc-expected.png deleted file mode 100644 index 0bda4a1..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/row-height-recalc-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png deleted file mode 100644 index 9087d09..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/rtl-cell-display-none-assert-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png deleted file mode 100644 index a4f87ca..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/stale-grid-crash-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png deleted file mode 100644 index bca2c749..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/table-and-parts-outline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/tbody-background-image-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/tbody-background-image-expected.png deleted file mode 100644 index 6ca0fd46..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/tbody-background-image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png deleted file mode 100644 index 44e39fe..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/fast/table/tbody-background-image-repeat-x-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/media/media-source/mediasource-play-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/media/media-source/mediasource-play-expected.txt deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/media/media-source/mediasource-play-expected.txt +++ /dev/null
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/acid2-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/acid2-expected.png deleted file mode 100644 index 447bd93..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/acid2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/acid3-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/acid3-expected.png deleted file mode 100644 index f3d3c97..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/acid3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/iframe404-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/iframe404-expected.png deleted file mode 100644 index 7691da5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/iframe404-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt deleted file mode 100644 index dc234484..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/location-replace-crossdomain-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,8) size 304x154 - LayoutIFrame {IFRAME} at (0,0) size 304x154 [border: (2px inset #EEEEEE)] - layer at (0,0) size 300x150 - LayoutView at (0,0) size 300x150 - layer at (0,0) size 300x150 - LayoutBlockFlow {HTML} at (0,0) size 300x150 - LayoutBlockFlow {BODY} at (8,8) size 284x134 - LayoutText {#text} at (0,0) size 69x19 - text run at (0,0) width 69: "SUCCESS"
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png deleted file mode 100644 index 881e87c7..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt deleted file mode 100644 index dfb8290..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-2-expected.txt +++ /dev/null
@@ -1,66 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x462 - LayoutBlockFlow {HTML} at (0,0) size 800x461.50 - LayoutBlockFlow {BODY} at (4,4) size 136x449 [border: (0.50px dashed #C0C0C0)] - LayoutBlockFlow {P} at (0.50,9.50) size 135x27 - LayoutText {#text} at (0,-2) size 133x30 - text run at (0,-2) width 130: "The following six blue boxes must" - text run at (0,7) width 133: "be of the same width. There must be" - text run at (0,16) width 26: "no red." - LayoutBlockFlow {P} at (9.50,45.50) size 117x27 [bgcolor=#008000] [border: (9px solid #0000FF)] - LayoutText {#text} at (9,7) size 2x12 - text run at (9,7) width 2: " " - LayoutBlockFlow {P} at (0.50,126.50) size 135x9 - LayoutText {#text} at (0,-2) size 12x12 - text run at (0,-2) width 12: " " - LayoutBlockFlow {P} at (0.50,189.50) size 135x9 - LayoutTable (anonymous) at (0.50,252.50) size 135x44 - LayoutTableSection (anonymous) at (0,0) size 135x44 - LayoutTableRow (anonymous) at (0,0) size 135x44 - LayoutTableCell {P} at (0,0) size 135x43.75 [r=0 c=0 rs=1 cs=1] - LayoutTable {TABLE} at (0.50,350.50) size 135x44 - LayoutTableSection {TBODY} at (0,0) size 135x44 - LayoutTableRow {TR} at (0,0) size 135x44 - LayoutTableCell {TD} at (0,0) size 135x43.75 [r=0 c=0 rs=1 cs=1] - LayoutBlockFlow (floating) {P} at (0.50,448.50) size 135x9 -layer at (14,131) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,194) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,257) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,355) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"] -layer at (14,453) size 117x43 - LayoutEmbeddedObject {OBJECT} at (9,0) size 117x42.75 [bgcolor=#FF0000] [border: (9px solid #0000FF)] - layer at (0,0) size 99x25 - LayoutView at (0,0) size 99x25 - layer at (0,0) size 99x25 - LayoutSVGRoot {svg} at (0,0) size 99x25 - LayoutSVGRect {rect} at (0,0) size 1000x250 [stroke={[type=SOLID] [color=#008000] [stroke width=12.00]}] [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=1000.00] [height=250.00] - LayoutSVGPath {path} at (150,50) size 700x150 [fill={[type=SOLID] [color=#008000]}] [data="M 500 50 L 150 200 L 850 200 Z"]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png deleted file mode 100644 index 436f1b5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.txt deleted file mode 100644 index 236b5a7..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/object-embedding-svg-delayed-size-negotiation-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 790 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x790 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {html} at (0,0) size 785x790 - LayoutBlockFlow {body} at (8,8) size 769x774 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,8) size 769x769 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutEmbeddedObject {object} at (0,0) size 769x769 [bgcolor=#FF0000] - layer at (0,0) size 769x769 - LayoutView at (0,0) size 769x769 - layer at (0,0) size 769x769 - LayoutSVGRoot {svg} at (0,0) size 769x769 - LayoutSVGRect {rect} at (0,0) size 300x300 [fill={[type=SOLID] [color=#0000FF]}] [x=0.00] [y=0.00] [width=300.00] [height=300.00] - LayoutSVGEllipse {circle} at (120,120) size 60x60 [fill={[type=SOLID] [color=#008000]}] [cx=150.00] [cy=150.00] [r=30.00]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/resource-timing-sizes-redirect-worker-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/resource-timing-sizes-redirect-worker-expected.txt deleted file mode 100644 index b2994bd..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/resource-timing-sizes-redirect-worker-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS PerformanceResourceTiming sizes Fetch with redirect test -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png deleted file mode 100644 index fe19eb5..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt deleted file mode 100644 index 388ccec3..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/misc/slow-loading-image-in-pattern-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x56 - LayoutBlockFlow {HTML} at (0,0) size 800x56 - LayoutBlockFlow {BODY} at (8,8) size 784x40 - LayoutText {#text} at (0,0) size 596x19 - text run at (0,0) width 596: "This tests slow loading png images referenced from a image element inside a SVG pattern resource." - LayoutBR {BR} at (596,0) size 0x19 - LayoutText {#text} at (0,20) size 535x19 - text run at (0,20) width 535: "You should see a 400x300 rect containing a tiled rendering of the Acid3 reference image." -layer at (10,50) size 406x306 clip at (13,53) size 400x300 - LayoutSVGRoot (positioned) {svg} at (10,50) size 406x306 - LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 - LayoutSVGResourcePattern {pattern} [id="pattern"] [patternUnits=userSpaceOnUse] [patternContentUnits=userSpaceOnUse] - LayoutSVGImage {image} at (0,0) size 800x600 - LayoutSVGRect {rect} at (0,0) size 400x300 [fill={[type=PATTERN] [id="pattern"]}] [x=0.00] [y=0.00] [width=400.00] [height=300.00]
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-code-blocked-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-code-blocked-expected.txt deleted file mode 100644 index 93a06ac..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-code-blocked-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -CONSOLE ERROR: Refused to load plugin data from 'http://127.0.0.1:8080/plugins/resources/mock-plugin.pl?code' because it violates the following Content Security Policy directive: "object-src http://localhost:8080". - -CONSOLE MESSAGE: line 16: PASS: Error occurred, so load was correctly blocked. -This test passes if there is a console message saying the plugin was blocked.
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-movie-blocked-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-movie-blocked-expected.txt deleted file mode 100644 index d2a9c40..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-movie-blocked-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -CONSOLE ERROR: Refused to load plugin data from 'http://127.0.0.1:8080/plugins/resources/mock-plugin.pl?movie' because it violates the following Content Security Policy directive: "object-src http://localhost:8080". - -CONSOLE MESSAGE: line 16: PASS: Error occurred, so load was correctly blocked. -This test passes if there is a console message saying the plugin was blocked.
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-src-blocked-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-src-blocked-expected.txt deleted file mode 100644 index 780596e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-src-blocked-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -CONSOLE ERROR: Refused to load plugin data from 'http://127.0.0.1:8080/plugins/resources/mock-plugin.pl?src' because it violates the following Content Security Policy directive: "object-src http://localhost:8080". - -CONSOLE MESSAGE: line 16: PASS: Error occurred, so load was correctly blocked. -This test passes if there is a console message saying the plugin was blocked.
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-url-blocked-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-url-blocked-expected.txt deleted file mode 100644 index 82de5e0..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/contentSecurityPolicy/object-src-param-url-blocked-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -CONSOLE ERROR: Refused to load plugin data from 'http://127.0.0.1:8080/plugins/resources/mock-plugin.pl?url' because it violates the following Content Security Policy directive: "object-src http://localhost:8080". - -CONSOLE MESSAGE: line 16: PASS: Error occurred, so load was correctly blocked. -This test passes if there is a console message saying the plugin was blocked.
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/cross-frame-access-callback-explicit-domain-ALLOW-expected.txt b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/cross-frame-access-callback-explicit-domain-ALLOW-expected.txt deleted file mode 100644 index 3f9666e..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/security/cross-frame-access-callback-explicit-domain-ALLOW-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -The child frame will get a function from the parent frame, set the document.domain property and then try to use the function. The function should still be able to access parent frame properties. - -PASS: canGet('window.location.href') should be 'true' and is. -PASS: window.thisIsTopFrame should be 'true' and is. -
diff --git a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/uri/css-href-expected.png b/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/uri/css-href-expected.png deleted file mode 100644 index 388a216..0000000 --- a/third_party/blink/web_tests/platform/win/virtual/mojo-loading/http/tests/uri/css-href-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/box_properties/acid_test-expected.png deleted file mode 100644 index c09020a8..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/box_properties/acid_test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font-expected.png deleted file mode 100644 index 99124e79..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font-expected.txt deleted file mode 100644 index de7cfe4..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font-expected.txt +++ /dev/null
@@ -1,231 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 4396 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x4396 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x4396.33 - LayoutBlockFlow {BODY} at (8,8) size 769x4380.33 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x16 - LayoutText {#text} at (0,0) size 274x15 - text run at (0,0) width 274: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,28) size 769x180 - LayoutText {#text} at (0,0) size 399x180 - text run at (0,0) width 161: "BODY {font-size: 12px;}" - text run at (161,0) width 0: " " - text run at (0,15) width 322: ".one {font: italic small-caps 13pt Helvetica;}" - text run at (322,15) width 0: " " - text run at (0,30) width 203: ".two {font: 150%/150% serif;}" - text run at (203,30) width 0: " " - text run at (0,45) width 252: ".three {font: 150%/150% sans-serif;}" - text run at (252,45) width 0: " " - text run at (0,60) width 231: ".four {font: small/200% cursive;}" - text run at (231,60) width 0: " " - text run at (0,75) width 399: ".five {font: italic small-caps 900 150%/150% sans-serif;}" - text run at (399,75) width 0: " " - text run at (0,90) width 392: ".six {font: italic small-caps 100 150%/300% sans-serif;}" - text run at (392,90) width 0: " " - text run at (0,105) width 392: ".seven {font: italic small-caps 900 150%/2em monospace;}" - text run at (392,105) width 0: " " - text run at (0,120) width 399: ".eight {font: italic small-caps 500 150%/1in sans-serif;}" - text run at (399,120) width 0: " " - text run at (0,135) width 378: ".nine {font: oblique normal 700 18px/200% sans-serif;}" - text run at (378,135) width 0: " " - text run at (0,150) width 301: ".ten {font: normal 400 80%/2.5 sans-serif;}" - text run at (301,150) width 0: " " - text run at (0,165) width 266: "SPAN.color {background-color: silver;}" - text run at (266,165) width 0: " " - LayoutBlockFlow {P} at (0,234) size 769x16 - LayoutText {#text} at (0,0) size 721x15 - text run at (0,0) width 431: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (431,0) width 290: "This is the \"base font size\" referred to in the following tests." - LayoutBlockFlow {P} at (0,267.33) size 769x21 - LayoutText {#text} at (0,0) size 501x20 - text run at (0,0) width 501: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (0,306.33) size 769x81 - LayoutText {#text} at (0,3) size 760x74 - text run at (0,3) width 278: "This element should be in a serif font. " - text run at (278,3) width 472: "Its font-size should be 150% the base font size, and its line-height" - text run at (0,30) width 417: "should 150% of that value (18px and 27px, respectively). " - text run at (417,30) width 343: "Extra text is included for the purposes of testing" - text run at (0,57) width 151: "this more effectively." - LayoutBlockFlow {P} at (0,405.33) size 769x81 - LayoutText {#text} at (0,3) size 757x75 - text run at (0,3) width 348: "This element should be in a sans-serif font. " - text run at (348,3) width 409: "Its font-size should be 150% the base font size, and" - text run at (0,30) width 566: "its line-height should 150% of that value (18px and 27px, respectively). " - text run at (566,30) width 190: "Extra text is included for" - text run at (0,57) width 349: "the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,504.33) size 769x80 - LayoutText {#text} at (0,4) size 726x44 - text run at (0,4) width 705: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (705,4) width 21: "For" - text run at (0,30) width 189: "example, if the font-size value " - LayoutInline {CODE} at (0,0) size 30x12 - LayoutText {#text} at (189,35) size 30x12 - text run at (189,35) width 30: "small" - LayoutText {#text} at (219,30) size 753x46 - text run at (219,30) width 359: " is calculated at 10px, then the line-height should be 20px. " - text run at (578,30) width 175: "The actual value of the font-" - text run at (0,58) width 136: "size is UA-dependent. " - text run at (136,58) width 434: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,602.33) size 769x108 - LayoutText {#text} at (0,0) size 766x107 - text run at (0,0) width 766: "This element should be in a sans-serif font, italicized and small caps, with a weight of" - text run at (0,27) width 48: "900. " - text run at (48,27) width 690: "Its font-size should be 150% the base font size, and its line-height should be" - text run at (0,54) width 461: "150% of that value (18px and 27px, respectively). " - text run at (461,54) width 267: "Extra text is included for the" - text run at (0,81) width 370: "purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,728.33) size 769x216 - LayoutText {#text} at (0,16) size 745x184 - text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " - text run at (722,16) width 23: "Its" - text run at (0,70) width 743: "font-size should be 150% the base font size, and its line-height should be 300% of that value" - text run at (0,124) width 244: "(18px and 54px, respectively). " - text run at (243,124) width 479: "Extra text is included for the purposes of testing this more" - text run at (0,178) width 93: "effectively." - LayoutBlockFlow {P} at (0,962.33) size 769x144 - LayoutText {#text} at (0,8) size 750x128 - text run at (0,8) width 750: "This element should be in a monospace font, italicized and small caps, with a weight of" - text run at (0,44) width 55: "900. " - text run at (55,44) width 687: "Its font-size should be 150% the base font size, and its line-height should be" - text run at (0,80) width 618: "2em, or twice the element's font size (18px and 36px, respectively). " - text run at (618,80) width 113: "Extra text is" - text run at (0,116) width 499: "included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1124.33) size 769x288 - LayoutText {#text} at (0,37) size 745x214 - text run at (0,37) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 500. " - text run at (722,37) width 23: "Its" - text run at (0,133) width 693: "font-size should be 150% the base font size, or 18px, and its line-height should be 1in. " - text run at (693,133) width 47: "Extra" - text run at (0,229) width 524: "text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1430.33) size 769x144 - LayoutText {#text} at (0,7) size 752x129 - text run at (0,7) width 752: "This element should be in a sans-serif font, oblique and not small-caps, with a weight of" - text run at (0,43) width 40: "700. " - text run at (40,43) width 663: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 177: "element's font size). " - text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 91: "effectively." - LayoutBlockFlow {P} at (0,1592.33) size 769x46 - LayoutText {#text} at (0,5) size 760x36 - text run at (0,5) width 305: "This element should be in a sans-serif font, with a weight of 400. " - text run at (305,5) width 455: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px." - text run at (0,28) width 321: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (0,1656.33) size 769x270 - LayoutInline {SPAN} at (0,0) size 759x238 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,16) size 759x238 - text run at (0,16) width 723: "This element should be in a sans-serif font, italicized and small caps, with a weight of 100. " - text run at (722,16) width 23: "Its" - text run at (0,70) width 743: "font-size should be 150% the base font size, and its line-height should be 300% of that value" - text run at (0,124) width 759: "(18px and 54px, respectively). The text should have a silver background. The background color" - text run at (0,178) width 735: "has been set on an inline element and should therefore only cover the text, not the interline" - text run at (0,232) width 64: "spacing." - LayoutText {#text} at (0,0) size 0x0 - LayoutTable {TABLE} at (0,1944.33) size 769x2436 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x2434 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x2406 - LayoutTableCell {TD} at (0,1217) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x2406.33 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x40 - LayoutText {#text} at (0,0) size 738x39 - text run at (0,0) width 531: "This element is unstyled, and should inherit a font-size of 12px from the BODY element. " - text run at (531,0) width 207: "This is the \"base font size\" referred" - text run at (0,20) width 141: "to in the following tests." - LayoutBlockFlow {P} at (4,61.33) size 747x21 - LayoutText {#text} at (0,0) size 501x20 - text run at (0,0) width 501: "This element should be 13pt. Helvetica which is in small-cap italics." - LayoutBlockFlow {P} at (4,106.33) size 747x144 - LayoutText {#text} at (0,4) size 725x135 - text run at (0,4) width 367: "This element should be in a serif font. " - text run at (367,4) width 358: "Its font-size should be 150% the base" - text run at (0,40) width 685: "font size, and its line-height should 150% of that value (18px and 27px," - text run at (0,76) width 136: "respectively). " - text run at (136,76) width 556: "Extra text is included for the purposes of testing this more" - text run at (0,112) width 107: "effectively." - LayoutBlockFlow {P} at (4,274.33) size 747x144 - LayoutText {#text} at (0,4) size 708x135 - text run at (0,4) width 471: "This element should be in a sans-serif font. " - text run at (471,4) width 237: "Its font-size should be" - text run at (0,40) width 685: "150% the base font size, and its line-height should 150% of that" - text run at (0,76) width 391: "value (18px and 27px, respectively). " - text run at (391,76) width 299: "Extra text is included for the" - text run at (0,112) width 430: "purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,442.33) size 747x80 - LayoutText {#text} at (0,4) size 726x44 - text run at (0,4) width 705: "This element should be in a cursive font, 'small' in size, with a line-height 200% the height of the text's actual size. " - text run at (705,4) width 21: "For" - text run at (0,30) width 189: "example, if the font-size value " - LayoutInline {CODE} at (0,0) size 30x12 - LayoutText {#text} at (189,35) size 30x12 - text run at (189,35) width 30: "small" - LayoutText {#text} at (219,30) size 718x46 - text run at (219,30) width 359: " is calculated at 10px, then the line-height should be 20px. " - text run at (578,30) width 140: "The actual value of the" - text run at (0,58) width 167: "font-size is UA-dependent. " - text run at (167,58) width 434: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,546.33) size 747x180 - LayoutText {#text} at (0,1) size 739x177 - text run at (0,1) width 739: "This element should be in a sans-serif font, italicized and small" - text run at (0,37) width 326: "caps, with a weight of 900. " - text run at (326,37) width 388: "Its font-size should be 150% the" - text run at (0,73) width 679: "base font size, and its line-height should be 150% of that" - text run at (0,109) width 433: "value (18px and 27px, respectively). " - text run at (433,109) width 303: "Extra text is included for" - text run at (0,145) width 530: "the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,750.33) size 747x360 - LayoutText {#text} at (0,22) size 717x316 - text run at (0,22) width 701: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,94) width 227: "with a weight of 100. " - text run at (227,94) width 490: "Its font-size should be 150% the base font size," - text run at (0,166) width 661: "and its line-height should be 300% of that value (18px and 54px," - text run at (0,238) width 146: "respectively). " - text run at (145,238) width 560: "Extra text is included for the purposes of testing this" - text run at (0,310) width 174: "more effectively." - LayoutBlockFlow {P} at (4,1134.33) size 747x156 - LayoutText {#text} at (0,8) size 740x140 - text run at (0,8) width 740: "This element should be in a monospace font, italicized and small caps, with a weight" - text run at (0,47) width 88: "of 900. " - text run at (88,47) width 620: "Its font-size should be 150% the base font size, and its line-height" - text run at (0,86) width 716: "should be 2em, or twice the element's font size (18px and 36px, respectively)." - text run at (0,125) width 636: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1314.33) size 747x384 - LayoutText {#text} at (0,34) size 739x316 - text run at (0,34) width 701: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,130) width 227: "with a weight of 500. " - text run at (227,130) width 490: "Its font-size should be 150% the base font size," - text run at (0,226) width 433: "or 18px, and its line-height should be 1in. " - text run at (433,226) width 306: "Extra text is included for the" - text run at (0,322) width 427: "purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1722.33) size 747x144 - LayoutText {#text} at (0,7) size 730x129 - text run at (0,7) width 730: "This element should be in a sans-serif font, oblique and not small-caps, with a weight" - text run at (0,43) width 62: "of 700. " - text run at (62,43) width 663: "Its font-size should be 18 pixels, and its line-height should be 36px (200% this" - text run at (0,79) width 177: "element's font size). " - text run at (177,79) width 498: "Extra text is included for the purposes of testing this more" - text run at (0,115) width 91: "effectively." - LayoutBlockFlow {P} at (4,1884.33) size 747x62 - LayoutText {#text} at (0,7) size 742x47 - text run at (0,7) width 374: "This element should be in a sans-serif font, with a weight of 400. " - text run at (374,7) width 368: "Its font-size should be 80% of 12px, or 9.6px, and its line-height" - text run at (0,38) width 196: "shoud be 2.5 times that, or 24px. " - text run at (196,38) width 398: "Extra text is included for the purposes of testing this more effectively." - LayoutBlockFlow {P} at (4,1970.33) size 747x432 - LayoutInline {SPAN} at (0,0) size 747x388 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,22) size 747x388 - text run at (0,22) width 701: "This element should be in a sans-serif font, italicized and small caps," - text run at (0,94) width 227: "with a weight of 100. " - text run at (227,94) width 490: "Its font-size should be 150% the base font size," - text run at (0,166) width 661: "and its line-height should be 300% of that value (18px and 54px," - text run at (0,238) width 747: "respectively). The text should have a silver background. The background" - text run at (0,310) width 743: "color has been set on an inline element and should therefore only cover" - text run at (0,382) width 353: "the text, not the interline spacing." - LayoutText {#text} at (0,0) size 0x0 -layer at (8,228) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,220) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_family-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_family-expected.txt deleted file mode 100644 index 49f9c24..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_family-expected.txt +++ /dev/null
@@ -1,140 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1324 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1324 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1324 - LayoutBlockFlow {BODY} at (8,8) size 769x1308 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x144 - LayoutText {#text} at (0,0) size 312x144 - text run at (0,0) width 216: "DIV.a {font-family: serif;}" - text run at (216,0) width 0: " " - text run at (0,16) width 248: "DIV.b {font-family: monospace;}" - text run at (248,16) width 0: " " - text run at (0,32) width 208: ".one {font-family: serif;}" - text run at (208,32) width 0: " " - text run at (0,48) width 248: ".two {font-family: sans-serif;}" - text run at (248,48) width 0: " " - text run at (0,64) width 240: ".three {font-family: cursive;}" - text run at (240,64) width 0: " " - text run at (0,80) width 232: ".four {font-family: fantasy;}" - text run at (232,80) width 0: " " - text run at (0,96) width 248: ".five {font-family: monospace;}" - text run at (248,96) width 0: " " - text run at (0,112) width 312: ".six {font-family: sans-serif,cursive;}" - text run at (312,112) width 0: " " - text run at (0,128) width 304: ".seven {font-family: monospace,serif;}" - text run at (304,128) width 0: " " - LayoutBlockFlow {DIV} at (0,211) size 769x198 - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 599x19 - text run at (0,0) width 599: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,36) size 769x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,72) size 769x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,107) size 769x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,146) size 769x20 - LayoutText {#text} at (0,0) size 267x20 - text run at (0,0) width 267: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,182) size 769x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (0,440) size 769x19 - LayoutText {#text} at (0,0) size 383x18 - text run at (0,0) width 383: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (0,475) size 769x18 - LayoutText {#text} at (0,0) size 550x18 - text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (0,524) size 769x210 - LayoutBlockFlow {P} at (0,0) size 769x32 - LayoutText {#text} at (0,0) size 768x32 - text run at (0,0) width 768: "This sentence is normal for the first division, which is the next five sentences; it should be a" - text run at (0,16) width 120: "monospace font." - LayoutBlockFlow {P} at (0,48) size 769x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,84) size 769x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,119) size 769x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,158) size 769x20 - LayoutText {#text} at (0,0) size 267x20 - text run at (0,0) width 267: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,194) size 769x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutTable {TABLE} at (0,747) size 769x561 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x559 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x531 - LayoutTableCell {TD} at (0,279) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x531 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {DIV} at (4,4) size 747x198 - LayoutBlockFlow {P} at (0,0) size 747x20 - LayoutText {#text} at (0,0) size 599x19 - text run at (0,0) width 599: "This sentence is normal for the first division, which is the next five sentences; it should be a serif font." - LayoutBlockFlow {P} at (0,36) size 747x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,72) size 747x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,107) size 747x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,146) size 747x20 - LayoutText {#text} at (0,0) size 267x20 - text run at (0,0) width 267: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,182) size 747x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." - LayoutBlockFlow {P} at (4,233) size 747x19 - LayoutText {#text} at (0,0) size 383x18 - text run at (0,0) width 383: "This sentence should be in a sans-serif font, not cursive." - LayoutBlockFlow {P} at (4,268) size 747x18 - LayoutText {#text} at (0,0) size 550x18 - text run at (0,0) width 550: "This sentence should be in a monospace font, not serif." - LayoutBlockFlow {DIV} at (4,317) size 747x210 - LayoutBlockFlow {P} at (0,0) size 747x32 - LayoutText {#text} at (0,0) size 728x32 - text run at (0,0) width 728: "This sentence is normal for the first division, which is the next five sentences; it should" - text run at (0,16) width 160: "be a monospace font." - LayoutBlockFlow {P} at (0,48) size 747x20 - LayoutText {#text} at (0,0) size 228x19 - text run at (0,0) width 228: "This sentence should be in a serif font." - LayoutBlockFlow {P} at (0,84) size 747x19 - LayoutText {#text} at (0,0) size 301x18 - text run at (0,0) width 301: "This sentence should be in a sans-serif font." - LayoutBlockFlow {P} at (0,119) size 747x23 - LayoutText {#text} at (0,0) size 299x23 - text run at (0,0) width 299: "This sentence should be in a cursive font." - LayoutBlockFlow {P} at (0,158) size 747x20 - LayoutText {#text} at (0,0) size 267x20 - text run at (0,0) width 267: "This sentence should be in a fantasy font." - LayoutBlockFlow {P} at (0,194) size 747x16 - LayoutText {#text} at (0,0) size 352x16 - text run at (0,0) width 352: "This sentence should be in a monospace font." -layer at (8,201) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,193) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,430) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,422) size 769x2 [border: (1px inset #EEEEEE)] -layer at (8,517) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,509) size 769x2 [border: (1px inset #EEEEEE)] -layer at (25,999) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,215) size 747x2 [border: (1px inset #EEEEEE)] -layer at (25,1086) size 747x2 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (4,302) size 747x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_variant-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_variant-expected.png deleted file mode 100644 index 7cd7960..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_variant-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt deleted file mode 100644 index 788c3da..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/font_properties/font_variant-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 784x48 - LayoutText {#text} at (0,0) size 256x48 - text run at (0,0) width 256: ".one {font-variant: small-caps;}" - text run at (256,0) width 0: " " - text run at (0,16) width 224: ".two {font-variant: normal;}" - text run at (224,16) width 0: " " - text run at (0,32) width 0: " " - LayoutBlockFlow {P} at (0,115) size 784x20 - LayoutText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (0,151) size 784x20 - LayoutText {#text} at (0,0) size 573x19 - text run at (0,0) width 573: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 46x19 - LayoutText {#text} at (573,0) size 46x19 - text run at (573,0) width 46: "Normal" - LayoutText {#text} at (619,0) size 4x19 - text run at (619,0) width 4: "." - LayoutTable {TABLE} at (0,187) size 645x94 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 643x92 - LayoutTableRow {TR} at (0,0) size 643x28 - LayoutTableCell {TD} at (0,0) size 643x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 643x64 - LayoutTableCell {TD} at (0,46) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 631x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 623x20 - LayoutText {#text} at (0,0) size 265x19 - text run at (0,0) width 265: "This Paragraph should be in Small Caps." - LayoutBlockFlow {P} at (4,40) size 623x20 - LayoutText {#text} at (0,0) size 573x19 - text run at (0,0) width 573: "This Paragraph should be in Small Caps, but the Last Word in the Sentence should be " - LayoutInline {SPAN} at (0,0) size 46x19 - LayoutText {#text} at (573,0) size 46x19 - text run at (573,0) width 46: "Normal" - LayoutText {#text} at (619,0) size 4x19 - text run at (619,0) width 4: "." -layer at (8,105) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,97) size 784x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.png deleted file mode 100644 index eae32b5f..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.txt deleted file mode 100644 index faf3ecca..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/firstline-expected.txt +++ /dev/null
@@ -1,84 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 699 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x699 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x699 - LayoutBlockFlow {BODY} at (8,8) size 769x683 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutText {#text} at (0,0) size 337x19 - text run at (0,0) width 337: "The style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x64 - LayoutText {#text} at (0,0) size 360x64 - text run at (0,0) width 224: "P:first-line {color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 272: ".two:first-line {font-size: 200%;}" - text run at (272,16) width 0: " " - text run at (0,32) width 360: ".three:first-line {font-variant: small-caps;}" - text run at (360,32) width 0: " " - text run at (0,48) width 0: " " - LayoutBlockFlow {P} at (0,131) size 769x60 - LayoutText {#text} at (0,0) size 758x59 - text run at (0,0) width 400: "The first line of this paragraph, and only that one, should be green. " - text run at (400,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 609: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one" - text run at (0,40) width 24: "line." - LayoutBlockFlow {P} at (0,207) size 769x77 - LayoutText {#text} at (0,0) size 759x76 - text run at (0,0) width 749: "The first line of this paragraph, and only that one, should be" - text run at (0,37) width 205: "a larger font size as well as green. " - text run at (204,37) width 489: "If this precise combination does not occur, then the user agent has failed this test. " - text run at (692,37) width 67: "Remember" - text run at (0,57) width 567: "that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,300) size 769x80 - LayoutText {#text} at (0,0) size 757x59 - text run at (0,0) width 605: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (604,0) width 153: "Thus, if the first line is" - text run at (0,20) width 745: "not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although the" - text run at (0,40) width 135: "problem might be that " - LayoutInline {CODE} at (0,0) size 80x16 - LayoutText {#text} at (135,43) size 80x16 - text run at (135,43) width 80: "small-caps" - LayoutText {#text} at (215,40) size 750x39 - text run at (215,40) width 218: " is not supported by your browser). " - text run at (433,40) width 317: "This is extra text included for the purposes of making" - text run at (0,60) width 325: "the paragraph long enough to have more than one line." - LayoutTable {TABLE} at (0,396) size 769x287 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x285 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x257 - LayoutTableCell {TD} at (0,142) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x257 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutText {#text} at (0,0) size 735x59 - text run at (0,0) width 400: "The first line of this paragraph, and only that one, should be green. " - text run at (400,0) width 335: "If this precise combination does not occur, then the user" - text run at (0,20) width 149: "agent has failed this test. " - text run at (149,20) width 583: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than" - text run at (0,40) width 50: "one line." - LayoutBlockFlow {P} at (4,80) size 747x77 - LayoutText {#text} at (0,0) size 711x76 - text run at (0,0) width 711: "The first line of this paragraph, and only that one, should" - text run at (0,37) width 224: "be a larger font size as well as green. " - text run at (223,37) width 485: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,57) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,173) size 747x80 - LayoutText {#text} at (0,0) size 744x59 - text run at (0,0) width 605: "The first line of this paragraph, and only that one, should be displayed in small-caps style. " - text run at (604,0) width 140: "Thus, if the first line" - text run at (0,20) width 736: "is not in small-caps style, OR if the entire paragraph turns out in small-caps, then the user agent has failed this test (although" - text run at (0,40) width 157: "the problem might be that " - LayoutInline {CODE} at (0,0) size 80x16 - LayoutText {#text} at (157,43) size 80x16 - text run at (157,43) width 80: "small-caps" - LayoutText {#text} at (237,40) size 725x39 - text run at (237,40) width 218: " is not supported by your browser). " - text run at (455,40) width 270: "This is extra text included for the purposes of" - text run at (0,60) width 372: "making the paragraph long enough to have more than one line." -layer at (8,121) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,113) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png deleted file mode 100644 index c417d6e0..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt deleted file mode 100644 index cbd9e20..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/css1/pseudo/multiple_pseudo_elements-expected.txt +++ /dev/null
@@ -1,104 +0,0 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1069 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x1069 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x1069 - LayoutBlockFlow {BODY} at (8,8) size 769x1053 [bgcolor=#CCCCCC] - LayoutBlockFlow {P} at (0,0) size 769x20 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 328x19 - text run at (9,0) width 328: "he style declarations which apply to the text below are:" - LayoutBlockFlow {PRE} at (0,36) size 769x112 - LayoutText {#text} at (0,0) size 368x112 - text run at (0,0) width 224: "P:first-line {color: green;}" - text run at (224,0) width 0: " " - text run at (0,16) width 248: "P:first-letter {color: maroon;}" - text run at (248,16) width 0: " " - text run at (0,32) width 272: ".two:first-line {font-size: 200%;}" - text run at (272,32) width 0: " " - text run at (0,48) width 288: ".two:first-letter {font-size: 350%;}" - text run at (288,48) width 0: " " - text run at (0,64) width 312: "P.three:first-letter {font-size: 350%;}" - text run at (312,64) width 0: " " - text run at (0,80) width 368: "P.three:first-line {font-variant: small-caps;}" - text run at (368,80) width 0: " " - text run at (0,96) width 0: " " - LayoutBlockFlow {P} at (0,179) size 769x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 769x59 - text run at (9,0) width 727: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be green. " - text run at (736,0) width 33: "If this" - text run at (0,20) width 451: "precise combination does not occur, then the user agent has failed this test. " - text run at (450,20) width 302: "Remember that in order to ensure a complete test," - text run at (0,40) width 332: "the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,255) size 769x192 - LayoutInline {<pseudo:first-letter>} at (0,0) size 68x127 [color=#800000] - LayoutTextFragment (anonymous) at (0,2) size 68x127 - text run at (0,2) width 68: "T" - LayoutTextFragment {#text} at (68,74) size 762x117 - text run at (68,74) width 621: "he first letter of this paragraph, and only that one," - text run at (0,132) width 762: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line should be" - text run at (0,152) width 223: "200% bigger than normal and green. " - text run at (223,152) width 484: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,172) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (0,463) size 769x126 - LayoutInline {<pseudo:first-letter>} at (0,0) size 75x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - LayoutTextFragment {#text} at (75,36) size 767x89 - text run at (75,36) width 334: "e should check for quotation support,\" it was said. " - text run at (408,36) width 359: "The first two characters in this paragraph-- a double-" - text run at (0,66) width 664: "quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (664,66) width 79: "Note that the" - text run at (0,86) width 735: "inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is recommended. " - text run at (735,86) width 12: "In" - text run at (0,106) width 410: "addition, the entire first line should be in a small-caps font and green." - LayoutTable {TABLE} at (0,605) size 769x448 [border: (1px outset #808080)] - LayoutTableSection {TBODY} at (1,1) size 767x446 - LayoutTableRow {TR} at (0,0) size 767x28 - LayoutTableCell {TD} at (0,0) size 767x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] - LayoutInline {STRONG} at (0,0) size 157x19 - LayoutText {#text} at (4,4) size 157x19 - text run at (4,4) width 157: "TABLE Testing Section" - LayoutTableRow {TR} at (0,28) size 767x418 - LayoutTableCell {TD} at (0,223) size 12x28 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] - LayoutText {#text} at (4,4) size 4x19 - text run at (4,4) width 4: " " - LayoutTableCell {TD} at (12,28) size 755x418 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] - LayoutBlockFlow {P} at (4,4) size 747x60 - LayoutInline {<pseudo:first-letter>} at (0,0) size 9x19 [color=#800000] - LayoutTextFragment (anonymous) at (0,0) size 9x19 - text run at (0,0) width 9: "T" - LayoutTextFragment {#text} at (9,0) size 747x59 - text run at (9,0) width 727: "he first letter of this paragraph, and only that one, should be maroon (dark red), while the entire first line should be green. " - text run at (736,0) width 9: "If" - text run at (0,20) width 475: "this precise combination does not occur, then the user agent has failed this test. " - text run at (474,20) width 273: "Remember that in order to ensure a complete" - text run at (0,40) width 361: "test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,80) size 747x192 - LayoutInline {<pseudo:first-letter>} at (0,0) size 68x127 [color=#800000] - LayoutTextFragment (anonymous) at (0,2) size 68x127 - text run at (0,2) width 68: "T" - LayoutTextFragment {#text} at (68,74) size 743x117 - text run at (68,74) width 621: "he first letter of this paragraph, and only that one," - text run at (0,132) width 743: "should be 350% bigger than the rest of the first line of this paragraph and maroon (dark red), while the entire first line should" - text run at (0,152) width 242: "be 200% bigger than normal and green. " - text run at (242,152) width 484: "If this precise combination does not occur, then the user agent has failed this test." - text run at (0,172) width 637: "Remember that in order to ensure a complete test, the paragraph must be displayed on more than one line." - LayoutBlockFlow {P} at (4,288) size 747x126 - LayoutInline {<pseudo:first-letter>} at (0,0) size 75x64 [color=#800000] - LayoutTextFragment (anonymous) at (0,1) size 75x64 - text run at (0,1) width 75: "\"W" - LayoutTextFragment {#text} at (75,36) size 742x89 - text run at (75,36) width 334: "e should check for quotation support,\" it was said. " - text run at (408,36) width 304: "The first two characters in this paragraph-- a" - text run at (0,66) width 711: "double-quote mark and a capital 'W'-- should be 350% bigger than the rest of the paragraph, and maroon (dark red). " - text run at (711,66) width 31: "Note" - text run at (0,86) width 685: "that the inclusion of both the quotation mark and the 'W' in the first-letter style is not required under CSS1, but it is" - text run at (0,106) width 94: "recommended. " - text run at (94,106) width 426: "In addition, the entire first line should be in a small-caps font and green." -layer at (8,169) size 769x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,161) size 769x2 [border: (1px inset #EEEEEE)]
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png deleted file mode 100644 index 7e3b4e5..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png deleted file mode 100644 index 980527a..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png deleted file mode 100644 index 3e244cbc..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png deleted file mode 100644 index 3b6ba26..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png deleted file mode 100644 index 75b30d6f..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 1efe44b..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png deleted file mode 100644 index 45f5b3d..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-expected.png deleted file mode 100644 index 382158f..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png deleted file mode 100644 index 7e72d788..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-quirks-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png deleted file mode 100644 index 451a81f..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-quirks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png deleted file mode 100644 index e94d7eb..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png deleted file mode 100644 index 72f32ab..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 416666d8..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png deleted file mode 100644 index c7a0639..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_border-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png deleted file mode 100644 index 34bf31c..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png deleted file mode 100644 index fcc80605..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_layers-hide-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png deleted file mode 100644 index 35f96a2..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png deleted file mode 100644 index 05a7d75..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png deleted file mode 100644 index 5769affc..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png deleted file mode 100644 index bc537b00..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png deleted file mode 100644 index 441f9c0..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 07ff247..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png deleted file mode 100644 index 9f439c9..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-expected.png deleted file mode 100644 index 7a50b90d..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png deleted file mode 100644 index e61c5cff..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png deleted file mode 100644 index 108c3cc..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png deleted file mode 100644 index e023c41..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png deleted file mode 100644 index 3b8c25f..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_position-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png deleted file mode 100644 index 2c60872..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png deleted file mode 100644 index 232c71d..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png deleted file mode 100644 index 88cbd58c6..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png deleted file mode 100644 index f374a44..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png deleted file mode 100644 index ca68cfd..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 656d144c..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png deleted file mode 100644 index bac9e0e..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png deleted file mode 100644 index d6fc2c8..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png deleted file mode 100644 index b4bae335..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png deleted file mode 100644 index 836bacb..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png deleted file mode 100644 index c48f59f1..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png deleted file mode 100644 index cf8a51f..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/fast/table/backgr_simple-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png deleted file mode 100644 index 6ad8a86..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt deleted file mode 100644 index fb7f6a4..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/media/video-buffered-range-contains-currentTime-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x170 - LayoutBlockFlow {HTML} at (0,0) size 800x170 - LayoutBlockFlow {BODY} at (8,8) size 784x154 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,8) size 300x150 - LayoutVideo {VIDEO} at (0,0) size 300x150 -layer at (8,8) size 300x150 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150 - LayoutBlockFlow {DIV} at (0,118) size 300x32 -layer at (8,8) size 300x108 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108 -layer at (8,126) size 300x32 scrollHeight 40 - LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA] - LayoutButton {INPUT} at (0,0) size 32x32 - LayoutFlexibleBox {DIV} at (32,0) size 17.73x32 [color=#5A5A5A] - LayoutBlockFlow (anonymous) at (0,0) size 17.73x32 - LayoutText {#text} at (0,9) size 18x14 - text run at (0,9) width 18: "0:07" - LayoutFlexibleBox {DIV} at (49.73,0) size 28.27x32 [color=#5A5A5A] - LayoutBlockFlow (anonymous) at (4,0) size 24.27x32 - LayoutText {#text} at (0,9) size 25x14 - text run at (0,9) width 25: "/ 0:07" - LayoutSlider {INPUT} at (96,15) size 89.13x2 - LayoutFlexibleBox {DIV} at (0,0) size 89.13x2 - LayoutBlockFlow {DIV} at (-18,-23) size 125.13x48 - LayoutBlockFlow {DIV} at (89.13,0) size 36x48 - LayoutButton {INPUT} at (203.13,0) size 32x32 - LayoutSlider {INPUT} at (253.13,15) size 28.88x2 - LayoutFlexibleBox {DIV} at (0,0) size 28.88x2 - LayoutBlockFlow {DIV} at (-18,-23) size 64.88x48 - LayoutBlockFlow {DIV} at (28.88,0) size 36x48
diff --git a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/misc/acid3-expected.png b/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/misc/acid3-expected.png deleted file mode 100644 index 8081dd8..0000000 --- a/third_party/blink/web_tests/platform/win7/virtual/mojo-loading/http/tests/misc/acid3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/virtual/threaded/external/wpt/web-animations/timing-model/animations/README.txt b/third_party/blink/web_tests/virtual/threaded/external/wpt/web-animations/timing-model/animations/README.txt new file mode 100644 index 0000000..1e4b101 --- /dev/null +++ b/third_party/blink/web_tests/virtual/threaded/external/wpt/web-animations/timing-model/animations/README.txt
@@ -0,0 +1,3 @@ +# This suite runs external/wpt/web-animations/timing-model/animations +# tests with threaded compositing enabled (--enable-threaded-compositing flag). +
diff --git a/third_party/freetype/README.chromium b/third_party/freetype/README.chromium index 3c27011..63677bbb 100644 --- a/third_party/freetype/README.chromium +++ b/third_party/freetype/README.chromium
@@ -1,7 +1,7 @@ Name: FreeType URL: http://www.freetype.org/ -Version: VER-2-10-1-81-gd4f9c2498 -Revision: d4f9c249893a146b0c94a152f7674e288d181f95 +Version: VER-2-10-1-82-g4270e9f32 +Revision: 4270e9f3243079bb90b6af618ed4d4fd31266412 License: Custom license "inspired by the BSD, Artistic, and IJG (Independent JPEG Group) licenses" License File: src/docs/FTL.TXT
diff --git a/tools/android/errorprone_plugin/BUILD.gn b/tools/android/errorprone_plugin/BUILD.gn index ecd7a39..eeee344 100644 --- a/tools/android/errorprone_plugin/BUILD.gn +++ b/tools/android/errorprone_plugin/BUILD.gn
@@ -14,6 +14,7 @@ "src/org/chromium/tools/errorprone/plugin/NoRedundantFieldInitCheck.java", "src/org/chromium/tools/errorprone/plugin/NoSynchronizedMethodCheck.java", "src/org/chromium/tools/errorprone/plugin/NoSynchronizedThisCheck.java", + "src/org/chromium/tools/errorprone/plugin/TestClassNameCheck.java", ] # Necessary to avoid dependency cycle
diff --git a/tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/TestClassNameCheck.java b/tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/TestClassNameCheck.java new file mode 100644 index 0000000..fdf2220 --- /dev/null +++ b/tools/android/errorprone_plugin/src/org/chromium/tools/errorprone/plugin/TestClassNameCheck.java
@@ -0,0 +1,43 @@ +// Copyright 2019 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. + +package org.chromium.tools.errorprone.plugin; + +import com.google.auto.service.AutoService; +import com.google.errorprone.BugPattern; +import com.google.errorprone.VisitorState; +import com.google.errorprone.bugpatterns.BugChecker; +import com.google.errorprone.matchers.Description; +import com.google.errorprone.matchers.Matcher; +import com.google.errorprone.matchers.Matchers; +import com.sun.source.tree.AnnotationTree; + +/** + * Assert class names of classes with Java tests in them end with "Test". + * + * Test classes are identified as those that are annotated with {@link org.junit.runner.RunWith}. + * This works for both JUnit and Instrumentation tests. + */ +@AutoService(BugChecker.class) +@BugPattern(name = "TestClassNameCheck", + summary = "Class names of classes with tests in them should end with \"Test\".", + severity = BugPattern.SeverityLevel.ERROR, linkType = BugPattern.LinkType.CUSTOM, + link = "http://crbug.com/1029370") +public class TestClassNameCheck extends BugChecker implements BugChecker.AnnotationTreeMatcher { + static final Matcher<AnnotationTree> TEST_ANNOTATION = + Matchers.anyOf(Matchers.isType("org.junit.runner.RunWith")); + + /** + * Match if nullable annotation is of type org.junit.runner.RunWith. + */ + @Override + public Description matchAnnotation(AnnotationTree annotationTree, VisitorState visitorState) { + String filePath = visitorState.getPath().getCompilationUnit().getSourceFile().getName(); + if (TEST_ANNOTATION.matches(annotationTree, visitorState) + && !filePath.endsWith("Test.java")) { + return describeMatch(annotationTree); + } + return Description.NO_MATCH; + } +}
diff --git a/tools/binary_size/libsupersize/caspian/tree_builder.cc b/tools/binary_size/libsupersize/caspian/tree_builder.cc index 8b9f9956b..c42e5c0f 100644 --- a/tools/binary_size/libsupersize/caspian/tree_builder.cc +++ b/tools/binary_size/libsupersize/caspian/tree_builder.cc
@@ -290,7 +290,7 @@ class_node->id_path = GroupedPath{node->id_path.group, owned_strings_.back()}; class_node->short_name_index = - short_name_index + node->id_path.path.size() + 1; + short_name_index + node->id_path.size() + 1; class_node->src_path = node->src_path; class_node->component = node->component; class_node->container_type = ContainerType::kJavaClass;
diff --git a/tools/binary_size/libsupersize/caspian/tree_builder_test.cc b/tools/binary_size/libsupersize/caspian/tree_builder_test.cc index 638dc5e..7f28927 100644 --- a/tools/binary_size/libsupersize/caspian/tree_builder_test.cc +++ b/tools/binary_size/libsupersize/caspian/tree_builder_test.cc
@@ -47,6 +47,12 @@ sym.size_info_ = info; info->raw_symbols.push_back(sym); } + +std::string ShortName(const Json::Value& node) { + const std::string id_path = node["idPath"].asString(); + const int short_name_index = node["shortNameIndex"].asInt(); + return id_path.substr(short_name_index); +} } // namespace std::unique_ptr<SizeInfo> CreateSizeInfo() { @@ -150,6 +156,7 @@ "Mobile/chrome/android/features/start_surface/public/java/src/" "org/chromium/chrome/features/start_surface/StartSurface.java")) ["children"][0]; + EXPECT_EQ("StartSurface$OverviewModeObserver", ShortName(class_symbol)); EXPECT_EQ( "Mobile/chrome/android/features/start_surface/public/java/src/" @@ -162,8 +169,6 @@ Json::Value dex_symbol = class_symbol["children"][0]; EXPECT_EQ(0u, dex_symbol["children"].size()); - const std::string id_path = dex_symbol["idPath"].asString(); - const int short_name_index = dex_symbol["shortNameIndex"].asInt(); - EXPECT_EQ("android.graphics.Bitmap a()", id_path.substr(short_name_index)); + EXPECT_EQ("android.graphics.Bitmap a()", ShortName(dex_symbol)); } } // namespace caspian
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids index cdb8e8c6..1f644ae 100644 --- a/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids
@@ -226,9 +226,12 @@ "components/sync/driver/resources.grd": { "includes": [12140], }, - "content/browser/webrtc/resources/resources.grd": { + "content/browser/resources/media/media_internals_resources.grd": { "includes": [12160], }, + "content/browser/webrtc/resources/resources.grd": { + "includes": [12170], + }, # END chrome/ WebUI resources section # START chrome/ miscellaneous section. @@ -304,22 +307,22 @@ "messages": [12740], }, "components/omnibox/resources/omnibox_resources.grd": { - "includes": [14650], - }, - "components/policy/resources/policy_templates.grd": { - "structures": [14660], - }, - "components/resources/components_resources.grd": { "includes": [14670], }, + "components/policy/resources/policy_templates.grd": { + "structures": [14680], + }, + "components/resources/components_resources.grd": { + "includes": [14690], + }, "components/resources/components_scaled_resources.grd": { - "structures": [14740], + "structures": [14770], }, "components/embedder_support/android/java/strings/web_contents_delegate_android_strings.grd": { - "messages": [14780], + "messages": [14810], }, "components/autofill/core/browser/autofill_address_rewriter_resources.grd":{ - "includes": [14800] + "includes": [14830] }, # END components/ section. @@ -388,13 +391,13 @@ "includes": [14930], }, "content/shell/shell_resources.grd": { - "includes": [14980], + "includes": [14970], }, # This file is generated during the build. "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": { "META": {"sizes": {"includes": [20],}}, - "includes": [14990], + "includes": [14980], }, # END content/ section. @@ -429,130 +432,130 @@ "messages": [15130], }, "ash/components/ash_components_strings.grd": { - "messages": [15860], + "messages": [15870], }, "ash/keyboard/ui/keyboard_resources.grd": { - "includes": [16110], + "includes": [16120], }, "ash/login/resources/login_resources.grd": { - "structures": [16190], + "structures": [16200], }, "ash/public/cpp/resources/ash_public_unscaled_resources.grd": { - "includes": [16200], + "includes": [16210], }, "chromecast/renderer/resources/extensions_renderer_resources.grd": { - "includes": [16210], + "includes": [16220], }, "cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": { - "includes": [16220], - "messages": [16230], - }, - - "device/bluetooth/bluetooth_strings.grd": { + "includes": [16230], "messages": [16240], }, + "device/bluetooth/bluetooth_strings.grd": { + "messages": [16250], + }, + "device/fido/fido_strings.grd": { - "messages": [16260], + "messages": [16270], }, "extensions/browser/resources/extensions_browser_resources.grd": { - "structures": [16270], + "structures": [16280], }, "extensions/extensions_resources.grd": { - "includes": [16280], + "includes": [16290], }, "extensions/renderer/resources/extensions_renderer_resources.grd": { - "includes": [16290], - "structures": [16360], + "includes": [16300], + "structures": [16370], }, "extensions/shell/app_shell_resources.grd": { - "includes": [16370], + "includes": [16380], }, "extensions/strings/extensions_strings.grd": { - "messages": [16380], + "messages": [16390], }, "headless/lib/resources/headless_lib_resources.grd": { - "includes": [16460], - }, - - "mojo/public/js/mojo_bindings_resources.grd": { "includes": [16470], }, + "mojo/public/js/mojo_bindings_resources.grd": { + "includes": [16480], + }, + "net/base/net_resources.grd": { - "includes": [16490], + "includes": [16500], }, "remoting/resources/remoting_strings.grd": { - "messages": [16500], + "messages": [16510], }, "services/services_strings.grd": { - "messages": [16880], + "messages": [16890], }, "third_party/blink/public/blink_image_resources.grd": { - "structures": [16890], + "structures": [16900], }, "third_party/blink/public/blink_resources.grd": { - "includes": [16900], + "includes": [16910], }, "third_party/blink/renderer/modules/media_controls/resources/media_controls_resources.grd": { - "includes": [16980], - "structures": [16990], + "includes": [16990], + "structures": [17000], }, "third_party/blink/public/strings/blink_strings.grd": { - "messages": [17000], + "messages": [17010], }, "third_party/ink/ink_resources.grd": { - "includes": [17310], + "includes": [17320], }, "third_party/libaddressinput/chromium/address_input_strings.grd": { - "messages": [17320], + "messages": [17330], }, "ui/base/test/ui_base_test_resources.grd": { - "messages": [17370], + "messages": [17380], }, "ui/chromeos/resources/ui_chromeos_resources.grd": { - "structures": [17380], + "structures": [17390], }, "ui/chromeos/ui_chromeos_strings.grd": { - "messages": [17480], + "messages": [17490], }, "ui/file_manager/file_manager_resources.grd": { - "includes": [18400], + "includes": [18410], }, "ui/resources/ui_resources.grd": { - "structures": [18620], + "structures": [18630], }, "ui/resources/ui_unscaled_resources.grd": { - "includes": [18760], + "includes": [18770], }, "ui/strings/app_locale_settings.grd": { - "messages": [18790], - }, - "ui/strings/ui_strings.grd": { "messages": [18800], }, + "ui/strings/ui_strings.grd": { + "messages": [18810], + }, "ui/views/resources/views_resources.grd": { - "structures": [19090], + "structures": [19110], }, "ui/webui/resources/webui_resources.grd": { - "includes": [19150], - "structures": [19310], + "includes": [19170], + "structures": [19330], }, "weblayer/weblayer_resources.grd": { - "includes": [19930], + "includes": [19950], }, # This file is generated during the build. "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": { "META": {"sizes": {"includes": [500],}}, - "includes": [19940], + "includes": [19960], }, # END "everything else" section.
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml index 78efe25..f9b666b 100644 --- a/tools/metrics/histograms/histograms.xml +++ b/tools/metrics/histograms/histograms.xml
@@ -138953,6 +138953,8 @@ <histogram name="Sharing.ClickToCallContextMenuPhoneNumberParsingDelay" units="microseconds" expires_after="M81"> +<!-- Name completed by histogram_suffixes name="PhoneNumberRegexVariant" --> + <owner>himanshujaju@chromium.org</owner> <owner>knollr@chromium.org</owner> <owner>peter@chromium.org</owner> @@ -182060,6 +182062,13 @@ <affected-histogram name="UMA.PersistentAllocator.UsedPct"/> </histogram_suffixes> +<histogram_suffixes name="PhoneNumberRegexVariant" separator="."> + <suffix name="LowConfidenceModified" label="Low confidence modified"/> + <suffix name="Simple" label="Simple regex"/> + <affected-histogram + name="Sharing.ClickToCallContextMenuPhoneNumberParsingDelay"/> +</histogram_suffixes> + <histogram_suffixes name="PhysicalWebDebugActions" separator="."> <suffix name="ChromeStart" label="when Chrome first starts up"/> <suffix name="LaunchFromDiagnostics"
diff --git a/tools/perf/core/stacktrace_unittest.py b/tools/perf/core/stacktrace_unittest.py index 2e07ae6..51fbb7f 100644 --- a/tools/perf/core/stacktrace_unittest.py +++ b/tools/perf/core/stacktrace_unittest.py
@@ -15,11 +15,10 @@ # Stack traces do not currently work on 10.6, but they are also being # disabled shortly so just disable it for now. # All platforms except chromeos should at least have a valid minidump. - # Disabled on Android, flaky: crbug.com/971998. - @decorators.Disabled('snowleopard', 'chromeos', 'android') + @decorators.Disabled('snowleopard', 'chromeos') def testValidDump(self): with self.assertRaises(exceptions.DevtoolsTargetCrashException) as c: - self._tab.Navigate('chrome://crash', timeout=5) + self._tab.Navigate('chrome://crash', timeout=10) self.assertTrue(c.exception.is_valid_dump) # Stack traces aren't working on Android yet.
diff --git a/tools/perf/expectations.config b/tools/perf/expectations.config index 534986f0..b47a870 100644 --- a/tools/perf/expectations.config +++ b/tools/perf/expectations.config
@@ -325,6 +325,10 @@ crbug.com/1002640 [ android-pixel-2 ] system_health.common_mobile/browse:chrome:newtab [ Skip ] crbug.com/1002665 [ android-pixel-2 ] system_health.common_mobile/browse:chrome:omnibox [ Skip ] crbug.com/1014655 [ android-webview ] system_health.common_mobile/browse:social:instagram:2019 [ Skip ] +crbug.com/1029460 [ android-go ] system_health.common_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5 ] system_health.common_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5x ] system_health.common_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-6 android-webview ] system_health.common_mobile/browse:news:nytimes:2019 [ Skip ] # Benchmark: system_health.memory_desktop crbug.com/1027686 [ linux ] system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018 [ Skip ] @@ -401,6 +405,10 @@ crbug.com/1017661 [ android-nexus-5x ] system_health.memory_mobile/browse:media:flickr_infinite_scroll [ Skip ] crbug.com/1017661 [ android-nexus-5x ] system_health.memory_mobile/browse:social:facebook_infinite_scroll:2018 [ Skip ] crbug.com/1017661 [ android-nexus-5x ] system_health.memory_mobile/browse:tech:discourse_infinite_scroll:2018 [ Skip ] +crbug.com/1029460 [ android-go ] system_health.memory_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5 ] system_health.memory_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5x ] system_health.memory_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-6 android-webview ] system_health.memory_mobile/browse:news:nytimes:2019 [ Skip ] # Benchmark: tab_switching.typical_25 crbug.com/747026 [ mac ] tab_switching.typical_25/multitab:misc:typical24 [ Skip ] @@ -452,6 +460,13 @@ crbug.com/1002665 [ android-pixel-2 ] v8.browsing_mobile/browse:chrome:omnibox [ Skip ] crbug.com/1014655 [ android-webview ] v8.browsing_mobile/browse:social:instagram:2019 [ Skip ] crbug.com/1028072 [ android ] v8.browsing_mobile/browse:media:youtube:2019 [ Skip ] +crbug.com/1029460 [ android-go ] v8.browsing_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5 ] v8.browsing_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5x ] v8.browsing_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-6 android-webview ] v8.browsing_mobile/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029465 [ android-nexus-5 ] v8.browsing_mobile/browse:social:facebook_infinite_scroll [ Skip ] +crbug.com/1029465 [ android-nexus-6 android-webview ] v8.browsing_mobile/browse:social:facebook_infinite_scroll [ Skip ] +crbug.com/1029467 [ android-go ] v8.browsing_mobile/browse:news:washingtonpost:2019 [ Skip ] # Benchmark: v8.browsing_mobile-future # Disabled v8.browsing_mobile-future for capacity reasons while we update @@ -470,6 +485,10 @@ crbug.com/958336 [ android ] v8.browsing_mobile-future/browse:shopping:flipkart [ Skip ] crbug.com/1002640 [ android-pixel-2 ] v8.browsing_mobile-future/browse:chrome:newtab [ Skip ] crbug.com/1002665 [ android-pixel-2 ] v8.browsing_mobile-future/browse:chrome:omnibox [ Skip ] +crbug.com/1029460 [ android-go ] v8.browsing_mobile-future/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5 ] v8.browsing_mobile-future/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-5x ] v8.browsing_mobile-future/browse:news:nytimes:2019 [ Skip ] +crbug.com/1029460 [ android-nexus-6 android-webview ] v8.browsing_mobile-future/browse:news:nytimes:2019 [ Skip ] # Benchmark: v8.runtime_stats.top_25 crbug.com/954229 [ mac ] v8.runtime_stats.top_25/* [ Skip ]
diff --git a/ui/gfx/animation/animation.cc b/ui/gfx/animation/animation.cc index a8ebad6..4295c88d 100644 --- a/ui/gfx/animation/animation.cc +++ b/ui/gfx/animation/animation.cc
@@ -140,14 +140,15 @@ // static bool Animation::PrefersReducedMotion() { - if (!prefers_reduced_motion_.has_value()) { - if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kForcePrefersReducedMotion)) { - prefers_reduced_motion_ = true; - } else { - UpdatePrefersReducedMotion(); - } + // --force-prefers-reduced-motion must always override + // |prefers_reduced_motion_|, so check it first. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForcePrefersReducedMotion)) { + return true; } + + if (!prefers_reduced_motion_.has_value()) + UpdatePrefersReducedMotion(); return prefers_reduced_motion_.value(); }
diff --git a/ui/gfx/animation/animation.h b/ui/gfx/animation/animation.h index cc57f1f..238be58 100644 --- a/ui/gfx/animation/animation.h +++ b/ui/gfx/animation/animation.h
@@ -84,6 +84,9 @@ // Should only be called from the browser process, on the UI thread. static bool PrefersReducedMotion(); static void UpdatePrefersReducedMotion(); + static void SetPrefersReducedMotionForTesting(bool prefers_reduced_motion) { + prefers_reduced_motion_ = prefers_reduced_motion; + } protected: // Invoked from Start to allow subclasses to prepare for the animation.
diff --git a/ui/gfx/animation/animation_unittest.cc b/ui/gfx/animation/animation_unittest.cc index d1b2848..4f021f1 100644 --- a/ui/gfx/animation/animation_unittest.cc +++ b/ui/gfx/animation/animation_unittest.cc
@@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/command_line.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h" @@ -9,6 +10,7 @@ #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/linear_animation.h" #include "ui/gfx/animation/test_animation_delegate.h" +#include "ui/gfx/switches.h" #if defined(OS_WIN) #include <windows.h> @@ -158,4 +160,18 @@ EXPECT_EQ(0.0, animation.GetCurrentValue()); } +/////////////////////////////////////////////////////////////////////////////// +// PrefersReducedMotion tests + +TEST_F(AnimationTest, PrefersReducedMotionRespectsOverrideFlag) { + base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( + switches::kForcePrefersReducedMotion, "1"); + EXPECT_TRUE(Animation::PrefersReducedMotion()); + + // It doesn't matter what the system setting says; the flag should continue to + // override it. + Animation::SetPrefersReducedMotionForTesting(false); + EXPECT_TRUE(Animation::PrefersReducedMotion()); +} + } // namespace gfx
diff --git a/ui/gfx/render_text.cc b/ui/gfx/render_text.cc index 3ed8eed2..cb1a797 100644 --- a/ui/gfx/render_text.cc +++ b/ui/gfx/render_text.cc
@@ -556,7 +556,7 @@ std::unique_ptr<RenderText> RenderText::CreateInstanceOfSameStyle( const base::string16& text) const { - std::unique_ptr<RenderText> render_text = CreateInstanceOfSameType(); + std::unique_ptr<RenderText> render_text = CreateRenderText(); // |SetText()| must be called before styles are set. render_text->SetText(text); render_text->SetFontList(font_list_); @@ -652,12 +652,11 @@ } void RenderText::SetObscuredRevealIndex(int index) { - if (obscured_reveal_index_ == index) - return; - - obscured_reveal_index_ = index; - cached_bounds_and_offset_valid_ = false; - OnTextAttributeChanged(); + if (obscured_reveal_index_ != index) { + obscured_reveal_index_ = index; + cached_bounds_and_offset_valid_ = false; + OnTextAttributeChanged(); + } } void RenderText::SetMultiline(bool multiline) { @@ -680,23 +679,23 @@ } void RenderText::SetWordWrapBehavior(WordWrapBehavior behavior) { - if (word_wrap_behavior_ == behavior) - return; - word_wrap_behavior_ = behavior; - if (multiline_) { - cached_bounds_and_offset_valid_ = false; - lines_.clear(); - OnTextAttributeChanged(); + if (word_wrap_behavior_ != behavior) { + word_wrap_behavior_ = behavior; + if (multiline_) { + cached_bounds_and_offset_valid_ = false; + lines_.clear(); + OnTextAttributeChanged(); + } } } void RenderText::SetMinLineHeight(int line_height) { - if (min_line_height_ == line_height) - return; - min_line_height_ = line_height; - cached_bounds_and_offset_valid_ = false; - lines_.clear(); - OnDisplayTextAttributeChanged(); + if (min_line_height_ != line_height) { + min_line_height_ = line_height; + cached_bounds_and_offset_valid_ = false; + lines_.clear(); + OnDisplayTextAttributeChanged(); + } } void RenderText::SetElideBehavior(ElideBehavior elide_behavior) { @@ -967,13 +966,12 @@ } void RenderText::SetDirectionalityMode(DirectionalityMode mode) { - if (mode == directionality_mode_) - return; - - directionality_mode_ = mode; - text_direction_ = base::i18n::UNKNOWN_DIRECTION; - cached_bounds_and_offset_valid_ = false; - OnLayoutTextAttributeChanged(false); + if (mode != directionality_mode_) { + directionality_mode_ = mode; + text_direction_ = base::i18n::UNKNOWN_DIRECTION; + cached_bounds_and_offset_valid_ = false; + OnLayoutTextAttributeChanged(false); + } } base::i18n::TextDirection RenderText::GetDisplayTextDirection() { @@ -1041,7 +1039,7 @@ } bool RenderText::IsValidLogicalIndex(size_t index) const { - // Check that the index is at a valid code point (not mid-surrgate-pair) and + // Check that the index is at a valid code point (not mid-surrogate-pair) and // that it's not truncated from the display text (its glyph may be shown). // // Indices within truncated text are disallowed so users can easily interact @@ -1886,7 +1884,7 @@ gfx::Rect RenderText::ExpandToBeVerticallySymmetric( const gfx::Rect& rect, const gfx::Rect& display_rect) { - // Mirror |rect| accross the horizontal line dividing |display_rect| in half. + // Mirror |rect| across the horizontal line dividing |display_rect| in half. gfx::Rect result = rect; int mid_y = display_rect.CenterPoint().y(); // The top of the mirror rect must be equidistant with the bottom of the
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h index b705633..ee5748f 100644 --- a/ui/gfx/render_text.h +++ b/ui/gfx/render_text.h
@@ -208,9 +208,6 @@ // Creates a RenderText instance. static std::unique_ptr<RenderText> CreateRenderText(); - // Creates another instance of the same concrete class. - virtual std::unique_ptr<RenderText> CreateInstanceOfSameType() const = 0; - // Like above but copies all style settings too. std::unique_ptr<RenderText> CreateInstanceOfSameStyle( const base::string16& text) const;
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc index 876b5e3..627f3a0 100644 --- a/ui/gfx/render_text_harfbuzz.cc +++ b/ui/gfx/render_text_harfbuzz.cc
@@ -1379,11 +1379,6 @@ RenderTextHarfBuzz::~RenderTextHarfBuzz() {} -std::unique_ptr<RenderText> RenderTextHarfBuzz::CreateInstanceOfSameType() - const { - return std::make_unique<RenderTextHarfBuzz>(); -} - const base::string16& RenderTextHarfBuzz::GetDisplayText() { // TODO(krb): Consider other elision modes for multiline. if ((multiline() && (max_lines() == 0 || elide_behavior() != ELIDE_TAIL)) ||
diff --git a/ui/gfx/render_text_harfbuzz.h b/ui/gfx/render_text_harfbuzz.h index 75370f5..d35e6b6 100644 --- a/ui/gfx/render_text_harfbuzz.h +++ b/ui/gfx/render_text_harfbuzz.h
@@ -218,7 +218,6 @@ ~RenderTextHarfBuzz() override; // RenderText: - std::unique_ptr<RenderText> CreateInstanceOfSameType() const override; const base::string16& GetDisplayText() override; Size GetStringSize() override; SizeF GetStringSizeF() override;
