diff --git a/DEPS b/DEPS index 7218264befa109..9136e4879bee3c 100644 --- a/DEPS +++ b/DEPS @@ -199,7 +199,7 @@ vars = { # 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': '9702fc6f385205e43b49cf7e09222720cc11aa8c', + 'skia_revision': '8d29ab630996586f702768cfc978fabce688e578', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other. @@ -250,7 +250,7 @@ vars = { # 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': '8dc311320c19b6b008fc6f55218b8f238ec982cb', + 'freetype_revision': '209e9841f28ef3b38b9784a39e85edf69a9a853d', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. @@ -1273,7 +1273,7 @@ deps = { }, 'src/third_party/perfetto': - Var('android_git') + '/platform/external/perfetto.git' + '@' + '44860edcd2606f62b21b82c6bf9042309fe70443', + Var('android_git') + '/platform/external/perfetto.git' + '@' + '122834484af3d2f68b0ee0320d0e9e08e4d59bad', 'src/third_party/perl': { 'url': Var('chromium_git') + '/chromium/deps/perl.git' + '@' + '6f3e5028eb65d0b4c5fdd792106ac4c84eee1eb3', @@ -1515,7 +1515,7 @@ deps = { Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '66460536ee975a3e98931b7b40a661a63fd9cd57', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + 'ef53a7fc0bc307ada3ebaaef10d2507e571186a8', + Var('webrtc_git') + '/src.git' + '@' + '90776cb0ef72d437983c8d29e5a7f2ac264c107d', 'src/third_party/libgifcodec': Var('skia_git') + '/libgifcodec' + '@'+ Var('libgifcodec_revision'), @@ -1587,7 +1587,7 @@ deps = { Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@4c406c738cada0fa0aae1cb7d84d6f7ce333d19e', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@3ac05951062516a69a7f82b926df82e4b1d05052', 'condition': 'checkout_src_internal', }, @@ -1595,7 +1595,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/help_app/app', - 'version': 'pNxnip2F8wICOrBjoNUbN_PM0CdfAwj4mNlQSwyP7dgC', + 'version': 'ZzdNx1RhNNM7W1NdBgJ2TuE7u2K6DBW9qC6-RqGDE2QC', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -1606,7 +1606,7 @@ deps = { 'packages': [ { 'package': 'chromeos_internal/apps/media_app/app', - 'version': 'KoDoxKsUgYmDk8Xbp62-4Mftkzdv-ER37BKn6ELSk8MC', + 'version': 'Pn61iPHsiXYTFn4jm8-HfP55P3eyyfCpXMvhkhHk8H4C', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', diff --git a/build/fuchsia/linux.sdk.sha1 b/build/fuchsia/linux.sdk.sha1 index 5a3c3515e22063..5ac962c04c3095 100644 --- a/build/fuchsia/linux.sdk.sha1 +++ b/build/fuchsia/linux.sdk.sha1 @@ -1 +1 @@ -0.20210123.0.1 +0.20210123.2.1 diff --git a/build/fuchsia/mac.sdk.sha1 b/build/fuchsia/mac.sdk.sha1 index 5a3c3515e22063..5ac962c04c3095 100644 --- a/build/fuchsia/mac.sdk.sha1 +++ b/build/fuchsia/mac.sdk.sha1 @@ -1 +1 @@ -0.20210123.0.1 +0.20210123.2.1 diff --git a/cc/layers/picture_layer_unittest.cc b/cc/layers/picture_layer_unittest.cc index 94cd8ecc191489..f0f15a7cbb298e 100644 --- a/cc/layers/picture_layer_unittest.cc +++ b/cc/layers/picture_layer_unittest.cc @@ -160,8 +160,7 @@ TEST(PictureLayerTest, ClearVisibleRectWhenNoTiling) { gfx::Size layer_size(50, 50); FakeContentLayerClient client; client.set_bounds(layer_size); - client.add_draw_image(CreateDiscardablePaintImage(layer_size), gfx::Point(), - PaintFlags()); + client.add_draw_image(CreateDiscardablePaintImage(layer_size), gfx::Point()); scoped_refptr layer = PictureLayer::Create(&client); layer->SetBounds(gfx::Size(10, 10)); diff --git a/cc/paint/discardable_image_map_unittest.cc b/cc/paint/discardable_image_map_unittest.cc index 4675f2989bcf5c..1b217d8e9c31ab 100644 --- a/cc/paint/discardable_image_map_unittest.cc +++ b/cc/paint/discardable_image_map_unittest.cc @@ -47,7 +47,7 @@ struct PositionScaleDrawImage { sk_sp CreateRecording(const PaintImage& discardable_image, const gfx::Rect& visible_rect) { auto buffer = sk_make_sp(); - buffer->push(discardable_image, 0.f, 0.f, nullptr); + buffer->push(discardable_image, 0.f, 0.f); return buffer; } @@ -122,10 +122,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectTest) { if ((x + y) & 1) { discardable_image[y][x] = CreateDiscardablePaintImage(gfx::Size(500, 500)); - PaintFlags flags; content_layer_client.add_draw_image( - discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6), - flags); + discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6)); } } } @@ -194,10 +192,9 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectNonZeroLayer) { if ((x + y) & 1) { discardable_image[y][x] = CreateDiscardablePaintImage(gfx::Size(500, 500)); - PaintFlags flags; content_layer_client.add_draw_image( discardable_image[y][x], - gfx::Point(1024 + x * 512 + 6, y * 512 + 6), flags); + gfx::Point(1024 + x * 512 + 6, y * 512 + 6)); } } } @@ -295,10 +292,8 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectOnePixelQuery) { if ((x + y) & 1) { discardable_image[y][x] = CreateDiscardablePaintImage(gfx::Size(500, 500)); - PaintFlags flags; content_layer_client.add_draw_image( - discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6), - flags); + discardable_image[y][x], gfx::Point(x * 512 + 6, y * 512 + 6)); } } } @@ -334,9 +329,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMassiveImage) { PaintImage discardable_image = CreateDiscardablePaintImage(gfx::Size(1 << 25, 1 << 25), nullptr, false /* allocate_encoded_memory */); - PaintFlags flags; - content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0), - flags); + content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); @@ -416,13 +409,13 @@ TEST_F(DiscardableImageMapTest, RestoreSavedTransformedLayers) { PaintImage discardable_image3 = CreateDiscardablePaintImage(gfx::Size(25, 25)); display_list->push(25, 25); - display_list->push(discardable_image1, 0.f, 0.f, nullptr); + display_list->push(discardable_image1, 0.f, 0.f); display_list->push(nullptr, &paint); display_list->push(100, 100); - display_list->push(discardable_image2, 0.f, 0.f, nullptr); + display_list->push(discardable_image2, 0.f, 0.f); display_list->push(); display_list->push(0, 100); - display_list->push(discardable_image3, 0.f, 0.f, nullptr); + display_list->push(discardable_image3, 0.f, 0.f); display_list->EndPaintOfUnpaired(visible_rect); display_list->Finalize(); @@ -471,9 +464,7 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMaxImage) { PaintImage discardable_image = CreateDiscardablePaintImage( gfx::Size(dimension, dimension), no_color_space, false /* allocate_encoded_memory */); - PaintFlags flags; - content_layer_client.add_draw_image(discardable_image, gfx::Point(42, 42), - flags); + content_layer_client.add_draw_image(discardable_image, gfx::Point(42, 42)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); @@ -511,13 +502,10 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMaxImageMaxLayer) { gfx::Size(dimension, dimension), no_color_space, false /* allocate_encoded_memory */); - PaintFlags flags; - content_layer_client.add_draw_image(discardable_image1, gfx::Point(0, 0), - flags); - content_layer_client.add_draw_image(discardable_image2, gfx::Point(10000, 0), - flags); + content_layer_client.add_draw_image(discardable_image1, gfx::Point(0, 0)); + content_layer_client.add_draw_image(discardable_image2, gfx::Point(10000, 0)); content_layer_client.add_draw_image(discardable_image3, - gfx::Point(-10000, 500), flags); + gfx::Point(-10000, 500)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); @@ -560,13 +548,10 @@ TEST_F(DiscardableImageMapTest, GetDiscardableImagesRectInBounds) { PaintImage long_discardable_image = CreateDiscardablePaintImage(gfx::Size(10000, 100)); - PaintFlags flags; - content_layer_client.add_draw_image(discardable_image1, gfx::Point(-10, -11), - flags); - content_layer_client.add_draw_image(discardable_image2, gfx::Point(950, 951), - flags); + content_layer_client.add_draw_image(discardable_image1, gfx::Point(-10, -11)); + content_layer_client.add_draw_image(discardable_image2, gfx::Point(950, 951)); content_layer_client.add_draw_image(long_discardable_image, - gfx::Point(-100, 500), flags); + gfx::Point(-100, 500)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); @@ -701,7 +686,7 @@ TEST_F(DiscardableImageMapTest, GathersDiscardableImagesFromNestedOps) { auto internal_record = sk_make_sp(); PaintImage discardable_image = CreateDiscardablePaintImage(gfx::Size(100, 100)); - internal_record->push(discardable_image, 0.f, 0.f, nullptr); + internal_record->push(discardable_image, 0.f, 0.f); // This |discardable_image2| is in a DisplayItemList that gets added // to the root buffer. @@ -711,7 +696,7 @@ TEST_F(DiscardableImageMapTest, GathersDiscardableImagesFromNestedOps) { scoped_refptr display_list = new DisplayItemList(DisplayItemList::kToBeReleasedAsPaintOpBuffer); display_list->StartPaint(); - display_list->push(discardable_image2, 100.f, 100.f, nullptr); + display_list->push(discardable_image2, 100.f, 100.f); display_list->EndPaintOfUnpaired(gfx::Rect(100, 100, 100, 100)); display_list->Finalize(); @@ -750,12 +735,10 @@ TEST_F(DiscardableImageMapTest, GathersAnimatedImages) { PaintImage animation_loop_infinite = CreateAnimatedImage(image_size, frames, 1u); - PaintFlags flags; - content_layer_client.add_draw_image(static_image, gfx::Point(0, 0), flags); - content_layer_client.add_draw_image(animated_loop_none, gfx::Point(100, 100), - flags); + content_layer_client.add_draw_image(static_image, gfx::Point(0, 0)); + content_layer_client.add_draw_image(animated_loop_none, gfx::Point(100, 100)); content_layer_client.add_draw_image(animation_loop_infinite, - gfx::Point(200, 200), flags); + gfx::Point(200, 200)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); @@ -796,10 +779,9 @@ TEST_F(DiscardableImageMapTest, GathersPaintWorklets) { base::MakeRefCounted(gfx::SizeF(image_size)); PaintImage paint_worklet_image = CreatePaintWorkletPaintImage(input); - PaintFlags flags; - content_layer_client.add_draw_image(static_image, gfx::Point(0, 0), flags); - content_layer_client.add_draw_image(paint_worklet_image, gfx::Point(100, 100), - flags); + content_layer_client.add_draw_image(static_image, gfx::Point(0, 0)); + content_layer_client.add_draw_image(paint_worklet_image, + gfx::Point(100, 100)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); @@ -823,13 +805,13 @@ TEST_F(DiscardableImageMapTest, CapturesImagesInPaintRecordShaders) { shader_record->push(2.0f, 2.0f); PaintImage static_image = CreateDiscardablePaintImage(gfx::Size(100, 100)); - shader_record->push(static_image, 0.f, 0.f, nullptr); + shader_record->push(static_image, 0.f, 0.f); std::vector frames = { FrameMetadata(true, base::TimeDelta::FromMilliseconds(1)), FrameMetadata(true, base::TimeDelta::FromMilliseconds(1))}; PaintImage animated_image = CreateAnimatedImage(gfx::Size(100, 100), frames); - shader_record->push(animated_image, 0.f, 0.f, nullptr); + shader_record->push(animated_image, 0.f, 0.f); gfx::Rect visible_rect(500, 500); scoped_refptr display_list = new DisplayItemList(); @@ -870,13 +852,13 @@ TEST_F(DiscardableImageMapTest, CapturesImagesInPaintFilters) { auto filter_record = sk_make_sp(); PaintImage static_image = CreateDiscardablePaintImage(gfx::Size(100, 100)); - filter_record->push(static_image, 0.f, 0.f, nullptr); + filter_record->push(static_image, 0.f, 0.f); std::vector frames = { FrameMetadata(true, base::TimeDelta::FromMilliseconds(1)), FrameMetadata(true, base::TimeDelta::FromMilliseconds(1))}; PaintImage animated_image = CreateAnimatedImage(gfx::Size(100, 100), frames); - filter_record->push(animated_image, 0.f, 0.f, nullptr); + filter_record->push(animated_image, 0.f, 0.f); gfx::Rect visible_rect(500, 500); scoped_refptr display_list = new DisplayItemList(); @@ -943,7 +925,7 @@ TEST_F(DiscardableImageMapTest, EmbeddedShaderWithAnimatedImages) { FrameMetadata(true, base::TimeDelta::FromMilliseconds(1)), FrameMetadata(true, base::TimeDelta::FromMilliseconds(1))}; PaintImage animated_image = CreateAnimatedImage(gfx::Size(100, 100), frames); - shader_record->push(animated_image, 0.f, 0.f, nullptr); + shader_record->push(animated_image, 0.f, 0.f); auto shader_with_image = PaintShader::MakePaintRecord( shader_record, tile, SkTileMode::kClamp, SkTileMode::kClamp, nullptr); @@ -993,12 +975,9 @@ TEST_F(DiscardableImageMapTest, DecodingModeHintsBasic) { FakeContentLayerClient content_layer_client; content_layer_client.set_bounds(visible_rect.size()); - content_layer_client.add_draw_image(unspecified_image, gfx::Point(0, 0), - PaintFlags()); - content_layer_client.add_draw_image(async_image, gfx::Point(10, 10), - PaintFlags()); - content_layer_client.add_draw_image(sync_image, gfx::Point(20, 20), - PaintFlags()); + content_layer_client.add_draw_image(unspecified_image, gfx::Point(0, 0)); + content_layer_client.add_draw_image(async_image, gfx::Point(10, 10)); + content_layer_client.add_draw_image(sync_image, gfx::Point(20, 20)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); display_list->GenerateDiscardableImagesMetadata(); @@ -1058,18 +1037,12 @@ TEST_F(DiscardableImageMapTest, DecodingModeHintsDuplicates) { FakeContentLayerClient content_layer_client; content_layer_client.set_bounds(visible_rect.size()); - content_layer_client.add_draw_image(unspecified_image1, gfx::Point(0, 0), - PaintFlags()); - content_layer_client.add_draw_image(async_image1, gfx::Point(10, 10), - PaintFlags()); - content_layer_client.add_draw_image(unspecified_image2, gfx::Point(20, 20), - PaintFlags()); - content_layer_client.add_draw_image(sync_image2, gfx::Point(30, 30), - PaintFlags()); - content_layer_client.add_draw_image(async_image3, gfx::Point(40, 40), - PaintFlags()); - content_layer_client.add_draw_image(sync_image3, gfx::Point(50, 50), - PaintFlags()); + content_layer_client.add_draw_image(unspecified_image1, gfx::Point(0, 0)); + content_layer_client.add_draw_image(async_image1, gfx::Point(10, 10)); + content_layer_client.add_draw_image(unspecified_image2, gfx::Point(20, 20)); + content_layer_client.add_draw_image(sync_image2, gfx::Point(30, 30)); + content_layer_client.add_draw_image(async_image3, gfx::Point(40, 40)); + content_layer_client.add_draw_image(sync_image3, gfx::Point(50, 50)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); display_list->GenerateDiscardableImagesMetadata(); @@ -1100,9 +1073,8 @@ TEST_F(DiscardableImageMapTest, TracksImageRegions) { FrameMetadata(true, base::TimeDelta::FromMilliseconds(1)), }; auto image = CreateAnimatedImage(gfx::Size(100, 100), frames); - PaintFlags flags; - content_layer_client.add_draw_image(image, gfx::Point(0, 0), flags); - content_layer_client.add_draw_image(image, gfx::Point(400, 400), flags); + content_layer_client.add_draw_image(image, gfx::Point(0, 0)); + content_layer_client.add_draw_image(image, gfx::Point(400, 400)); scoped_refptr display_list = content_layer_client.PaintContentsToDisplayList(); @@ -1146,8 +1118,7 @@ TEST_F(DiscardableImageMapTest, HighBitDepth) { const DiscardableImageMap& image_map = display_list->discardable_image_map(); EXPECT_FALSE(image_map.contains_hbd_images()); - content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0), - PaintFlags()); + content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0)); display_list = content_layer_client.PaintContentsToDisplayList(); display_list->GenerateDiscardableImagesMetadata(); const DiscardableImageMap& image_map2 = display_list->discardable_image_map(); @@ -1169,8 +1140,7 @@ TEST_F(DiscardableImageMapTest, ContentColorUsage) { // Adding a SRGB image should remain SRGB. PaintImage discardable_image_srgb = CreateDiscardablePaintImage( kSize, gfx::ColorSpace::CreateSRGB().ToSkColorSpace()); - content_layer_client.add_draw_image(discardable_image_srgb, gfx::Point(0, 0), - PaintFlags()); + content_layer_client.add_draw_image(discardable_image_srgb, gfx::Point(0, 0)); display_list = content_layer_client.PaintContentsToDisplayList(); display_list->GenerateDiscardableImagesMetadata(); EXPECT_EQ(display_list->discardable_image_map().content_color_usage(), @@ -1179,8 +1149,7 @@ TEST_F(DiscardableImageMapTest, ContentColorUsage) { // Adding a WCG image should switch to WCG. PaintImage discardable_image_wcg = CreateDiscardablePaintImage( kSize, gfx::ColorSpace::CreateDisplayP3D65().ToSkColorSpace()); - content_layer_client.add_draw_image(discardable_image_wcg, gfx::Point(0, 0), - PaintFlags()); + content_layer_client.add_draw_image(discardable_image_wcg, gfx::Point(0, 0)); display_list = content_layer_client.PaintContentsToDisplayList(); display_list->GenerateDiscardableImagesMetadata(); EXPECT_EQ(display_list->discardable_image_map().content_color_usage(), @@ -1189,8 +1158,7 @@ TEST_F(DiscardableImageMapTest, ContentColorUsage) { // Adding a HDR image should switch to HDR. PaintImage discardable_image_hdr = CreateDiscardablePaintImage( kSize, gfx::ColorSpace::CreateHDR10().ToSkColorSpace()); - content_layer_client.add_draw_image(discardable_image_hdr, gfx::Point(0, 0), - PaintFlags()); + content_layer_client.add_draw_image(discardable_image_hdr, gfx::Point(0, 0)); display_list = content_layer_client.PaintContentsToDisplayList(); display_list->GenerateDiscardableImagesMetadata(); EXPECT_EQ(display_list->discardable_image_map().content_color_usage(), @@ -1218,8 +1186,7 @@ TEST_P(DiscardableImageMapColorSpaceTest, ColorSpace) { EXPECT_EQ(image_map.content_color_usage(), gfx::ContentColorUsage::kSRGB); EXPECT_FALSE(image_map.contains_hbd_images()); - content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0), - PaintFlags()); + content_layer_client.add_draw_image(discardable_image, gfx::Point(0, 0)); display_list = content_layer_client.PaintContentsToDisplayList(); display_list->GenerateDiscardableImagesMetadata(); const DiscardableImageMap& image_map2 = display_list->discardable_image_map(); diff --git a/cc/paint/oop_pixeltest.cc b/cc/paint/oop_pixeltest.cc index ec9e98f62ed3d5..d5eec1c990b8ff 100644 --- a/cc/paint/oop_pixeltest.cc +++ b/cc/paint/oop_pixeltest.cc @@ -520,9 +520,9 @@ TEST_P(OopImagePixelTest, DrawImage) { auto display_item_list = base::MakeRefCounted(); display_item_list->StartPaint(); - PaintFlags flags; - flags.setFilterQuality(FilterQuality()); - display_item_list->push(paint_image, 0.f, 0.f, &flags); + SkSamplingOptions sampling(FilterQuality()); + display_item_list->push(paint_image, 0.f, 0.f, sampling, + nullptr); display_item_list->EndPaintOfUnpaired(rect); display_item_list->Finalize(); @@ -559,9 +559,9 @@ TEST_P(OopImagePixelTest, DrawImageScaled) { auto display_item_list = base::MakeRefCounted(); display_item_list->StartPaint(); display_item_list->push(0.5f, 0.5f); - PaintFlags flags; - flags.setFilterQuality(FilterQuality()); - display_item_list->push(paint_image, 0.f, 0.f, &flags); + SkSamplingOptions sampling(FilterQuality()); + display_item_list->push(paint_image, 0.f, 0.f, sampling, + nullptr); display_item_list->EndPaintOfUnpaired(rect); display_item_list->Finalize(); @@ -633,9 +633,8 @@ TEST_P(OopImagePixelTest, DrawRecordShaderWithImageScaled) { PaintImage::GetNextId()); auto paint_image = builder.TakePaintImage(); auto paint_record = sk_make_sp(); - PaintFlags flags; - flags.setFilterQuality(FilterQuality()); - paint_record->push(paint_image, 0.f, 0.f, &flags); + SkSamplingOptions sampling(FilterQuality()); + paint_record->push(paint_image, 0.f, 0.f, sampling, nullptr); auto paint_record_shader = PaintShader::MakePaintRecord( paint_record, gfx::RectToSkRect(rect), SkTileMode::kRepeat, SkTileMode::kRepeat, nullptr); @@ -732,9 +731,9 @@ TEST_P(OopImagePixelTest, DrawImageWithTargetColorSpace) { auto display_item_list = base::MakeRefCounted(); display_item_list->StartPaint(); - PaintFlags flags; - flags.setFilterQuality(FilterQuality()); - display_item_list->push(paint_image, 0.f, 0.f, &flags); + SkSamplingOptions sampling(FilterQuality()); + display_item_list->push(paint_image, 0.f, 0.f, sampling, + nullptr); display_item_list->EndPaintOfUnpaired(rect); display_item_list->Finalize(); @@ -778,9 +777,9 @@ TEST_P(OopImagePixelTest, DrawImageWithSourceColorSpace) { auto display_item_list = base::MakeRefCounted(); display_item_list->StartPaint(); - PaintFlags flags; - flags.setFilterQuality(FilterQuality()); - display_item_list->push(paint_image, 0.f, 0.f, &flags); + SkSamplingOptions sampling(FilterQuality()); + display_item_list->push(paint_image, 0.f, 0.f, sampling, + nullptr); display_item_list->EndPaintOfUnpaired(rect); display_item_list->Finalize(); @@ -823,9 +822,9 @@ TEST_P(OopImagePixelTest, DrawImageWithSourceAndTargetColorSpace) { auto display_item_list = base::MakeRefCounted(); display_item_list->StartPaint(); - PaintFlags flags; - flags.setFilterQuality(FilterQuality()); - display_item_list->push(paint_image, 0.f, 0.f, &flags); + SkSamplingOptions sampling(FilterQuality()); + display_item_list->push(paint_image, 0.f, 0.f, sampling, + nullptr); display_item_list->EndPaintOfUnpaired(rect); display_item_list->Finalize(); @@ -863,10 +862,10 @@ TEST_P(OopImagePixelTest, DrawImageWithSetMatrix) { auto display_item_list = base::MakeRefCounted(); display_item_list->StartPaint(); - PaintFlags flags; - flags.setFilterQuality(FilterQuality()); + SkSamplingOptions sampling(FilterQuality()); display_item_list->push(SkM44::Scale(0.5f, 0.5f)); - display_item_list->push(paint_image, 0.f, 0.f, &flags); + display_item_list->push(paint_image, 0.f, 0.f, sampling, + nullptr); display_item_list->EndPaintOfUnpaired(rect); display_item_list->Finalize(); @@ -938,8 +937,7 @@ TEST_F(OopPixelTest, DrawMailboxBackedImage) { auto display_item_list = base::MakeRefCounted(); display_item_list->StartPaint(); - PaintFlags flags; - display_item_list->push(src_paint_image, 0.f, 0.f, &flags); + display_item_list->push(src_paint_image, 0.f, 0.f); display_item_list->EndPaintOfUnpaired(gfx::Rect(options.resource_size)); display_item_list->Finalize(); diff --git a/cc/paint/paint_canvas.h b/cc/paint/paint_canvas.h index d2afbad5cd3fb3..e22af8127f6ee4 100644 --- a/cc/paint/paint_canvas.h +++ b/cc/paint/paint_canvas.h @@ -145,16 +145,24 @@ class CC_PAINT_EXPORT PaintCanvas { virtual void drawImage(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions&, const PaintFlags* flags) = 0; void drawImage(const PaintImage& image, SkScalar left, SkScalar top) { - drawImage(image, left, top, nullptr); + drawImage(image, left, top, SkSamplingOptions(), nullptr); } virtual void drawImageRect(const PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions&, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) = 0; + void drawImageRect(const PaintImage& image, + const SkRect& src, + const SkRect& dst, + SkCanvas::SrcRectConstraint constraint) { + drawImageRect(image, src, dst, SkSamplingOptions(), nullptr, constraint); + } // Draws the frame of the |skottie| animation specified by the normalized time // t [0->first frame..1->last frame] at the destination bounds given by |dst| diff --git a/cc/paint/paint_filter_unittest.cc b/cc/paint/paint_filter_unittest.cc index 84210f6e71c1a0..c3461250003bf8 100644 --- a/cc/paint/paint_filter_unittest.cc +++ b/cc/paint/paint_filter_unittest.cc @@ -40,7 +40,7 @@ sk_sp CreateTestFilter(PaintFilter::Type filter_type, image, SkRect::MakeWH(100.f, 100.f), SkRect::MakeWH(100.f, 100.f), kNone_SkFilterQuality); auto record = sk_make_sp(); - record->push(image, 0.f, 0.f, nullptr); + record->push(image, 0.f, 0.f); auto record_filter = sk_make_sp(record, SkRect::MakeWH(100.f, 100.f)); diff --git a/cc/paint/paint_op_buffer.cc b/cc/paint/paint_op_buffer.cc index 3c52434f40b0ea..8cb0e5f4867bda 100644 --- a/cc/paint/paint_op_buffer.cc +++ b/cc/paint/paint_op_buffer.cc @@ -27,15 +27,28 @@ namespace cc { namespace { +// In a future CL, convert DrawImage to explicitly take sampling instead of +// quality +SkFilterQuality sampling_to_quality(const SkSamplingOptions& sampling) { + if (sampling.useCubic) { + return kHigh_SkFilterQuality; + } + if (sampling.mipmap != SkMipmapMode::kNone) { + return kMedium_SkFilterQuality; + } + return sampling.filter == SkFilterMode::kLinear ? kLow_SkFilterQuality + : kNone_SkFilterQuality; +} + DrawImage CreateDrawImage(const PaintImage& image, const PaintFlags* flags, + const SkSamplingOptions& sampling, const SkMatrix& matrix) { if (!image) return DrawImage(); return DrawImage(image, flags->useDarkModeForImage(), SkIRect::MakeWH(image.width(), image.height()), - flags ? flags->getFilterQuality() : kLow_SkFilterQuality, - matrix); + sampling_to_quality(sampling), matrix); } bool IsScaleAdjustmentIdentity(const SkSize& scale_adjustment) { @@ -479,7 +492,7 @@ size_t DrawImageOp::Serialize(const PaintOp* base_op, helper.Write(*serialized_flags); SkSize scale_adjustment = SkSize::Make(1.f, 1.f); - helper.Write(CreateDrawImage(op->image, serialized_flags, + helper.Write(CreateDrawImage(op->image, serialized_flags, op->sampling, options.canvas->getTotalMatrix()), &scale_adjustment); helper.AlignMemory(alignof(SkScalar)); @@ -488,6 +501,7 @@ size_t DrawImageOp::Serialize(const PaintOp* base_op, helper.Write(op->left); helper.Write(op->top); + helper.Write(op->sampling); return helper.size(); } @@ -508,14 +522,16 @@ size_t DrawImageRectOp::Serialize(const PaintOp* base_op, // Note that we don't request subsets here since the GpuImageCache has no // optimizations for using subsets. SkSize scale_adjustment = SkSize::Make(1.f, 1.f); - helper.Write(CreateDrawImage(op->image, serialized_flags, matrix), - &scale_adjustment); + helper.Write( + CreateDrawImage(op->image, serialized_flags, op->sampling, matrix), + &scale_adjustment); helper.AlignMemory(alignof(SkScalar)); helper.Write(scale_adjustment.width()); helper.Write(scale_adjustment.height()); helper.Write(op->src); helper.Write(op->dst); + helper.Write(op->sampling); helper.Write(op->constraint); return helper.size(); } @@ -954,6 +970,7 @@ PaintOp* DrawImageOp::Deserialize(const volatile void* input, helper.Read(&op->left); helper.Read(&op->top); + helper.Read(&op->sampling); if (!helper.valid() || !op->IsValid()) { op->~DrawImageOp(); return nullptr; @@ -980,6 +997,7 @@ PaintOp* DrawImageRectOp::Deserialize(const volatile void* input, helper.Read(&op->src); helper.Read(&op->dst); + helper.Read(&op->sampling); helper.Read(&op->constraint); if (!helper.valid() || !op->IsValid()) { op->~DrawImageRectOp(); @@ -1446,15 +1464,14 @@ void DrawImageOp::RasterWithFlags(const DrawImageOp* op, if (!sk_image) sk_image = op->image.GetSwSkImage(); - canvas->drawImage(sk_image.get(), op->left, op->top, &paint); + canvas->drawImage(sk_image.get(), op->left, op->top, op->sampling, &paint); return; } // Dark mode is applied only for OOP raster during serialization. DrawImage draw_image( op->image, false, SkIRect::MakeWH(op->image.width(), op->image.height()), - flags ? flags->getFilterQuality() : kNone_SkFilterQuality, - canvas->getTotalMatrix()); + sampling_to_quality(op->sampling), canvas->getTotalMatrix()); auto scoped_result = params.image_provider->GetRasterContent(draw_image); if (!scoped_result) return; @@ -1474,8 +1491,8 @@ void DrawImageOp::RasterWithFlags(const DrawImageOp* op, canvas->scale(1.f / scale_adjustment.width(), 1.f / scale_adjustment.height()); } - paint.setFilterQuality(decoded_image.filter_quality()); - canvas->drawImage(decoded_image.image().get(), op->left, op->top, &paint); + canvas->drawImage(decoded_image.image().get(), op->left, op->top, + SkSamplingOptions(decoded_image.filter_quality()), &paint); } void DrawImageRectOp::RasterWithFlags(const DrawImageRectOp* op, @@ -1523,7 +1540,7 @@ void DrawImageRectOp::RasterWithFlags(const DrawImageRectOp* op, } if (!sk_image) sk_image = op->image.GetSwSkImage(); - c->drawImageRect(sk_image.get(), adjusted_src, op->dst, &p, + c->drawImageRect(sk_image.get(), adjusted_src, op->dst, op->sampling, &p, op->constraint); }); return; @@ -1536,9 +1553,8 @@ void DrawImageRectOp::RasterWithFlags(const DrawImageRectOp* op, op->src.roundOut(&int_src_rect); // Dark mode is applied only for OOP raster during serialization. - DrawImage draw_image( - op->image, false, int_src_rect, - flags ? flags->getFilterQuality() : kNone_SkFilterQuality, matrix); + DrawImage draw_image(op->image, false, int_src_rect, + sampling_to_quality(op->sampling), matrix); auto scoped_result = params.image_provider->GetRasterContent(draw_image); if (!scoped_result) return; @@ -1556,10 +1572,11 @@ void DrawImageRectOp::RasterWithFlags(const DrawImageRectOp* op, adjusted_src = AdjustSrcRectForScale(adjusted_src, scale_adjustment); flags->DrawToSk(canvas, [op, &decoded_image, adjusted_src](SkCanvas* c, const SkPaint& p) { - SkPaint paint_with_filter_quality(p); - paint_with_filter_quality.setFilterQuality(decoded_image.filter_quality()); - c->drawImageRect(decoded_image.image().get(), adjusted_src, op->dst, - &paint_with_filter_quality, op->constraint); + c->drawImageRect( + decoded_image.image().get(), adjusted_src, op->dst, + SkSamplingOptions(decoded_image.filter_quality(), + SkSamplingOptions::kMedium_asMipmapLinear), + &p, op->constraint); }); } @@ -2510,14 +2527,23 @@ AnnotateOp::~AnnotateOp() = default; DrawImageOp::DrawImageOp() : PaintOpWithFlags(kType) {} +DrawImageOp::DrawImageOp(const PaintImage& image, SkScalar left, SkScalar top) + : PaintOpWithFlags(kType, PaintFlags()), + image(image), + left(left), + top(top), + sampling(SkSamplingOptions()) {} + DrawImageOp::DrawImageOp(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions& sampling, const PaintFlags* flags) : PaintOpWithFlags(kType, flags ? *flags : PaintFlags()), image(image), left(left), - top(top) {} + top(top), + sampling(sampling) {} bool DrawImageOp::HasDiscardableImages() const { return image && !image.IsTextureBacked(); @@ -2530,12 +2556,25 @@ DrawImageRectOp::DrawImageRectOp() : PaintOpWithFlags(kType) {} DrawImageRectOp::DrawImageRectOp(const PaintImage& image, const SkRect& src, const SkRect& dst, + SkCanvas::SrcRectConstraint constraint) + : PaintOpWithFlags(kType, PaintFlags()), + image(image), + src(src), + dst(dst), + sampling(SkSamplingOptions()), + constraint(constraint) {} + +DrawImageRectOp::DrawImageRectOp(const PaintImage& image, + const SkRect& src, + const SkRect& dst, + const SkSamplingOptions& sampling, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) : PaintOpWithFlags(kType, flags ? *flags : PaintFlags()), image(image), src(src), dst(dst), + sampling(sampling), constraint(constraint) {} bool DrawImageRectOp::HasDiscardableImages() const { diff --git a/cc/paint/paint_op_buffer.h b/cc/paint/paint_op_buffer.h index 7ea7c3785f6381..7ff1846a001fb5 100644 --- a/cc/paint/paint_op_buffer.h +++ b/cc/paint/paint_op_buffer.h @@ -532,9 +532,11 @@ class CC_PAINT_EXPORT DrawImageOp final : public PaintOpWithFlags { public: static constexpr PaintOpType kType = PaintOpType::DrawImage; static constexpr bool kIsDrawOp = true; + DrawImageOp(const PaintImage& image, SkScalar left, SkScalar top); DrawImageOp(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions&, const PaintFlags* flags); ~DrawImageOp(); static void RasterWithFlags(const DrawImageOp* op, @@ -553,6 +555,7 @@ class CC_PAINT_EXPORT DrawImageOp final : public PaintOpWithFlags { PaintImage image; SkScalar left; SkScalar top; + SkSamplingOptions sampling; private: DrawImageOp(); @@ -569,6 +572,11 @@ class CC_PAINT_EXPORT DrawImageRectOp final : public PaintOpWithFlags { DrawImageRectOp(const PaintImage& image, const SkRect& src, const SkRect& dst, + SkCanvas::SrcRectConstraint constraint); + DrawImageRectOp(const PaintImage& image, + const SkRect& src, + const SkRect& dst, + const SkSamplingOptions&, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint); ~DrawImageRectOp(); @@ -588,6 +596,7 @@ class CC_PAINT_EXPORT DrawImageRectOp final : public PaintOpWithFlags { PaintImage image; SkRect src; SkRect dst; + SkSamplingOptions sampling; SkCanvas::SrcRectConstraint constraint; private: diff --git a/cc/paint/paint_op_buffer_unittest.cc b/cc/paint/paint_op_buffer_unittest.cc index b5f46cc49f3e28..faac2f874517cf 100644 --- a/cc/paint/paint_op_buffer_unittest.cc +++ b/cc/paint/paint_op_buffer_unittest.cc @@ -483,7 +483,7 @@ TEST(PaintOpBufferTest, DiscardableImagesTracking_NoImageOp) { TEST(PaintOpBufferTest, DiscardableImagesTracking_DrawImage) { PaintOpBuffer buffer; PaintImage image = CreateDiscardablePaintImage(gfx::Size(100, 100)); - buffer.push(image, SkIntToScalar(0), SkIntToScalar(0), nullptr); + buffer.push(image, SkIntToScalar(0), SkIntToScalar(0)); EXPECT_TRUE(buffer.HasDiscardableImages()); } @@ -492,7 +492,7 @@ TEST(PaintOpBufferTest, DiscardableImagesTracking_PaintWorkletImage) { base::MakeRefCounted(gfx::SizeF(32.0f, 32.0f)); PaintOpBuffer buffer; PaintImage image = CreatePaintWorkletPaintImage(input); - buffer.push(image, SkIntToScalar(0), SkIntToScalar(0), nullptr); + buffer.push(image, SkIntToScalar(0), SkIntToScalar(0)); EXPECT_TRUE(buffer.HasDiscardableImages()); } @@ -503,7 +503,7 @@ TEST(PaintOpBufferTest, DiscardableImagesTracking_PaintWorkletImageRect) { PaintImage image = CreatePaintWorkletPaintImage(input); SkRect src = SkRect::MakeEmpty(); SkRect dst = SkRect::MakeEmpty(); - buffer.push(image, src, dst, nullptr, + buffer.push(image, src, dst, SkCanvas::kStrict_SrcRectConstraint); EXPECT_TRUE(buffer.HasDiscardableImages()); } @@ -512,7 +512,7 @@ TEST(PaintOpBufferTest, DiscardableImagesTracking_DrawImageRect) { PaintOpBuffer buffer; PaintImage image = CreateDiscardablePaintImage(gfx::Size(100, 100)); buffer.push(image, SkRect::MakeWH(100, 100), - SkRect::MakeWH(100, 100), nullptr, + SkRect::MakeWH(100, 100), SkCanvas::kFast_SrcRectConstraint); EXPECT_TRUE(buffer.HasDiscardableImages()); } @@ -660,7 +660,7 @@ TEST(PaintOpBufferTest, NonAAPaint) { PaintFlags non_aa_flags; non_aa_flags.setAntiAlias(true); buffer->push(image, SkIntToScalar(0), SkIntToScalar(0), - &non_aa_flags); + SkSamplingOptions(), &non_aa_flags); EXPECT_FALSE(buffer->HasNonAAPaint()); } @@ -736,7 +736,7 @@ TEST_F(PaintOpBufferOffsetsTest, EmptyClipRectShouldRejectAnOp) { PaintImage image = CreatePaintWorkletPaintImage(input); SkRect src = SkRect::MakeLTRB(0, 0, 100, 100); SkRect dst = SkRect::MakeLTRB(168, -23, 268, 77); - push_op(image, src, dst, nullptr, + push_op(image, src, dst, SkCanvas::kStrict_SrcRectConstraint); std::vector offsets = Select({0}); for (PaintOpBuffer::PlaybackFoldingIterator iter(&buffer_, &offsets); iter; @@ -1468,14 +1468,14 @@ void PushDrawImageOps(PaintOpBuffer* buffer) { size_t len = std::min({test_images.size(), test_flags.size(), test_floats.size() - 1}); for (size_t i = 0; i < len; ++i) { - buffer->push(test_images[i], test_floats[i], - test_floats[i + 1], &test_flags[i]); + buffer->push( + test_images[i], test_floats[i], test_floats[i + 1], + SkSamplingOptions(test_flags[i].getFilterQuality()), &test_flags[i]); } // Test optional flags // TODO(enne): maybe all these optional ops should not be optional. - buffer->push(test_images[0], test_floats[0], test_floats[1], - nullptr); + buffer->push(test_images[0], test_floats[0], test_floats[1]); ValidateOps(buffer); } @@ -1486,14 +1486,15 @@ void PushDrawImageRectOps(PaintOpBuffer* buffer) { SkCanvas::SrcRectConstraint constraint = i % 2 ? SkCanvas::kStrict_SrcRectConstraint : SkCanvas::kFast_SrcRectConstraint; - buffer->push(test_images[i], test_rects[i], - test_rects[i + 1], &test_flags[i], - constraint); + buffer->push( + test_images[i], test_rects[i], test_rects[i + 1], + SkSamplingOptions(test_flags[i].getFilterQuality()), &test_flags[i], + constraint); } // Test optional flags. buffer->push(test_images[0], test_rects[0], test_rects[1], - nullptr, SkCanvas::kStrict_SrcRectConstraint); + SkCanvas::kStrict_SrcRectConstraint); ValidateOps(buffer); } @@ -2293,7 +2294,7 @@ TEST(PaintOpBufferTest, ClipsImagesDuringSerialization) { buffer.push( CreateDiscardablePaintImage(test_case.image_rect.size()), static_cast(test_case.image_rect.x()), - static_cast(test_case.image_rect.y()), nullptr); + static_cast(test_case.image_rect.y())); std::unique_ptr memory( static_cast(base::AlignedAlloc(PaintOpBuffer::kInitialBufferSize, @@ -2619,9 +2620,9 @@ TEST(PaintOpBufferTest, ValidateRects) { SkData::MakeWithCString("test1")); buffer.push(bad_rect, SkClipOp::kDifference, true); - buffer.push(test_images[0], bad_rect, test_rects[1], nullptr, + buffer.push(test_images[0], bad_rect, test_rects[1], SkCanvas::kStrict_SrcRectConstraint); - buffer.push(test_images[0], test_rects[0], bad_rect, nullptr, + buffer.push(test_images[0], test_rects[0], bad_rect, SkCanvas::kStrict_SrcRectConstraint); buffer.push(bad_rect, test_flags[0]); buffer.push(bad_rect, test_flags[0]); @@ -2847,9 +2848,8 @@ TEST(PaintOpBufferTest, SkipsOpsOutsideClip) { buffer.push(SkRect::MakeXYWH(0, 0, 100, 100), SkClipOp::kIntersect, false); - PaintFlags flags; PaintImage paint_image = CreateDiscardablePaintImage(gfx::Size(10, 10)); - buffer.push(paint_image, 105.0f, 105.0f, &flags); + buffer.push(paint_image, 105.0f, 105.0f); PaintFlags image_flags; image_flags.setShader(PaintShader::MakeImage(paint_image, SkTileMode::kRepeat, SkTileMode::kRepeat, nullptr)); @@ -2872,9 +2872,8 @@ TEST(PaintOpBufferTest, SkipsOpsWithFailedDecodes) { MockImageProvider image_provider(true); PaintOpBuffer buffer; - PaintFlags flags; PaintImage paint_image = CreateDiscardablePaintImage(gfx::Size(10, 10)); - buffer.push(paint_image, 105.0f, 105.0f, &flags); + buffer.push(paint_image, 105.0f, 105.0f); PaintFlags image_flags; image_flags.setShader(PaintShader::MakeImage(paint_image, SkTileMode::kRepeat, SkTileMode::kRepeat, nullptr)); @@ -2941,7 +2940,7 @@ TEST(PaintOpBufferTest, RasterPaintWorkletImageRectBasicCase) { PaintImage image = CreatePaintWorkletPaintImage(input); SkRect src = SkRect::MakeXYWH(0, 0, 100, 100); SkRect dst = SkRect::MakeXYWH(0, 0, 100, 100); - blink_buffer.push(image, src, dst, nullptr, + blink_buffer.push(image, src, dst, SkCanvas::kStrict_SrcRectConstraint); testing::StrictMock canvas; @@ -2966,10 +2965,10 @@ TEST(PaintOpBufferTest, RasterPaintWorkletImageRectTranslated) { PaintFlags noop_flags; SkRect savelayer_rect = SkRect::MakeXYWH(0, 0, 10, 10); paint_worklet_buffer->push(&savelayer_rect, &noop_flags); - PaintFlags draw_flags; - draw_flags.setFilterQuality(kLow_SkFilterQuality); PaintImage paint_image = CreateDiscardablePaintImage(gfx::Size(10, 10)); - paint_worklet_buffer->push(paint_image, 0.0f, 0.0f, &draw_flags); + paint_worklet_buffer->push( + paint_image, 0.0f, 0.0f, SkSamplingOptions(SkFilterMode::kLinear), + nullptr); std::vector src_rect_offset = {SkSize::MakeEmpty()}; std::vector scale_adjustment = {SkSize::Make(0.2f, 0.2f)}; @@ -2983,7 +2982,7 @@ TEST(PaintOpBufferTest, RasterPaintWorkletImageRectTranslated) { PaintImage image = CreatePaintWorkletPaintImage(input); SkRect src = SkRect::MakeXYWH(0, 0, 100, 100); SkRect dst = SkRect::MakeXYWH(5, 7, 100, 100); - blink_buffer.push(image, src, dst, nullptr, + blink_buffer.push(image, src, dst, SkCanvas::kStrict_SrcRectConstraint); testing::StrictMock canvas; @@ -3012,10 +3011,10 @@ TEST(PaintOpBufferTest, RasterPaintWorkletImageRectScaled) { PaintFlags noop_flags; SkRect savelayer_rect = SkRect::MakeXYWH(0, 0, 10, 10); paint_worklet_buffer->push(&savelayer_rect, &noop_flags); - PaintFlags draw_flags; - draw_flags.setFilterQuality(kLow_SkFilterQuality); PaintImage paint_image = CreateDiscardablePaintImage(gfx::Size(10, 10)); - paint_worklet_buffer->push(paint_image, 0.0f, 0.0f, &draw_flags); + paint_worklet_buffer->push( + paint_image, 0.0f, 0.0f, SkSamplingOptions(SkFilterMode::kLinear), + nullptr); std::vector src_rect_offset = {SkSize::MakeEmpty()}; std::vector scale_adjustment = {SkSize::Make(0.2f, 0.2f)}; @@ -3029,7 +3028,7 @@ TEST(PaintOpBufferTest, RasterPaintWorkletImageRectScaled) { PaintImage image = CreatePaintWorkletPaintImage(input); SkRect src = SkRect::MakeXYWH(0, 0, 100, 100); SkRect dst = SkRect::MakeXYWH(0, 0, 200, 150); - blink_buffer.push(image, src, dst, nullptr, + blink_buffer.push(image, src, dst, SkCanvas::kStrict_SrcRectConstraint); testing::StrictMock canvas; @@ -3058,13 +3057,13 @@ TEST(PaintOpBufferTest, RasterPaintWorkletImageRectClipped) { PaintFlags noop_flags; SkRect savelayer_rect = SkRect::MakeXYWH(0, 0, 60, 60); paint_worklet_buffer->push(&savelayer_rect, &noop_flags); - PaintFlags draw_flags; - draw_flags.setFilterQuality(kLow_SkFilterQuality); + SkSamplingOptions linear(SkFilterMode::kLinear); PaintImage paint_image = CreateDiscardablePaintImage(gfx::Size(10, 10)); // One rect inside the src-rect, one outside. - paint_worklet_buffer->push(paint_image, 0.0f, 0.0f, &draw_flags); - paint_worklet_buffer->push(paint_image, 50.0f, 50.0f, - &draw_flags); + paint_worklet_buffer->push(paint_image, 0.0f, 0.0f, linear, + nullptr); + paint_worklet_buffer->push(paint_image, 50.0f, 50.0f, linear, + nullptr); std::vector src_rect_offset = {SkSize::MakeEmpty()}; std::vector scale_adjustment = {SkSize::Make(0.2f, 0.2f)}; @@ -3078,7 +3077,7 @@ TEST(PaintOpBufferTest, RasterPaintWorkletImageRectClipped) { PaintImage image = CreatePaintWorkletPaintImage(input); SkRect src = SkRect::MakeXYWH(0, 0, 20, 20); SkRect dst = SkRect::MakeXYWH(0, 0, 20, 20); - blink_buffer.push(image, src, dst, nullptr, + blink_buffer.push(image, src, dst, SkCanvas::kStrict_SrcRectConstraint); testing::StrictMock canvas; @@ -3114,12 +3113,12 @@ TEST(PaintOpBufferTest, ReplacesImagesFromProvider) { PaintOpBuffer buffer; SkRect rect = SkRect::MakeWH(10, 10); - PaintFlags flags; - flags.setFilterQuality(kLow_SkFilterQuality); + SkSamplingOptions sampling(SkFilterMode::kLinear); PaintImage paint_image = CreateDiscardablePaintImage(gfx::Size(10, 10)); - buffer.push(paint_image, 0.0f, 0.0f, &flags); - buffer.push(paint_image, rect, rect, &flags, + buffer.push(paint_image, 0.0f, 0.0f, sampling, nullptr); + buffer.push(paint_image, rect, rect, sampling, nullptr, SkCanvas::kFast_SrcRectConstraint); + PaintFlags flags; flags.setShader(PaintShader::MakeImage(paint_image, SkTileMode::kRepeat, SkTileMode::kRepeat, nullptr)); buffer.push(SkRect::MakeWH(10, 10), flags); @@ -3164,8 +3163,8 @@ TEST(PaintOpBufferTest, DrawImageRectOpWithLooperNoImageProvider) { PaintFlags paint_flags; paint_flags.setLooper(sk_draw_looper_builder.detach()); buffer.push(image, SkRect::MakeWH(100, 100), - SkRect::MakeWH(100, 100), &paint_flags, - SkCanvas::kFast_SrcRectConstraint); + SkRect::MakeWH(100, 100), SkSamplingOptions(), + &paint_flags, SkCanvas::kFast_SrcRectConstraint); testing::StrictMock canvas; EXPECT_CALL(canvas, willSave); @@ -3187,8 +3186,8 @@ TEST(PaintOpBufferTest, DrawImageRectOpWithLooperWithImageProvider) { PaintFlags paint_flags; paint_flags.setLooper(sk_draw_looper_builder.detach()); buffer.push(image, SkRect::MakeWH(100, 100), - SkRect::MakeWH(100, 100), &paint_flags, - SkCanvas::kFast_SrcRectConstraint); + SkRect::MakeWH(100, 100), SkSamplingOptions(), + &paint_flags, SkCanvas::kFast_SrcRectConstraint); testing::StrictMock canvas; EXPECT_CALL(canvas, willSave); @@ -3209,11 +3208,11 @@ TEST(PaintOpBufferTest, ReplacesImagesFromProviderOOP) { SkRect rect = SkRect::MakeWH(10, 10); PaintFlags flags; - flags.setFilterQuality(kLow_SkFilterQuality); + SkSamplingOptions sampling(SkFilterMode::kLinear); PaintImage paint_image = CreateDiscardablePaintImage(gfx::Size(10, 10)); buffer.push(expected_scale.width(), expected_scale.height()); - buffer.push(paint_image, 0.0f, 0.0f, &flags); - buffer.push(paint_image, rect, rect, &flags, + buffer.push(paint_image, 0.0f, 0.0f, sampling, nullptr); + buffer.push(paint_image, rect, rect, sampling, nullptr, SkCanvas::kFast_SrcRectConstraint); flags.setShader(PaintShader::MakeImage(paint_image, SkTileMode::kRepeat, SkTileMode::kRepeat, nullptr)); @@ -3576,8 +3575,7 @@ TEST(PaintOpBufferTest, DrawImageRectSerializeScaledImages) { SkRect src = SkRect::MakeXYWH(3, 4, 20, 6); SkRect dst = SkRect::MakeXYWH(20, 38, 5, 30); buffer->push(CreateDiscardablePaintImage(gfx::Size(32, 16)), - src, dst, nullptr, - SkCanvas::kStrict_SrcRectConstraint); + src, dst, SkCanvas::kStrict_SrcRectConstraint); std::unique_ptr memory( static_cast(base::AlignedAlloc(PaintOpBuffer::kInitialBufferSize, @@ -3602,7 +3600,7 @@ TEST(PaintOpBufferTest, DrawImageRectSerializeScaledImages) { TEST(PaintOpBufferTest, RecordShadersSerializeScaledImages) { auto record_buffer = sk_make_sp(); record_buffer->push( - CreateDiscardablePaintImage(gfx::Size(10, 10)), 0.f, 0.f, nullptr); + CreateDiscardablePaintImage(gfx::Size(10, 10)), 0.f, 0.f); auto shader = PaintShader::MakePaintRecord( record_buffer, SkRect::MakeWH(10.f, 10.f), SkTileMode::kRepeat, @@ -3637,7 +3635,7 @@ TEST(PaintOpBufferTest, RecordShadersSerializeScaledImages) { TEST(PaintOpBufferTest, RecordShadersCached) { auto record_buffer = sk_make_sp(); record_buffer->push( - CreateDiscardablePaintImage(gfx::Size(10, 10)), 0.f, 0.f, nullptr); + CreateDiscardablePaintImage(gfx::Size(10, 10)), 0.f, 0.f); auto shader = PaintShader::MakePaintRecord( record_buffer, SkRect::MakeWH(10.f, 10.f), SkTileMode::kRepeat, SkTileMode::kRepeat, nullptr); @@ -3755,7 +3753,7 @@ TEST(PaintOpBufferTest, RecordShadersCachedSize) { auto record_buffer = sk_make_sp(); size_t estimated_image_size = 30 * 30 * 4; auto image = CreateBitmapImage(gfx::Size(30, 30)); - record_buffer->push(image, 0.f, 0.f, nullptr); + record_buffer->push(image, 0.f, 0.f); auto shader = PaintShader::MakePaintRecord( record_buffer, SkRect::MakeWH(10.f, 10.f), SkTileMode::kRepeat, SkTileMode::kRepeat, nullptr); @@ -3819,7 +3817,7 @@ TEST(PaintOpBufferTest, TotalOpCount) { TEST(PaintOpBufferTest, NullImages) { PaintOpBuffer buffer; - buffer.push(PaintImage(), 0.f, 0.f, nullptr); + buffer.push(PaintImage(), 0.f, 0.f); std::unique_ptr memory( static_cast(base::AlignedAlloc(PaintOpBuffer::kInitialBufferSize, diff --git a/cc/paint/paint_op_helper_unittest.cc b/cc/paint/paint_op_helper_unittest.cc index 4fc6fdb2ee498e..3710ef041fe75b 100644 --- a/cc/paint/paint_op_helper_unittest.cc +++ b/cc/paint/paint_op_helper_unittest.cc @@ -77,7 +77,7 @@ TEST(PaintOpHelper, DrawDRRectToString) { } TEST(PaintOpHelper, DrawImageToString) { - DrawImageOp op(PaintImage(), 10.5f, 20.3f, nullptr); + DrawImageOp op(PaintImage(), 10.5f, 20.3f); std::string str = PaintOpHelper::ToString(&op); EXPECT_EQ( str, @@ -93,7 +93,7 @@ TEST(PaintOpHelper, DrawImageToString) { TEST(PaintOpHelper, DrawImageRectToString) { DrawImageRectOp op(PaintImage(), SkRect::MakeXYWH(1, 2, 3, 4), - SkRect::MakeXYWH(5, 6, 7, 8), nullptr, + SkRect::MakeXYWH(5, 6, 7, 8), SkCanvas::kStrict_SrcRectConstraint); std::string str = PaintOpHelper::ToString(&op); EXPECT_EQ( diff --git a/cc/paint/paint_op_reader.cc b/cc/paint/paint_op_reader.cc index 81eb45eb70d420..eb795ba528e9d8 100644 --- a/cc/paint/paint_op_reader.cc +++ b/cc/paint/paint_op_reader.cc @@ -626,6 +626,23 @@ void PaintOpReader::Read(SkM44* matrix) { ReadSimple(matrix); } +void PaintOpReader::Read(SkSamplingOptions* sampling) { + bool useCubic; + Read(&useCubic); + if (useCubic) { + SkCubicResampler cubic; + Read(&cubic.B); + Read(&cubic.C); + *sampling = SkSamplingOptions(cubic); + } else { + SkFilterMode filter; + SkMipmapMode mipmap; + Read(&filter); + Read(&mipmap); + *sampling = SkSamplingOptions(filter, mipmap); + } +} + void PaintOpReader::Read(SkYUVColorSpace* yuv_color_space) { uint32_t raw_yuv_color_space = kIdentity_SkYUVColorSpace; ReadSimple(&raw_yuv_color_space); diff --git a/cc/paint/paint_op_reader.h b/cc/paint/paint_op_reader.h index bbbdb16dcfab7c..fc8cda79bf013c 100644 --- a/cc/paint/paint_op_reader.h +++ b/cc/paint/paint_op_reader.h @@ -73,6 +73,7 @@ class CC_PAINT_EXPORT PaintOpReader { void Read(SkMatrix* matrix); void Read(SkM44* matrix); void Read(SkImageInfo* info); + void Read(SkSamplingOptions* sampling); void Read(sk_sp* color_space); void Read(SkYUVColorSpace* yuv_color_space); void Read(SkYUVAInfo::PlaneConfig* plane_config); @@ -104,6 +105,12 @@ class CC_PAINT_EXPORT PaintOpReader { void Read(SkTileMode* tile_mode) { ReadEnum(tile_mode); } + void Read(SkFilterMode* filter_mode) { + ReadEnum(filter_mode); + } + void Read(SkMipmapMode* mipmap_mode) { + ReadEnum(mipmap_mode); + } void Read(bool* data) { uint8_t value = 0u; diff --git a/cc/paint/paint_op_writer.cc b/cc/paint/paint_op_writer.cc index 3352beed2b87bc..32aae4f2ce97bd 100644 --- a/cc/paint/paint_op_writer.cc +++ b/cc/paint/paint_op_writer.cc @@ -352,6 +352,17 @@ void PaintOpWriter::Write(const sk_sp& data) { } } +void PaintOpWriter::Write(const SkSamplingOptions& sampling) { + Write(sampling.useCubic); + if (sampling.useCubic) { + Write(sampling.cubic.B); + Write(sampling.cubic.C); + } else { + Write(sampling.filter); + Write(sampling.mipmap); + } +} + void PaintOpWriter::Write(const SkColorSpace* color_space) { if (!color_space) { WriteSize(static_cast(0)); diff --git a/cc/paint/paint_op_writer.h b/cc/paint/paint_op_writer.h index a00c002c02b35f..682ba1c8dff06b 100644 --- a/cc/paint/paint_op_writer.h +++ b/cc/paint/paint_op_writer.h @@ -66,6 +66,7 @@ class CC_PAINT_EXPORT PaintOpWriter { void Write(const PaintFlags& flags); void Write(const sk_sp& data); void Write(const SkColorSpace* data); + void Write(const SkSamplingOptions&); void Write(const PaintShader* shader, SkFilterQuality quality); void Write(const PaintFilter* filter); void Write(const sk_sp& blob); @@ -81,6 +82,8 @@ class CC_PAINT_EXPORT PaintOpWriter { void Write(SkFilterQuality filter_quality) { WriteEnum(filter_quality); } void Write(SkBlendMode blend_mode) { WriteEnum(blend_mode); } void Write(SkTileMode tile_mode) { WriteEnum(tile_mode); } + void Write(SkFilterMode filter_mode) { WriteEnum(filter_mode); } + void Write(SkMipmapMode mipmap_mode) { WriteEnum(mipmap_mode); } void Write(bool data) { Write(static_cast(data)); } diff --git a/cc/paint/paint_shader_unittest.cc b/cc/paint/paint_shader_unittest.cc index c21192fbac9946..4a33b87ffc2269 100644 --- a/cc/paint/paint_shader_unittest.cc +++ b/cc/paint/paint_shader_unittest.cc @@ -84,7 +84,7 @@ TEST(PaintShaderTest, DecodePaintRecord) { .set_paint_image_generator(generator) .TakePaintImage(); - record->push(paint_image, 0.f, 0.f, nullptr); + record->push(paint_image, 0.f, 0.f); SkMatrix local_matrix = SkMatrix::Scale(0.5f, 0.5f); auto record_shader = PaintShader::MakePaintRecord( record, SkRect::MakeWH(100, 100), SkTileMode::kClamp, SkTileMode::kClamp, diff --git a/cc/paint/record_paint_canvas.cc b/cc/paint/record_paint_canvas.cc index 5069274ebfde7a..d4870865146bc1 100644 --- a/cc/paint/record_paint_canvas.cc +++ b/cc/paint/record_paint_canvas.cc @@ -264,17 +264,19 @@ void RecordPaintCanvas::drawPath(const SkPath& path, const PaintFlags& flags) { void RecordPaintCanvas::drawImage(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions& sampling, const PaintFlags* flags) { DCHECK(!image.IsPaintWorklet()); - list_->push(image, left, top, flags); + list_->push(image, left, top, sampling, flags); } void RecordPaintCanvas::drawImageRect(const PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions& sampling, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) { - list_->push(image, src, dst, flags, constraint); + list_->push(image, src, dst, sampling, flags, constraint); } void RecordPaintCanvas::drawSkottie(scoped_refptr skottie, diff --git a/cc/paint/record_paint_canvas.h b/cc/paint/record_paint_canvas.h index de9f977e63924a..b08c8c8e064f1f 100644 --- a/cc/paint/record_paint_canvas.h +++ b/cc/paint/record_paint_canvas.h @@ -83,10 +83,12 @@ class CC_PAINT_EXPORT RecordPaintCanvas : public PaintCanvas { void drawImage(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions&, const PaintFlags* flags) override; void drawImageRect(const PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions&, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) override; void drawSkottie(scoped_refptr skottie, diff --git a/cc/paint/scoped_raster_flags_unittest.cc b/cc/paint/scoped_raster_flags_unittest.cc index da49459d51988b..1b2439b9fdcd93 100644 --- a/cc/paint/scoped_raster_flags_unittest.cc +++ b/cc/paint/scoped_raster_flags_unittest.cc @@ -82,11 +82,11 @@ TEST(ScopedRasterFlagsTest, DecodePaintWorkletImageShader) { TEST(ScopedRasterFlagsTest, KeepsDecodesAlive) { auto record = sk_make_sp(); record->push(CreateDiscardablePaintImage(gfx::Size(10, 10)), 0.f, - 0.f, nullptr); + 0.f); record->push(CreateDiscardablePaintImage(gfx::Size(10, 10)), 0.f, - 0.f, nullptr); + 0.f); record->push(CreateDiscardablePaintImage(gfx::Size(10, 10)), 0.f, - 0.f, nullptr); + 0.f); auto record_shader = PaintShader::MakePaintRecord( record, SkRect::MakeWH(100, 100), SkTileMode::kClamp, SkTileMode::kClamp, &SkMatrix::I()); diff --git a/cc/paint/skia_paint_canvas.cc b/cc/paint/skia_paint_canvas.cc index 32a55b82dcb934..2067070cfe4166 100644 --- a/cc/paint/skia_paint_canvas.cc +++ b/cc/paint/skia_paint_canvas.cc @@ -263,6 +263,7 @@ void SkiaPaintCanvas::drawPath(const SkPath& path, const PaintFlags& flags) { void SkiaPaintCanvas::drawImage(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions& sampling, const PaintFlags* flags) { DCHECK(!image.IsPaintWorklet()); base::Optional scoped_flags; @@ -275,7 +276,7 @@ void SkiaPaintCanvas::drawImage(const PaintImage& image, const PaintFlags* raster_flags = scoped_flags ? scoped_flags->flags() : flags; PlaybackParams params(image_provider_, canvas_->getLocalToDevice()); - DrawImageOp draw_image_op(image, left, top, nullptr); + DrawImageOp draw_image_op(image, left, top, sampling, nullptr); DrawImageOp::RasterWithFlags(&draw_image_op, raster_flags, canvas_, params); FlushAfterDrawIfNeeded(); } @@ -283,6 +284,7 @@ void SkiaPaintCanvas::drawImage(const PaintImage& image, void SkiaPaintCanvas::drawImageRect(const PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions& sampling, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) { base::Optional scoped_flags; @@ -295,7 +297,8 @@ void SkiaPaintCanvas::drawImageRect(const PaintImage& image, const PaintFlags* raster_flags = scoped_flags ? scoped_flags->flags() : flags; PlaybackParams params(image_provider_, canvas_->getLocalToDevice()); - DrawImageRectOp draw_image_rect_op(image, src, dst, flags, constraint); + DrawImageRectOp draw_image_rect_op(image, src, dst, sampling, flags, + constraint); DrawImageRectOp::RasterWithFlags(&draw_image_rect_op, raster_flags, canvas_, params); FlushAfterDrawIfNeeded(); diff --git a/cc/paint/skia_paint_canvas.h b/cc/paint/skia_paint_canvas.h index eb469f0aa0fcd4..ff4f96a0c6a3b1 100644 --- a/cc/paint/skia_paint_canvas.h +++ b/cc/paint/skia_paint_canvas.h @@ -105,10 +105,12 @@ class CC_PAINT_EXPORT SkiaPaintCanvas final : public PaintCanvas { void drawImage(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions&, const PaintFlags* flags) override; void drawImageRect(const PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions&, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) override; void drawSkottie(scoped_refptr skottie, diff --git a/cc/test/fake_content_layer_client.cc b/cc/test/fake_content_layer_client.cc index 325b5a1c3a4edf..b93ec642a8844d 100644 --- a/cc/test/fake_content_layer_client.cc +++ b/cc/test/fake_content_layer_client.cc @@ -15,13 +15,18 @@ namespace cc { FakeContentLayerClient::ImageData::ImageData(PaintImage img, const gfx::Point& point, + const SkSamplingOptions& sampling, const PaintFlags& flags) - : image(std::move(img)), point(point), flags(flags) {} + : image(std::move(img)), point(point), sampling(sampling), flags(flags) {} FakeContentLayerClient::ImageData::ImageData(PaintImage img, const gfx::Transform& transform, + const SkSamplingOptions& sampling, const PaintFlags& flags) - : image(std::move(img)), transform(transform), flags(flags) {} + : image(std::move(img)), + transform(transform), + sampling(sampling), + flags(flags) {} FakeContentLayerClient::ImageData::ImageData(const ImageData& other) = default; @@ -65,7 +70,8 @@ FakeContentLayerClient::PaintContentsToDisplayList() { SkClipOp::kIntersect, false); display_list->push( it->image, static_cast(it->point.x()), - static_cast(it->point.y()), &it->flags); + static_cast(it->point.y()), + SkSamplingOptions(it->flags.getFilterQuality()), &it->flags); display_list->push(); display_list->EndPaintOfUnpaired(PaintableRegion()); diff --git a/cc/test/fake_content_layer_client.h b/cc/test/fake_content_layer_client.h index 811c9405a03339..000be16df4b684 100644 --- a/cc/test/fake_content_layer_client.h +++ b/cc/test/fake_content_layer_client.h @@ -27,15 +27,18 @@ class FakeContentLayerClient : public ContentLayerClient { struct ImageData { ImageData(PaintImage image, const gfx::Point& point, + const SkSamplingOptions&, const PaintFlags& flags); ImageData(PaintImage image, const gfx::Transform& transform, + const SkSamplingOptions&, const PaintFlags& flags); ImageData(const ImageData& other); ~ImageData(); PaintImage image; gfx::Point point; gfx::Transform transform; + SkSamplingOptions sampling; PaintFlags flags; }; @@ -70,25 +73,40 @@ class FakeContentLayerClient : public ContentLayerClient { void add_draw_image(sk_sp image, const gfx::Point& point, + const SkSamplingOptions& sampling, const PaintFlags& flags) { add_draw_image( PaintImageBuilder::WithDefault() .set_id(PaintImage::GetNextId()) .set_image(std::move(image), PaintImage::GetNextContentId()) .TakePaintImage(), - point, flags); + point, sampling, flags); + } + void add_draw_image(sk_sp image, const gfx::Point& point) { + add_draw_image( + PaintImageBuilder::WithDefault() + .set_id(PaintImage::GetNextId()) + .set_image(std::move(image), PaintImage::GetNextContentId()) + .TakePaintImage(), + point, SkSamplingOptions(), PaintFlags()); } void add_draw_image(PaintImage image, const gfx::Point& point, + const SkSamplingOptions& sampling, const PaintFlags& flags) { - ImageData data(std::move(image), point, flags); + ImageData data(std::move(image), point, sampling, flags); + draw_images_.push_back(data); + } + void add_draw_image(PaintImage image, const gfx::Point& point) { + ImageData data(std::move(image), point, SkSamplingOptions(), PaintFlags()); draw_images_.push_back(data); } void add_draw_image_with_transform(PaintImage image, const gfx::Transform& transform, + const SkSamplingOptions& sampling, const PaintFlags& flags) { - ImageData data(std::move(image), transform, flags); + ImageData data(std::move(image), transform, sampling, flags); draw_images_.push_back(data); } diff --git a/cc/test/fake_recording_source.h b/cc/test/fake_recording_source.h index 327994efe21105..a95613f8954e61 100644 --- a/cc/test/fake_recording_source.h +++ b/cc/test/fake_recording_source.h @@ -105,22 +105,25 @@ class FakeRecordingSource : public RecordingSource { } void add_draw_image(sk_sp image, const gfx::Point& point) { - client_.add_draw_image(std::move(image), point, default_flags_); + client_.add_draw_image(std::move(image), point, SkSamplingOptions(), + default_flags_); } void add_draw_image(PaintImage image, const gfx::Point& point) { - client_.add_draw_image(std::move(image), point, default_flags_); + client_.add_draw_image(std::move(image), point, SkSamplingOptions(), + default_flags_); } void add_draw_image_with_transform(PaintImage image, const gfx::Transform& transform) { client_.add_draw_image_with_transform(std::move(image), transform, - default_flags_); + SkSamplingOptions(), default_flags_); } void add_draw_image_with_flags(sk_sp image, const gfx::Point& point, + const SkSamplingOptions& sampling, const PaintFlags& flags) { - client_.add_draw_image(std::move(image), point, flags); + client_.add_draw_image(std::move(image), point, sampling, flags); } void set_default_flags(const PaintFlags& flags) { default_flags_ = flags; } diff --git a/cc/trees/layer_tree_host_pixeltest_blending.cc b/cc/trees/layer_tree_host_pixeltest_blending.cc index 496bdbf6da9cf6..98bb4f49eb57ff 100644 --- a/cc/trees/layer_tree_host_pixeltest_blending.cc +++ b/cc/trees/layer_tree_host_pixeltest_blending.cc @@ -123,7 +123,7 @@ class LayerTreeHostBlendingPixelTest gfx::Size bounds(width, height); backdrop_client_.set_bounds(bounds); backdrop_client_.add_draw_image(backing_store->makeImageSnapshot(), - gfx::Point(), PaintFlags()); + gfx::Point()); scoped_refptr layer = FakePictureLayer::Create(&backdrop_client_); layer->SetIsDrawable(true); @@ -146,8 +146,7 @@ class LayerTreeHostBlendingPixelTest SkRect::MakeXYWH(1, 0, bounds.width() - 1, bounds.height()), paint); mask_client_.set_bounds(bounds); - mask_client_.add_draw_image(surface->makeImageSnapshot(), gfx::Point(), - PaintFlags()); + mask_client_.add_draw_image(surface->makeImageSnapshot(), gfx::Point()); scoped_refptr mask = FakePictureLayer::Create(&mask_client_); diff --git a/cc/trees/layer_tree_host_pixeltest_masks.cc b/cc/trees/layer_tree_host_pixeltest_masks.cc index c936a7cbf0ac40..f0f9fe67a4eb14 100644 --- a/cc/trees/layer_tree_host_pixeltest_masks.cc +++ b/cc/trees/layer_tree_host_pixeltest_masks.cc @@ -333,8 +333,7 @@ TEST_P(LayerTreeHostMaskPixelTestWithLayerList, ImageMaskWithEffect) { FakeContentLayerClient layer_client; layer_client.set_bounds(mask_bounds_); - layer_client.add_draw_image(surface->makeImageSnapshot(), gfx::Point(), - PaintFlags()); + layer_client.add_draw_image(surface->makeImageSnapshot(), gfx::Point()); mask_layer_ = FakePictureLayer::Create(&layer_client); pixel_comparator_ = @@ -361,8 +360,7 @@ TEST_P(LayerTreeHostMasksPixelTest, ImageMaskOfLayer) { FakeContentLayerClient mask_client; mask_client.set_bounds(mask_bounds); - mask_client.add_draw_image(surface->makeImageSnapshot(), gfx::Point(), - PaintFlags()); + mask_client.add_draw_image(surface->makeImageSnapshot(), gfx::Point()); scoped_refptr mask = FakePictureLayer::Create(&mask_client); mask->SetIsDrawable(true); mask->SetBounds(mask_bounds); diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index cb0f65d4ce695b..f6319bddb11907 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc @@ -8270,7 +8270,7 @@ class LayerTreeHostTestImageAnimationDrawImage private: void AddImageOp(const PaintImage& image) override { - content_layer_client_.add_draw_image(image, gfx::Point(0, 0), PaintFlags()); + content_layer_client_.add_draw_image(image, gfx::Point(0, 0)); } }; @@ -8292,7 +8292,7 @@ class LayerTreeHostTestImageAnimationDrawRecordShader : public LayerTreeHostTestImageAnimation { void AddImageOp(const PaintImage& image) override { auto record = sk_make_sp(); - record->push(image, 0.f, 0.f, nullptr); + record->push(image, 0.f, 0.f); PaintFlags flags; flags.setShader(PaintShader::MakePaintRecord( record, SkRect::MakeWH(500, 500), SkTileMode::kClamp, @@ -8307,7 +8307,7 @@ class LayerTreeHostTestImageAnimationPaintFilter : public LayerTreeHostTestImageAnimation { void AddImageOp(const PaintImage& image) override { auto record = sk_make_sp(); - record->push(image, 0.f, 0.f, nullptr); + record->push(image, 0.f, 0.f); PaintFlags flags; flags.setImageFilter( sk_make_sp(record, SkRect::MakeWH(500, 500))); @@ -8383,12 +8383,9 @@ class LayerTreeHostTestImageDecodingHints : public LayerTreeHostTest { .set_id(3) .set_decoding_mode(PaintImage::DecodingMode::kUnspecified) .TakePaintImage(); - content_layer_client_.add_draw_image(async_image, gfx::Point(0, 0), - PaintFlags()); - content_layer_client_.add_draw_image(sync_image, gfx::Point(1, 2), - PaintFlags()); - content_layer_client_.add_draw_image(unspecified_image, gfx::Point(3, 4), - PaintFlags()); + content_layer_client_.add_draw_image(async_image, gfx::Point(0, 0)); + content_layer_client_.add_draw_image(sync_image, gfx::Point(1, 2)); + content_layer_client_.add_draw_image(unspecified_image, gfx::Point(3, 4)); layer_tree_host()->SetRootLayer( FakePictureLayer::Create(&content_layer_client_)); diff --git a/cc/trees/layer_tree_host_unittest_checkerimaging.cc b/cc/trees/layer_tree_host_unittest_checkerimaging.cc index f841b4c7826769..9801b1718cbdea 100644 --- a/cc/trees/layer_tree_host_unittest_checkerimaging.cc +++ b/cc/trees/layer_tree_host_unittest_checkerimaging.cc @@ -69,7 +69,7 @@ class LayerTreeHostCheckerImagingTest : public LayerTreeTest { .set_decoding_mode(PaintImage::DecodingMode::kAsync) .TakePaintImage(); content_layer_client_.add_draw_image(checkerable_image, gfx::Point(0, 0), - PaintFlags()); + SkSamplingOptions(), PaintFlags()); layer_tree_host()->SetRootLayer( FakePictureLayer::Create(&content_layer_client_)); diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index bf5c48a6fbc1fc..62919a64444284 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -832,6 +832,7 @@ junit_binary("chrome_junit_tests") { "//chrome/browser/incognito/interstitial/android:junit", "//chrome/browser/omaha/android:java", "//chrome/browser/optimization_guide/android:java", + "//chrome/browser/payments/android:junit", "//chrome/browser/performance_hints/android:java", "//chrome/browser/policy/android:java", "//chrome/browser/preferences:java", diff --git a/chrome/android/chrome_junit_test_java_sources.gni b/chrome/android/chrome_junit_test_java_sources.gni index c21bf16e163df8..68cc65bcff18e4 100644 --- a/chrome/android/chrome_junit_test_java_sources.gni +++ b/chrome/android/chrome_junit_test_java_sources.gni @@ -190,16 +190,6 @@ chrome_junit_test_java_sources = [ "junit/src/org/chromium/chrome/browser/password_manager/settings/ExportWarningDialogFragmentTest.java", "junit/src/org/chromium/chrome/browser/password_manager/settings/SingleThreadBarrierClosureTest.java", "junit/src/org/chromium/chrome/browser/password_manager/settings/TimedCallbackDelayerTest.java", - "junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java", - "junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java", - "junit/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java", - "junit/src/org/chromium/chrome/browser/payments/MockPaymentUiServiceBuilder.java", - "junit/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java", - "junit/src/org/chromium/chrome/browser/payments/PaymentRequestParamsBuilder.java", - "junit/src/org/chromium/chrome/browser/payments/ShadowPaymentFeatureList.java", - "junit/src/org/chromium/chrome/browser/payments/ShadowProfile.java", - "junit/src/org/chromium/chrome/browser/payments/ShadowWebContentsStatics.java", - "junit/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediatorTest.java", "junit/src/org/chromium/chrome/browser/policy/EnterpriseInfoTest.java", "junit/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImplTest.java", "junit/src/org/chromium/chrome/browser/read_later/ReadingListUtilsUnitTest.java", diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/OWNERS b/chrome/android/junit/src/org/chromium/chrome/browser/payments/OWNERS deleted file mode 100644 index ca123112db652f..00000000000000 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/OWNERS +++ /dev/null @@ -1 +0,0 @@ -file://chrome/android/java/src/org/chromium/chrome/browser/payments/OWNERS diff --git a/chrome/browser/apps/user_type_filter.cc b/chrome/browser/apps/user_type_filter.cc index 0fa60466ca9d1b..a93d1028c47957 100644 --- a/chrome/browser/apps/user_type_filter.cc +++ b/chrome/browser/apps/user_type_filter.cc @@ -18,7 +18,6 @@ const char kKeyUserType[] = "user_type"; const char kUserTypeChild[] = "child"; const char kUserTypeGuest[] = "guest"; const char kUserTypeManaged[] = "managed"; -const char kUserTypeSupervised[] = "supervised"; const char kUserTypeUnmanaged[] = "unmanaged"; std::string DetermineUserType(Profile* profile) { @@ -28,8 +27,6 @@ std::string DetermineUserType(Profile* profile) { return kUserTypeGuest; if (profile->IsChild()) return kUserTypeChild; - if (profile->IsLegacySupervised()) - return kUserTypeSupervised; if (profile->GetProfilePolicyConnector()->IsManaged()) { return kUserTypeManaged; } diff --git a/chrome/browser/apps/user_type_filter.h b/chrome/browser/apps/user_type_filter.h index 3e8afdeb842468..f90fb369abad03 100644 --- a/chrome/browser/apps/user_type_filter.h +++ b/chrome/browser/apps/user_type_filter.h @@ -21,7 +21,6 @@ extern const char kKeyUserType[]; extern const char kUserTypeChild[]; extern const char kUserTypeGuest[]; extern const char kUserTypeManaged[]; -extern const char kUserTypeSupervised[]; extern const char kUserTypeUnmanaged[]; // Returns user type based on |profile|. Must be called on UI thread. List of diff --git a/chrome/browser/apps/user_type_filter_unittest.cc b/chrome/browser/apps/user_type_filter_unittest.cc index fc25f42303a6d5..b073efec2dada1 100644 --- a/chrome/browser/apps/user_type_filter_unittest.cc +++ b/chrome/browser/apps/user_type_filter_unittest.cc @@ -114,15 +114,6 @@ TEST_F(UserTypeFilterTest, ManagedUser) { profile, CreateJsonWithFilter({kUserTypeUnmanaged, kUserTypeManaged}))); } -TEST_F(UserTypeFilterTest, SupervisedUser) { - const auto profile = CreateProfile(); - profile->SetSupervisedUserId("asdf"); - EXPECT_FALSE(Match(profile, CreateJsonWithFilter({kUserTypeUnmanaged}))); - EXPECT_TRUE(Match(profile, CreateJsonWithFilter({kUserTypeSupervised}))); - EXPECT_TRUE(Match(profile, CreateJsonWithFilter( - {kUserTypeUnmanaged, kUserTypeSupervised}))); -} - TEST_F(UserTypeFilterTest, UnmanagedUser) { EXPECT_TRUE( Match(CreateProfile(), CreateJsonWithFilter({kUserTypeUnmanaged}))); @@ -146,11 +137,6 @@ TEST_P(GuestUserTypeFilterTest, DefaultFilter) { // Child user. profile->SetSupervisedUserId(supervised_users::kChildAccountSUID); EXPECT_FALSE(MatchDefault(profile, default_filter)); - // Supervised user. - // TODO(crbug.com/971311): Remove the next assert test once legacy supervised - // user code has been fully removed. - profile->SetSupervisedUserId("asdf"); - EXPECT_FALSE(MatchDefault(profile, default_filter)); #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) // Managed user. profile = CreateProfile(); diff --git a/chrome/browser/chromeos/arc/arc_util.cc b/chrome/browser/chromeos/arc/arc_util.cc index e52ca4aef1fb55..ddac471eb7cb89 100644 --- a/chrome/browser/chromeos/arc/arc_util.cc +++ b/chrome/browser/chromeos/arc/arc_util.cc @@ -178,12 +178,6 @@ bool IsArcAllowedForProfileInternal(const Profile* profile, return false; } - if (profile->IsLegacySupervised()) { - VLOG_IF(1, should_report_reason) - << "Supervised users are not supported in ARC."; - return false; - } - if (policy_util::IsArcDisabledForEnterprise() && policy_util::IsAccountManaged(profile)) { VLOG_IF(1, should_report_reason) diff --git a/chrome/browser/chromeos/arc/arc_util_unittest.cc b/chrome/browser/chromeos/arc/arc_util_unittest.cc index c6739c7152805f..adb8a3091c5d1b 100644 --- a/chrome/browser/chromeos/arc/arc_util_unittest.cc +++ b/chrome/browser/chromeos/arc/arc_util_unittest.cc @@ -229,10 +229,6 @@ TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile) { // false for incognito mode profile. EXPECT_FALSE( IsArcAllowedForProfileOnFirstCall(profile()->GetPrimaryOTRProfile())); - - // false for Legacy supervised user. - profile()->SetSupervisedUserId("foo"); - EXPECT_FALSE(IsArcAllowedForProfileOnFirstCall(profile())); } TEST_F(ChromeArcUtilTest, IsArcAllowedForProfileLegacy) { @@ -248,10 +244,6 @@ TEST_F(ChromeArcUtilTest, IsArcAllowedForProfileLegacy) { // false for incognito mode profile. EXPECT_FALSE( IsArcAllowedForProfileOnFirstCall(profile()->GetPrimaryOTRProfile())); - - // false for Legacy supervised user. - profile()->SetSupervisedUserId("foo"); - EXPECT_FALSE(IsArcAllowedForProfileOnFirstCall(profile())); } TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_DisableArc) { diff --git a/chrome/browser/chromeos/crostini/crostini_features.cc b/chrome/browser/chromeos/crostini/crostini_features.cc index 08903a4a3bd9e4..cb387a80f5cad0 100644 --- a/chrome/browser/chromeos/crostini/crostini_features.cc +++ b/chrome/browser/chromeos/crostini/crostini_features.cc @@ -185,8 +185,7 @@ bool CrostiniFeatures::CouldBeAllowed(Profile* profile) { return false; } - if (!profile || profile->IsChild() || profile->IsLegacySupervised() || - profile->IsOffTheRecord() || + if (!profile || profile->IsChild() || profile->IsOffTheRecord() || chromeos::ProfileHelper::IsEphemeralUserProfile(profile) || chromeos::ProfileHelper::IsLockScreenAppProfile(profile)) { VLOG(1) << "Profile is not allowed to run crostini."; diff --git a/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc b/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc index 291fc952b2e8d2..71ccfe15bdec03 100644 --- a/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc +++ b/chrome/browser/chromeos/plugin_vm/plugin_vm_features.cc @@ -50,8 +50,7 @@ PluginVmFeatures::~PluginVmFeatures() = default; // * PluginVmUserId policy. bool PluginVmFeatures::IsAllowed(const Profile* profile) { // Check that the profile is eligible. - if (!profile || profile->IsChild() || profile->IsLegacySupervised() || - profile->IsOffTheRecord() || + if (!profile || profile->IsChild() || profile->IsOffTheRecord() || chromeos::ProfileHelper::IsEphemeralUserProfile(profile) || !chromeos::ProfileHelper::IsRegularProfile(profile) || !chromeos::ProfileHelper::IsPrimaryProfile(profile)) { diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc index 4c969b56d752c8..30c7b1a710de92 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc @@ -148,12 +148,14 @@ SystemEventTimes GetSystemEventTimes() { AutomaticRebootManager::AutomaticRebootManager(const base::TickClock* clock) : clock_(clock) { local_state_registrar_.Init(g_browser_process->local_state()); - local_state_registrar_.Add(prefs::kUptimeLimit, - base::Bind(&AutomaticRebootManager::Reschedule, - base::Unretained(this))); - local_state_registrar_.Add(prefs::kRebootAfterUpdate, - base::Bind(&AutomaticRebootManager::Reschedule, - base::Unretained(this))); + local_state_registrar_.Add( + prefs::kUptimeLimit, + base::BindRepeating(&AutomaticRebootManager::Reschedule, + base::Unretained(this))); + local_state_registrar_.Add( + prefs::kRebootAfterUpdate, + base::BindRepeating(&AutomaticRebootManager::Reschedule, + base::Unretained(this))); notification_registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING, content::NotificationService::AllSources()); diff --git a/chrome/browser/chromeos/system/device_disabling_manager.cc b/chrome/browser/chromeos/system/device_disabling_manager.cc index 92b01dd8544c29..97a9341377a976 100644 --- a/chrome/browser/chromeos/system/device_disabling_manager.cc +++ b/chrome/browser/chromeos/system/device_disabling_manager.cc @@ -66,12 +66,12 @@ void DeviceDisablingManager::Init() { device_disabled_subscription_ = cros_settings_->AddSettingsObserver( kDeviceDisabled, - base::Bind(&DeviceDisablingManager::UpdateFromCrosSettings, - weak_factory_.GetWeakPtr())); + base::BindRepeating(&DeviceDisablingManager::UpdateFromCrosSettings, + weak_factory_.GetWeakPtr())); disabled_message_subscription_ = cros_settings_->AddSettingsObserver( kDeviceDisabledMessage, - base::Bind(&DeviceDisablingManager::UpdateFromCrosSettings, - weak_factory_.GetWeakPtr())); + base::BindRepeating(&DeviceDisablingManager::UpdateFromCrosSettings, + weak_factory_.GetWeakPtr())); UpdateFromCrosSettings(); } @@ -87,13 +87,13 @@ void DeviceDisablingManager::CacheDisabledMessageAndNotify( } void DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE( - const DeviceDisabledCheckCallback& callback) { + DeviceDisabledCheckCallback callback) { if (policy::GetDeviceStateMode() != policy::RESTORE_MODE_DISABLED || base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableDeviceDisabling)) { // Indicate that the device is not disabled if it is not marked as such in // local state or device disabling has been turned off by flag. - callback.Run(false); + std::move(callback).Run(false); return; } @@ -104,7 +104,7 @@ void DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE( browser_policy_connector_->GetInstallAttributes()->ReadImmutableAttributes( base::BindOnce( &DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE, - weak_factory_.GetWeakPtr(), callback)); + weak_factory_.GetWeakPtr(), std::move(callback))); return; } @@ -115,7 +115,7 @@ void DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE( // prevent spurious disabling. Actual device disabling after OOBE will be // handled elsewhere, by checking for disabled state in cros settings. LOG(ERROR) << "CheckWhetherDeviceDisabledDuringOOBE() called after OOBE."; - callback.Run(false); + std::move(callback).Run(false); return; } @@ -144,7 +144,7 @@ void DeviceDisablingManager::CheckWhetherDeviceDisabledDuringOOBE( CacheDisabledMessageAndNotify(disabled_message); // Indicate that the device is disabled. - callback.Run(true); + std::move(callback).Run(true); } // static diff --git a/chrome/browser/chromeos/system/device_disabling_manager.h b/chrome/browser/chromeos/system/device_disabling_manager.h index 9f6689b415e7e1..cc2934955aa2f5 100644 --- a/chrome/browser/chromeos/system/device_disabling_manager.h +++ b/chrome/browser/chromeos/system/device_disabling_manager.h @@ -51,7 +51,7 @@ namespace system { // regular login screen flows from a known-good point. class DeviceDisablingManager { public: - using DeviceDisabledCheckCallback = base::Callback; + using DeviceDisabledCheckCallback = base::OnceCallback; class Observer { public: @@ -106,7 +106,7 @@ class DeviceDisablingManager { // Performs a check whether the device is disabled during OOBE. |callback| // will be invoked with the result of the check. void CheckWhetherDeviceDisabledDuringOOBE( - const DeviceDisabledCheckCallback& callback); + DeviceDisabledCheckCallback callback); // Returns true if trusted cros settings say the device is disabled and the // device disabled setting should be honored. diff --git a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc index 17c24d6b303b2e..7ed06f89db3226 100644 --- a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc +++ b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc @@ -169,8 +169,8 @@ void DeviceDisablingManagerOOBETest::TearDown() { void DeviceDisablingManagerOOBETest::CheckWhetherDeviceDisabledDuringOOBE() { GetDeviceDisablingManager()->CheckWhetherDeviceDisabledDuringOOBE( - base::Bind(&DeviceDisablingManagerOOBETest::OnDeviceDisabledChecked, - base::Unretained(this))); + base::BindOnce(&DeviceDisablingManagerOOBETest::OnDeviceDisabledChecked, + base::Unretained(this))); run_loop_.Run(); } diff --git a/chrome/browser/chromeos/system/system_clock.cc b/chrome/browser/chromeos/system/system_clock.cc index 46d23e5cc49b24..9814520bbe2e4d 100644 --- a/chrome/browser/chromeos/system/system_clock.cc +++ b/chrome/browser/chromeos/system/system_clock.cc @@ -46,8 +46,9 @@ void SetShouldUse24HourClock(bool use_24_hour_clock) { SystemClock::SystemClock() { device_settings_observer_ = CrosSettings::Get()->AddSettingsObserver( - kSystemUse24HourClock, base::Bind(&SystemClock::OnSystemPrefChanged, - weak_ptr_factory_.GetWeakPtr())); + kSystemUse24HourClock, + base::BindRepeating(&SystemClock::OnSystemPrefChanged, + weak_ptr_factory_.GetWeakPtr())); if (LoginState::IsInitialized()) LoginState::Get()->AddObserver(this); @@ -106,9 +107,9 @@ void SystemClock::SetProfile(Profile* profile) { PrefService* prefs = profile->GetPrefs(); user_pref_registrar_.reset(new PrefChangeRegistrar); user_pref_registrar_->Init(prefs); - user_pref_registrar_->Add( - prefs::kUse24HourClock, - base::Bind(&SystemClock::UpdateClockType, base::Unretained(this))); + user_pref_registrar_->Add(prefs::kUse24HourClock, + base::BindRepeating(&SystemClock::UpdateClockType, + base::Unretained(this))); UpdateClockType(); } diff --git a/chrome/browser/chromeos/system/timezone_resolver_manager.cc b/chrome/browser/chromeos/system/timezone_resolver_manager.cc index 649225610ab728..6e080544490073 100644 --- a/chrome/browser/chromeos/system/timezone_resolver_manager.cc +++ b/chrome/browser/chromeos/system/timezone_resolver_manager.cc @@ -132,7 +132,7 @@ TimeZoneResolverManager::TimeZoneResolverManager() { local_state_pref_change_registrar_.Init(g_browser_process->local_state()); local_state_pref_change_registrar_.Add( prefs::kSystemTimezoneAutomaticDetectionPolicy, - base::Bind( + base::BindRepeating( &::chromeos::system::TimeZoneResolverManager::UpdateTimezoneResolver, base::Unretained(this))); } diff --git a/chrome/browser/chromeos/system/user_removal_manager_unittest.cc b/chrome/browser/chromeos/system/user_removal_manager_unittest.cc index c3332bed0cc5de..12ae8eab78cb43 100644 --- a/chrome/browser/chromeos/system/user_removal_manager_unittest.cc +++ b/chrome/browser/chromeos/system/user_removal_manager_unittest.cc @@ -82,7 +82,7 @@ TEST_F(UserRemovalManagerTest, TestFailsafeTimer) { [](bool* log_out_called) { *log_out_called = true; }, &log_out_called)); // This call starts the timer. - user_removal_manager::InitiateUserRemoval(base::Closure()); + user_removal_manager::InitiateUserRemoval(base::OnceClosure()); // After 55s the timer is not run yet. task_runner_->FastForwardBy(base::TimeDelta::FromSeconds(55)); diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index d6a158c9f3878a..110aea9ee4353c 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -792,61 +792,57 @@ void ExternalProviderImpl::CreateExternalProviders( profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, bundled_extension_creation_flags)); #endif - if (!profile->IsLegacySupervised()) { #if defined(OS_WIN) - auto registry_provider = std::make_unique( - service, new ExternalRegistryLoader, profile, - Manifest::EXTERNAL_REGISTRY, Manifest::EXTERNAL_PREF_DOWNLOAD, - Extension::NO_FLAGS); - registry_provider->set_allow_updates(true); - provider_list->push_back(std::move(registry_provider)); + auto registry_provider = std::make_unique( + service, new ExternalRegistryLoader, profile, + Manifest::EXTERNAL_REGISTRY, Manifest::EXTERNAL_PREF_DOWNLOAD, + Extension::NO_FLAGS); + registry_provider->set_allow_updates(true); + provider_list->push_back(std::move(registry_provider)); #else - provider_list->push_back(std::make_unique( - service, - base::MakeRefCounted( - chrome::DIR_EXTERNAL_EXTENSIONS, check_admin_permissions_on_mac, - nullptr), - profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, - bundled_extension_creation_flags)); + provider_list->push_back(std::make_unique( + service, + base::MakeRefCounted( + chrome::DIR_EXTERNAL_EXTENSIONS, check_admin_permissions_on_mac, + nullptr), + profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, + bundled_extension_creation_flags)); - // Define a per-user source of external extensions. + // Define a per-user source of external extensions. #if defined(OS_MAC) || ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) - provider_list->push_back(std::make_unique( - service, - base::MakeRefCounted( - chrome::DIR_USER_EXTERNAL_EXTENSIONS, ExternalPrefLoader::NONE, - nullptr), - profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, - Extension::NO_FLAGS)); + provider_list->push_back(std::make_unique( + service, + base::MakeRefCounted( + chrome::DIR_USER_EXTERNAL_EXTENSIONS, ExternalPrefLoader::NONE, + nullptr), + profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, + Extension::NO_FLAGS)); #endif #endif - } } - if (!profile->IsLegacySupervised()) { #if !BUILDFLAG(IS_CHROMEOS_ASH) - // The default apps are installed as INTERNAL but use the external - // extension installer codeflow. - provider_list->push_back(std::make_unique( - profile, service, - base::MakeRefCounted( - chrome::DIR_DEFAULT_APPS, ExternalPrefLoader::NONE, nullptr), - Manifest::INTERNAL, Manifest::INTERNAL, - Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)); + // The default apps are installed as INTERNAL but use the external + // extension installer codeflow. + provider_list->push_back(std::make_unique( + profile, service, + base::MakeRefCounted( + chrome::DIR_DEFAULT_APPS, ExternalPrefLoader::NONE, nullptr), + Manifest::INTERNAL, Manifest::INTERNAL, + Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)); #endif - std::unique_ptr drive_migration_provider( - new ExternalProviderImpl( - service, - base::MakeRefCounted( - profile, extension_misc::kDriveHostedAppId, - extension_misc::kDocsOfflineExtensionId), - profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, - Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)); - drive_migration_provider->set_auto_acknowledge(true); - provider_list->push_back(std::move(drive_migration_provider)); - } + std::unique_ptr drive_migration_provider( + new ExternalProviderImpl( + service, + base::MakeRefCounted( + profile, extension_misc::kDriveHostedAppId, + extension_misc::kDocsOfflineExtensionId), + profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD, + Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)); + drive_migration_provider->set_auto_acknowledge(true); + provider_list->push_back(std::move(drive_migration_provider)); provider_list->push_back(std::make_unique( service, base::MakeRefCounted(profile), profile, diff --git a/chrome/browser/payments/DEPS b/chrome/browser/payments/DEPS index d8ca073aa7f4ea..a990f508faba08 100644 --- a/chrome/browser/payments/DEPS +++ b/chrome/browser/payments/DEPS @@ -1,5 +1,7 @@ include_rules = [ "+third_party/libaddressinput", + "+content/public/android/java/src/org/chromium/content_public/browser", + "+chrome/android/java/src/org/chromium/chrome/browser/payments", ] specific_include_rules = { diff --git a/chrome/browser/payments/android/BUILD.gn b/chrome/browser/payments/android/BUILD.gn index 92fae59364b28a..9b8cced3501192 100644 --- a/chrome/browser/payments/android/BUILD.gn +++ b/chrome/browser/payments/android/BUILD.gn @@ -15,3 +15,73 @@ generate_jni("jni_headers") { "../../../android/java/src/org/chromium/chrome/browser/payments/ServiceWorkerPaymentAppBridge.java", ] } + +# TODO(crbug.com/1164979): remove the dependency on chrome_java. +android_library("junit_test_support") { + # Platform checks are broken for Robolectric. See https://crbug.com/1071638. + bypass_platform_checks = true + testonly = true + deps = [ + "//base:base_java", + "//chrome/android:chrome_java", + "//chrome/browser/android/lifecycle:java", + "//chrome/browser/profiles/android:java", + "//chrome/browser/tabmodel:java", + "//components/payments/content/android:java", + "//components/payments/content/android:service_java", + "//components/payments/mojom:mojom_java", + "//content/public/android:content_java", + "//mojo/public/java:bindings_java", + "//mojo/public/java:system_java", + "//third_party/android_deps:androidx_annotation_annotation_java", + "//third_party/android_deps:robolectric_all_java", + "//third_party/blink/public/mojom:android_mojo_bindings_java", + "//third_party/mockito:mockito_java", + "//ui/android:ui_no_recycler_view_java", + "//url:gurl_java", + "//url:gurl_junit_test_support", + "//url:origin_java", + ] + sources = [ + "java/src/org/chromium/chrome/browser/payments/test_support/MockPaymentUiServiceBuilder.java", + "java/src/org/chromium/chrome/browser/payments/test_support/PaymentRequestParamsBuilder.java", + "java/src/org/chromium/chrome/browser/payments/test_support/ShadowPaymentFeatureList.java", + "java/src/org/chromium/chrome/browser/payments/test_support/ShadowProfile.java", + "java/src/org/chromium/chrome/browser/payments/test_support/ShadowWebContentsStatics.java", + ] +} + +# TODO(crbug.com/1164979): remove the dependency on chrome_java. +java_library("junit") { + # Platform checks are broken for Robolectric. See https://crbug.com/1071638. + bypass_platform_checks = true + testonly = true + deps = [ + ":junit_test_support", + "//base:base_java", + "//base:base_java_test_support", + "//base:base_junit_test_support", + "//chrome/android:chrome_java", + "//chrome/browser/profiles/android:java", + "//components/payments/content/android:java", + "//components/payments/content/android:service_java", + "//components/payments/mojom:mojom_java", + "//components/security_state/core:security_state_enums_java", + "//content/public/android:content_java", + "//mojo/public/java:bindings_java", + "//mojo/public/java:system_java", + "//services/service_manager/public/java:service_manager_java", + "//third_party/android_deps:robolectric_all_java", + "//third_party/blink/public/mojom:android_mojo_bindings_java", + "//third_party/junit", + "//third_party/mockito:mockito_java", + "//ui/android:ui_no_recycler_view_java", + ] + sources = [ + "java/src/org/chromium/chrome/browser/payments/AutofillContactTest.java", + "java/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java", + "java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java", + "java/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java", + "java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediatorTest.java", + ] +} diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/AutofillContactTest.java similarity index 71% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/AutofillContactTest.java index 4060b95fcf99b0..1734655894d14d 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillContactTest.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/AutofillContactTest.java @@ -32,43 +32,25 @@ public class AutofillContactTest { @Parameters public static Collection data() { return Arrays.asList(new Object[][] { - {"Jon Doe", "555-5555", "j@d.co", true, - "Jon Doe", "555-5555", "j@d.co", - "Jon Doe", "555-5555", "j@d.co"}, - {null, "555-5555", "j@d.co", true, - "555-5555", "j@d.co", null, - null, "555-5555", "j@d.co"}, - {"", "555-5555", "j@d.co", true, - "555-5555", "j@d.co", null, - null, "555-5555", "j@d.co"}, - {"Jon Doe", null, "j@d.co", true, - "Jon Doe", "j@d.co", null, - "Jon Doe", null, "j@d.co"}, - {"Jon Doe", "", "j@d.co", true, - "Jon Doe", "j@d.co", null, - "Jon Doe", null, "j@d.co"}, - {"Jon Doe", "555-5555", null, true, - "Jon Doe", "555-5555", null, - "Jon Doe", "555-5555", null}, - {"Jon Doe", "555-5555", "", true, - "Jon Doe", "555-5555", null, - "Jon Doe", "555-5555", null}, - {null, "555-5555", null, true, - "555-5555", null, null, - null, "555-5555", null}, - {"", "555-5555", "", true, - "555-5555", null, null, - null, "555-5555", null}, - {null, null, "j@d.co", true, - "j@d.co", null, null, - null, null, "j@d.co"}, - {"", "", "j@d.co", true, - "j@d.co", null, null, - null, null, "j@d.co"}, - {"", "555-5555", "", false, - "555-5555", null, null, - null, "555-5555", null} - }); + {"Jon Doe", "555-5555", "j@d.co", true, "Jon Doe", "555-5555", "j@d.co", "Jon Doe", + "555-5555", "j@d.co"}, + {null, "555-5555", "j@d.co", true, "555-5555", "j@d.co", null, null, "555-5555", + "j@d.co"}, + {"", "555-5555", "j@d.co", true, "555-5555", "j@d.co", null, null, "555-5555", + "j@d.co"}, + {"Jon Doe", null, "j@d.co", true, "Jon Doe", "j@d.co", null, "Jon Doe", null, + "j@d.co"}, + {"Jon Doe", "", "j@d.co", true, "Jon Doe", "j@d.co", null, "Jon Doe", null, + "j@d.co"}, + {"Jon Doe", "555-5555", null, true, "Jon Doe", "555-5555", null, "Jon Doe", + "555-5555", null}, + {"Jon Doe", "555-5555", "", true, "Jon Doe", "555-5555", null, "Jon Doe", + "555-5555", null}, + {null, "555-5555", null, true, "555-5555", null, null, null, "555-5555", null}, + {"", "555-5555", "", true, "555-5555", null, null, null, "555-5555", null}, + {null, null, "j@d.co", true, "j@d.co", null, null, null, null, "j@d.co"}, + {"", "", "j@d.co", true, "j@d.co", null, null, null, null, "j@d.co"}, + {"", "555-5555", "", false, "555-5555", null, null, null, "555-5555", null}}); } private static final String INCOMPLETE_MESSAGE = "incomplete"; @@ -106,10 +88,11 @@ public AutofillContactTest(String payerName, String payerPhone, String payerEmai @Test public void test() { AutofillProfile profile = new AutofillProfile(); - AutofillContact contact = new AutofillContact(mContext, profile, mPayerName, mPayerPhone, - mPayerEmail, mIsComplete ? ContactEditor.COMPLETE - : ContactEditor.INVALID_NAME | ContactEditor.INVALID_EMAIL, - true, true, true); + AutofillContact contact = + new AutofillContact(mContext, profile, mPayerName, mPayerPhone, mPayerEmail, + mIsComplete ? ContactEditor.COMPLETE + : ContactEditor.INVALID_NAME | ContactEditor.INVALID_EMAIL, + true, true, true); Assert.assertEquals( mIsComplete ? "Contact should be complete" : "Contact should be incomplete", @@ -122,8 +105,8 @@ public void test() { contact.completeContact("some-guid-here", "Jon Doe", "999-9999", "a@b.com"); Assert.assertTrue("Contact should be complete", contact.isComplete()); - assertContact("some-guid-here", "Jon Doe", "999-9999", "a@b.com", - "Jon Doe", "999-9999", "a@b.com", contact); + assertContact("some-guid-here", "Jon Doe", "999-9999", "a@b.com", "Jon Doe", "999-9999", + "a@b.com", contact); } private void assertContact(String id, String expectedName, String expectedPhone, diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/AutofillContactUnitTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java similarity index 95% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java index 1e3216e1a969c5..c6e39b76248d3e 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/ChromePaymentRequestFactoryTest.java @@ -18,6 +18,9 @@ import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.Feature; +import org.chromium.chrome.browser.payments.test_support.ShadowPaymentFeatureList; +import org.chromium.chrome.browser.payments.test_support.ShadowProfile; +import org.chromium.chrome.browser.payments.test_support.ShadowWebContentsStatics; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.payments.InvalidPaymentRequest; import org.chromium.components.payments.PaymentFeatureList; diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java similarity index 87% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java index 81724460e280b4..5ccd1833f169c2 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestIntegrationTest.java @@ -10,18 +10,22 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.mockito.quality.Strictness; import org.robolectric.annotation.Config; -import org.robolectric.annotation.Implementation; -import org.robolectric.annotation.Implements; import org.chromium.base.test.BaseRobolectricTestRunner; import org.chromium.base.test.util.Feature; +import org.chromium.base.test.util.JniMocker; +import org.chromium.chrome.browser.payments.test_support.MockPaymentUiServiceBuilder; +import org.chromium.chrome.browser.payments.test_support.PaymentRequestParamsBuilder; +import org.chromium.chrome.browser.payments.test_support.ShadowPaymentFeatureList; import org.chromium.chrome.browser.payments.ui.PaymentUiService; import org.chromium.components.payments.ErrorMessageUtil; +import org.chromium.components.payments.ErrorMessageUtilJni; import org.chromium.components.payments.PayerData; import org.chromium.components.payments.PaymentApp; import org.chromium.components.payments.PaymentApp.InstrumentDetailsCallback; @@ -35,6 +39,7 @@ import org.chromium.payments.mojom.PaymentRequestClient; import org.chromium.payments.mojom.PaymentResponse; +import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -43,9 +48,7 @@ * ChromePaymentRequest and PaymentAppService. */ @RunWith(BaseRobolectricTestRunner.class) -@Config(manifest = Config.NONE, - shadows = {PaymentRequestIntegrationTest.ShadowErrorMessageUtil.class, - ShadowPaymentFeatureList.class}) +@Config(manifest = Config.NONE, shadows = {ShadowPaymentFeatureList.class}) public class PaymentRequestIntegrationTest { private static final String METHOD_NAME = "https://www.chromium.org"; private static final String STRINGIFIED_DETAILS = "test stringifiedDetails"; @@ -53,6 +56,12 @@ public class PaymentRequestIntegrationTest { @Rule public MockitoRule mMockitoRule = MockitoJUnit.rule().strictness(Strictness.WARN); + @Rule + public JniMocker mJniMocker = new JniMocker(); + + @Mock + private ErrorMessageUtil.Natives mErrorMessageUtilMock; + private PaymentRequestClient mClient; private PaymentAppFactoryInterface mFactory; private PaymentApp mPaymentApp; @@ -61,17 +70,16 @@ public class PaymentRequestIntegrationTest { private boolean mIsUserGesture; private boolean mWaitForUpdatedDetails; - /** The shadow of PaymentFeatureList. Not to use outside the test. */ - @Implements(ErrorMessageUtil.class) - /* package */ static class ShadowErrorMessageUtil { - @Implementation - public static String getNotSupportedErrorMessage(Set methods) { - return "(Mock) Not supported error: " + methods.toString(); - } - } - @Before public void setUp() { + mJniMocker.mock(ErrorMessageUtilJni.TEST_HOOKS, mErrorMessageUtilMock); + Mockito.doAnswer(args -> { + String[] methods = args.getArgument(0); + return "(Mock) Not supported error: " + Arrays.toString(methods); + }) + .when(mErrorMessageUtilMock) + .getNotSupportedErrorMessage(Mockito.any()); + ShadowPaymentFeatureList.setFeatureEnabled( PaymentFeatureList.WEB_PAYMENTS_SINGLE_APP_UI_SKIP, true); PaymentRequestService.resetShowingPaymentRequestForTest(); @@ -204,4 +212,4 @@ public void testCallHasNoAvailableAppsFailsPayment() { assertError("(Mock) Not supported error: [https://www.chromium.org]", PaymentErrorReason.NOT_SUPPORTED); } -} \ No newline at end of file +} diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediatorTest.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediatorTest.java similarity index 100% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediatorTest.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/handler/toolbar/PaymentHandlerToolbarMediatorTest.java diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/MockPaymentUiServiceBuilder.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/MockPaymentUiServiceBuilder.java similarity index 82% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/MockPaymentUiServiceBuilder.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/MockPaymentUiServiceBuilder.java index 24fe6533654561..ee402bc232a22f 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/MockPaymentUiServiceBuilder.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/MockPaymentUiServiceBuilder.java @@ -2,7 +2,7 @@ // 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.payments; +package org.chromium.chrome.browser.payments.test_support; import org.mockito.Mockito; @@ -16,11 +16,11 @@ public class MockPaymentUiServiceBuilder { PaymentUiService mPaymentUiService; - /* package */ static MockPaymentUiServiceBuilder defaultBuilder(PaymentApp app) { + public static MockPaymentUiServiceBuilder defaultBuilder(PaymentApp app) { return new MockPaymentUiServiceBuilder(app); } - /* package */ MockPaymentUiServiceBuilder(PaymentApp app) { + public MockPaymentUiServiceBuilder(PaymentApp app) { mPaymentUiService = Mockito.mock(PaymentUiService.class); Mockito.doReturn(null) .when(mPaymentUiService) @@ -33,7 +33,7 @@ public class MockPaymentUiServiceBuilder { Mockito.doReturn(app).when(mPaymentUiService).getSelectedPaymentApp(); } - /* package */ MockPaymentUiServiceBuilder setBuildPaymentRequestUIResult(String result) { + public MockPaymentUiServiceBuilder setBuildPaymentRequestUIResult(String result) { Mockito.doReturn(result) .when(mPaymentUiService) .buildPaymentRequestUI( @@ -41,7 +41,7 @@ public class MockPaymentUiServiceBuilder { return this; } - /* package */ PaymentUiService build() { + public PaymentUiService build() { return mPaymentUiService; } diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentRequestParamsBuilder.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/PaymentRequestParamsBuilder.java similarity index 94% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentRequestParamsBuilder.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/PaymentRequestParamsBuilder.java index 975c71fc1d389d..a0b6a3f6f88dad 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentRequestParamsBuilder.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/PaymentRequestParamsBuilder.java @@ -2,7 +2,7 @@ // 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.payments; +package org.chromium.chrome.browser.payments.test_support; import android.app.Activity; import android.content.Context; @@ -13,6 +13,8 @@ import org.mockito.Mockito; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; +import org.chromium.chrome.browser.payments.ChromePaymentRequestService; +import org.chromium.chrome.browser.payments.ChromePaymentRequestService.Delegate; import org.chromium.chrome.browser.payments.ui.PaymentUiService; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelSelector; @@ -45,9 +47,9 @@ import java.util.Map; /** The builder of the PaymentRequest parameters. */ -public class PaymentRequestParamsBuilder implements ChromePaymentRequestService.Delegate { +public class PaymentRequestParamsBuilder implements Delegate { private final PaymentRequestClient mClient; - private final ChromePaymentRequestService.Delegate mDelegate; + private final Delegate mDelegate; private final RenderFrameHost mRenderFrameHost; private final PaymentMethodData[] mMethodData; private final PaymentDetails mDetails; @@ -58,12 +60,12 @@ public class PaymentRequestParamsBuilder implements ChromePaymentRequestService. private final boolean mGoogleBridgeEligible; private final PaymentOptions mOptions; - /* package */ static PaymentRequestParamsBuilder defaultBuilder( + public static PaymentRequestParamsBuilder defaultBuilder( PaymentRequestClient client, PaymentUiService paymentUiService) { return new PaymentRequestParamsBuilder(client, paymentUiService); } - /* package */ PaymentRequestParamsBuilder( + public PaymentRequestParamsBuilder( PaymentRequestClient client, PaymentUiService paymentUiService) { mClient = client; mDelegate = this; @@ -100,7 +102,7 @@ public class PaymentRequestParamsBuilder implements ChromePaymentRequestService. mGoogleBridgeEligible = false; } - /* package */ PaymentRequest buildAndInit() { + public PaymentRequest buildAndInit() { PaymentRequest request = new MojoPaymentRequestGateKeeper( (client, onClosed) -> new PaymentRequestService(mRenderFrameHost, client, onClosed, this)); diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowPaymentFeatureList.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowPaymentFeatureList.java similarity index 95% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowPaymentFeatureList.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowPaymentFeatureList.java index 465b337283b3b4..06de326d2a7283 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowPaymentFeatureList.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowPaymentFeatureList.java @@ -2,7 +2,7 @@ // 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.payments; +package org.chromium.chrome.browser.payments.test_support; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowProfile.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowProfile.java similarity index 94% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowProfile.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowProfile.java index 9d202c88cb497f..870f4ff80a01ac 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowProfile.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowProfile.java @@ -2,7 +2,7 @@ // 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.payments; +package org.chromium.chrome.browser.payments.test_support; import androidx.annotation.Nullable; diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowWebContentsStatics.java b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowWebContentsStatics.java similarity index 95% rename from chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowWebContentsStatics.java rename to chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowWebContentsStatics.java index b21e1f3098e722..e6d2d3c45ab031 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/ShadowWebContentsStatics.java +++ b/chrome/browser/payments/android/java/src/org/chromium/chrome/browser/payments/test_support/ShadowWebContentsStatics.java @@ -2,7 +2,7 @@ // 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.payments; +package org.chromium.chrome.browser.payments.test_support; import androidx.annotation.Nullable; diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 9a7971f6f34f44..c2db8599b1c9d1 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -358,10 +358,6 @@ bool OffTheRecordProfileImpl::IsChild() const { return profile_->IsChild(); } -bool OffTheRecordProfileImpl::IsLegacySupervised() const { - return profile_->IsLegacySupervised(); -} - bool OffTheRecordProfileImpl::AllowsBrowserWindows() const { return profile_->AllowsBrowserWindows() && otr_profile_id_.AllowsBrowserWindows(); diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h index 53b369f9422343..b0d3c31ab43e82 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.h +++ b/chrome/browser/profiles/off_the_record_profile_impl.h @@ -56,7 +56,6 @@ class OffTheRecordProfileImpl : public Profile { const Profile* GetOriginalProfile() const override; bool IsSupervised() const override; bool IsChild() const override; - bool IsLegacySupervised() const override; bool AllowsBrowserWindows() const override; ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override; PrefService* GetPrefs() override; diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index 2d8d1d9adc5060..6d197f4625587a 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -285,8 +285,6 @@ class Profile : public content::BrowserContext { virtual bool IsSupervised() const = 0; // Returns whether the profile is associated with a child account. virtual bool IsChild() const = 0; - // Returns whether the profile is a legacy supervised user profile. - virtual bool IsLegacySupervised() const = 0; // Returns whether opening browser windows is allowed in this profile. For // example, browser windows are not allowed in Sign-in profile on Chrome OS. diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc index a9af2ef14b51a4..9a4c0c30192010 100644 --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc @@ -375,11 +375,6 @@ bool ProfileAttributesEntry::IsChild() const { #endif } -// TODO(crbug/1164090): Remove this function because it should always be false. -bool ProfileAttributesEntry::IsLegacySupervised() const { - return IsSupervised() && !IsChild(); -} - bool ProfileAttributesEntry::IsOmitted() const { return is_omitted_ || GetBool(kIsOmittedFromProfileListKey); } diff --git a/chrome/browser/profiles/profile_attributes_entry.h b/chrome/browser/profiles/profile_attributes_entry.h index 65887696757280..89dcaf01d0ab5d 100644 --- a/chrome/browser/profiles/profile_attributes_entry.h +++ b/chrome/browser/profiles/profile_attributes_entry.h @@ -112,8 +112,6 @@ class ProfileAttributesEntry { bool IsSupervised() const; // Returns true if the profile is signed in as a child account. bool IsChild() const; - // Returns true if the profile is a supervised user but not a child account. - bool IsLegacySupervised() const; // Returns true if the profile should not be displayed to the user in the // list of profiles. bool IsOmitted() const; diff --git a/chrome/browser/profiles/profile_attributes_storage_unittest.cc b/chrome/browser/profiles/profile_attributes_storage_unittest.cc index 652a17d5c8a0a6..5b931774eab725 100644 --- a/chrome/browser/profiles/profile_attributes_storage_unittest.cc +++ b/chrome/browser/profiles/profile_attributes_storage_unittest.cc @@ -516,14 +516,12 @@ TEST_F(ProfileAttributesStorageTest, SupervisedUsersAccessors) { entry->SetSupervisedUserId(""); ASSERT_FALSE(entry->IsSupervised()); ASSERT_FALSE(entry->IsChild()); - ASSERT_FALSE(entry->IsLegacySupervised()); EXPECT_CALL(observer(), OnProfileSupervisedUserIdChanged(path)).Times(1); entry->SetSupervisedUserId("some_supervised_user_id"); VerifyAndResetCallExpectations(); ASSERT_TRUE(entry->IsSupervised()); ASSERT_FALSE(entry->IsChild()); - ASSERT_TRUE(entry->IsLegacySupervised()); #if BUILDFLAG(ENABLE_SUPERVISED_USERS) EXPECT_CALL(observer(), OnProfileSupervisedUserIdChanged(path)).Times(1); @@ -531,7 +529,6 @@ TEST_F(ProfileAttributesStorageTest, SupervisedUsersAccessors) { VerifyAndResetCallExpectations(); ASSERT_TRUE(entry->IsSupervised()); ASSERT_TRUE(entry->IsChild()); - ASSERT_FALSE(entry->IsLegacySupervised()); #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) } diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 94f504b849afe6..ad50d16f5e70dd 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -406,11 +406,6 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, std::unique_ptr profile = base::WrapUnique(new ProfileImpl( path, delegate, create_mode, creation_time, io_task_runner)); -#if BUILDFLAG(ENABLE_SUPERVISED_USERS) && !defined(OS_ANDROID) && \ - !BUILDFLAG(IS_CHROMEOS_ASH) - if (create_mode == CREATE_MODE_SYNCHRONOUS && profile->IsLegacySupervised()) - return nullptr; -#endif return profile; } @@ -1027,10 +1022,6 @@ bool ProfileImpl::IsChild() const { #endif } -bool ProfileImpl::IsLegacySupervised() const { - return IsSupervised() && !IsChild(); -} - bool ProfileImpl::AllowsBrowserWindows() const { #if BUILDFLAG(IS_CHROMEOS_ASH) if (chromeos::ProfileHelper::IsSigninProfile(this) || diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h index b0c246a70fa06b..4ed35d94c0f0b6 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -130,7 +130,6 @@ class ProfileImpl : public Profile { const Profile* GetOriginalProfile() const override; bool IsSupervised() const override; bool IsChild() const override; - bool IsLegacySupervised() const override; bool AllowsBrowserWindows() const override; ExtensionSpecialStoragePolicy* GetExtensionSpecialStoragePolicy() override; PrefService* GetPrefs() override; diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index c003a0a078d2d7..77c9f98bd70fb5 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -1638,8 +1638,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( const base::FilePath guest_profile_path = GetGuestProfilePath(); Profile* last_used_profile = GetProfileByPath(last_used_profile_path); if (last_used_profile_path != profile_dir && - last_used_profile_path != guest_profile_path && last_used_profile && - !last_used_profile->IsLegacySupervised()) { + last_used_profile_path != guest_profile_path && last_used_profile) { FinishDeletingProfile(profile_dir, last_used_profile_path); return; } @@ -1648,9 +1647,7 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( for (Browser* browser : *BrowserList::GetInstance()) { Profile* profile = browser->profile(); base::FilePath cur_path = profile->GetPath(); - if (cur_path != profile_dir && - cur_path != guest_profile_path && - !profile->IsLegacySupervised() && + if (cur_path != profile_dir && cur_path != guest_profile_path && !IsProfileDirectoryMarkedForDeletion(cur_path)) { OnNewActiveProfileLoaded(profile_dir, cur_path, std::move(callback), profile, Profile::CREATE_STATUS_INITIALIZED); @@ -1665,19 +1662,17 @@ void ProfileManager::EnsureActiveProfileExistsBeforeDeletion( storage.GetAllProfilesAttributes(); for (ProfileAttributesEntry* entry : entries) { base::FilePath cur_path = entry->GetPath(); - // Make sure that this profile is not pending deletion, and is not - // legacy-supervised. + // Make sure that this profile is not pending deletion. if (cur_path != profile_dir && cur_path != guest_profile_path && - !entry->IsLegacySupervised() && !IsProfileDirectoryMarkedForDeletion(cur_path)) { fallback_profile_path = cur_path; break; } } - // If we're deleting the last (non-legacy-supervised) profile, then create a - // new profile in its place. Load existing profile otherwise. + // If we're deleting the last profile, then create a new profile in its place. + // Load existing profile otherwise. std::string new_avatar_url; base::string16 new_profile_name; if (fallback_profile_path.empty()) { @@ -1785,7 +1780,6 @@ base::Optional ProfileManager::FindLastActiveProfile( // Skip all profiles forbidden to rollback. base::FilePath entry_path = entry->GetPath(); if (!predicate.Run(entry) || entry_path == GetGuestProfilePath() || - entry->IsLegacySupervised() || IsProfileDirectoryMarkedForDeletion(entry_path)) continue; // Check if |entry| preferable over |found_entry|. diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles/profiles_state.cc index 96dcf65cbcea4e..90326414701837 100644 --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc @@ -270,8 +270,8 @@ bool AreAllNonChildNonSupervisedProfilesLocked() { if (entry->IsOmitted()) continue; - // Only consider non-child and non-supervised profiles. - if (!entry->IsChild() && !entry->IsLegacySupervised()) { + // Only consider non-child profiles. + if (!entry->IsChild()) { at_least_one_regular_profile_present = true; if (!entry->IsSigninRequired()) diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc index 87d8f560390fa2..8f43f97eb3acdc 100644 --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc @@ -204,12 +204,6 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( #endif #if BUILDFLAG(ENABLE_DICE_SUPPORT) - // Legacy supervised users cannot get Dice. - // TODO(droger): remove this once legacy supervised users are no longer - // supported. - if (profile->IsLegacySupervised()) - return AccountConsistencyMethod::kDisabled; - if (!profile->GetPrefs()->GetBoolean(prefs::kSigninAllowed)) { VLOG(1) << "Desktop Identity Consistency disabled as sign-in to Chrome" "is not allowed"; diff --git a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc index d81ead708b0777..1f8a36d5e3bb15 100644 --- a/chrome/browser/signin/account_consistency_mode_manager_unittest.cc +++ b/chrome/browser/signin/account_consistency_mode_manager_unittest.cc @@ -247,19 +247,6 @@ TEST(AccountConsistencyModeManagerTest, profile.get())); } } - - { - // Legacy supervised profile. - TestingProfile::Builder profile_builder; - profile_builder.SetSupervisedUserId("supervised_id"); - std::unique_ptr profile = profile_builder.Build(); - ASSERT_TRUE(profile->IsLegacySupervised()); - EXPECT_FALSE( - AccountConsistencyModeManager::IsDiceEnabledForProfile(profile.get())); - EXPECT_EQ( - signin::AccountConsistencyMethod::kDisabled, - AccountConsistencyModeManager::GetMethodForProfile(profile.get())); - } } #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc index f52d167e763fac..05d9dcd33dfccf 100644 --- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc +++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc @@ -302,8 +302,6 @@ bool ProfileSyncServiceHarness::SetupSyncImpl( const base::Optional& passphrase) { DCHECK(encryption_mode == EncryptionSetupMode::kNoEncryption || passphrase.has_value()); - DCHECK(!profile_->IsLegacySupervised()) - << "SetupSync should not be used for legacy supervised users."; if (service() == nullptr) { LOG(ERROR) << "SetupSync(): service() is null."; diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index d24185e7ec8c17..913207dadf3ba5 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -138,11 +138,6 @@ base::string16 FormatBookmarkURLForDisplay(const GURL& url) { } bool IsAppsShortcutEnabled(Profile* profile) { - // Legacy supervised users can not have apps installed currently so there's no - // need to show the apps shortcut. - if (profile->IsLegacySupervised()) - return false; - #if BUILDFLAG(IS_CHROMEOS_ASH) // Chrome OS uses the app list / app launcher. return false; diff --git a/chrome/browser/ui/webui/app_launcher_login_handler.cc b/chrome/browser/ui/webui/app_launcher_login_handler.cc index 793b178a48ffdb..2746f74c11ff70 100644 --- a/chrome/browser/ui/webui/app_launcher_login_handler.cc +++ b/chrome/browser/ui/webui/app_launcher_login_handler.cc @@ -171,7 +171,7 @@ void AppLauncherLoginHandler::UpdateLogin() { bool is_signin_allowed = profile->GetOriginalProfile()->GetPrefs()->GetBoolean( prefs::kSigninAllowed); - if (!profile->IsLegacySupervised() && is_signin_allowed) { + if (is_signin_allowed) { base::string16 signed_in_link = l10n_util::GetStringUTF16( IDS_SYNC_PROMO_NOT_SIGNED_IN_STATUS_LINK); signed_in_link = diff --git a/chrome/browser/ui/webui/settings/chromeos/os_settings_features_util.cc b/chrome/browser/ui/webui/settings/chromeos/os_settings_features_util.cc index 19fa718b1b5b3e..9190e6f6ba9930 100644 --- a/chrome/browser/ui/webui/settings/chromeos/os_settings_features_util.cc +++ b/chrome/browser/ui/webui/settings/chromeos/os_settings_features_util.cc @@ -30,10 +30,6 @@ bool ShouldShowParentalControlSettings(const Profile* profile) { if (profile->IsGuestSession()) return false; - // Settings are for Family Link, not legacy parental controls - if (profile->IsLegacySupervised()) - return false; - return profile->IsChild() || !profile->GetProfilePolicyConnector()->IsManaged(); } diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc index 1d35fbfcc55610..7cb1ec01665548 100644 --- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc @@ -221,9 +221,6 @@ void ManageProfileHandler::HandleSetProfileName(const base::ListValue* args) { CHECK(args); CHECK_EQ(1u, args->GetSize()); - if (profile_->IsLegacySupervised()) - return; - base::string16 new_profile_name; CHECK(args->GetString(0, &new_profile_name)); diff --git a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc index 3235dec0392943..f5ffb32352f856 100644 --- a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc +++ b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc @@ -211,8 +211,6 @@ void SupervisedUserInternalsMessageHandler::SendBasicInfo() { base::ListValue* section_profile = AddSection(section_list.get(), "Profile"); AddSectionEntry(section_profile, "Account", profile->GetProfileUserName()); - AddSectionEntry(section_profile, "Legacy Supervised", - profile->IsLegacySupervised()); AddSectionEntry(section_profile, "Child", profile->IsChild()); SupervisedUserURLFilter* filter = GetSupervisedUserService()->GetURLFilter(); diff --git a/chrome/browser/web_applications/external_web_app_manager_unittest.cc b/chrome/browser/web_applications/external_web_app_manager_unittest.cc index 5fc9006e9bdbed..327b9feabcb27c 100644 --- a/chrome/browser/web_applications/external_web_app_manager_unittest.cc +++ b/chrome/browser/web_applications/external_web_app_manager_unittest.cc @@ -51,7 +51,6 @@ constexpr char kAppAllUrl[] = "https://www.google.com/all"; constexpr char kAppChildUrl[] = "https://www.google.com/child"; constexpr char kAppGuestUrl[] = "https://www.google.com/guest"; constexpr char kAppManagedUrl[] = "https://www.google.com/managed"; -constexpr char kAppSupervisedUrl[] = "https://www.google.com/supervised"; constexpr char kAppUnmanagedUrl[] = "https://www.google.com/unmanaged"; #endif @@ -455,12 +454,6 @@ TEST_F(ExternalWebAppManagerTest, ManagedUser) { VerifySetOfApps(profile.get(), {GURL(kAppAllUrl), GURL(kAppManagedUrl)}); } -TEST_F(ExternalWebAppManagerTest, SupervisedUser) { - const auto profile = CreateProfileAndLogin(); - profile->SetSupervisedUserId("asdf"); - VerifySetOfApps(profile.get(), {GURL(kAppAllUrl), GURL(kAppSupervisedUrl)}); -} - TEST_F(ExternalWebAppManagerTest, UnmanagedUser) { VerifySetOfApps(CreateProfileAndLogin().get(), {GURL(kAppAllUrl), GURL(kAppUnmanagedUrl)}); diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index f758454fde8ef9..3f8ac6a4372774 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt @@ -1 +1 @@ -chrome-linux-master-1611381554-f214c2950b8eee68dd3bff58edb65779de048e39.profdata +chrome-linux-master-1611446024-056ec223c48fb829f3ac9a274b30984a276e8fbb.profdata diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index b8fc44adbd57b7..4db3d94601933c 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt @@ -1 +1 @@ -chrome-mac-master-1611402970-bd978fb47e79f80e883c9cd07eed811d74bd4efd.profdata +chrome-mac-master-1611446024-2e3de25e59114adca722b5475fe239b82836a891.profdata diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index aa14b3059ad3c7..db6b3208dc013b 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt @@ -1 +1 @@ -chrome-win32-master-1611391285-ca544b5ce47e28d760de32a62930ad61c90a7bd8.profdata +chrome-win32-master-1611434786-a323095c02c8d43b706875a2ff20feab09338979.profdata diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index e9bc61fef50549..76d957827610a4 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt @@ -1 +1 @@ -chrome-win64-master-1611391285-28ae27d426765f23e96edc44c419c893d4401e03.profdata +chrome-win64-master-1611434786-269f26457445924c4e6bde9294fc163aa855f48d.profdata diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 0ffe2a423598b4..b5dcfa93fadd12 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -704,10 +704,6 @@ bool TestingProfile::IsChild() const { #endif } -bool TestingProfile::IsLegacySupervised() const { - return IsSupervised() && !IsChild(); -} - bool TestingProfile::AllowsBrowserWindows() const { return allows_browser_windows_; } diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h index 52f3c4ac1c9466..0751c92497e44a 100644 --- a/chrome/test/base/testing_profile.h +++ b/chrome/test/base/testing_profile.h @@ -336,7 +336,6 @@ class TestingProfile : public Profile { const Profile* GetOriginalProfile() const override; bool IsSupervised() const override; bool IsChild() const override; - bool IsLegacySupervised() const override; bool AllowsBrowserWindows() const override; #if BUILDFLAG(ENABLE_EXTENSIONS) void SetExtensionSpecialStoragePolicy( diff --git a/chromeos/services/assistant/BUILD.gn b/chromeos/services/assistant/BUILD.gn index de55d52c5a5fe0..e7f618f6189a13 100644 --- a/chromeos/services/assistant/BUILD.gn +++ b/chromeos/services/assistant/BUILD.gn @@ -28,6 +28,10 @@ component("lib") { "fake_assistant_settings_impl.h", "platform/audio_devices.cc", "platform/audio_devices.h", + "platform/audio_input_host_impl.cc", + "platform/audio_input_host_impl.h", + "platform/audio_stream_factory_delegate.cc", + "platform/audio_stream_factory_delegate.h", "service.cc", "service.h", "service_context.h", @@ -41,7 +45,9 @@ component("lib") { "//chromeos/dbus", "//chromeos/dbus/power", "//chromeos/dbus/power:power_manager_proto", + "//chromeos/services/assistant/proxy:audio_input_bindings", "//chromeos/services/assistant/public/proto", + "//chromeos/services/libassistant/public/mojom", "//components/account_id", "//components/prefs", "//components/signin/public/identity_manager", @@ -77,8 +83,6 @@ component("lib") { "media_session/assistant_media_session.h", "platform/audio_device_owner.cc", "platform/audio_device_owner.h", - "platform/audio_input_host_impl.cc", - "platform/audio_input_host_impl.h", "platform/audio_input_impl.cc", "platform/audio_input_impl.h", "platform/audio_input_provider_impl.cc", @@ -89,8 +93,6 @@ component("lib") { "platform/audio_output_provider_impl.h", "platform/audio_stream.cc", "platform/audio_stream.h", - "platform/audio_stream_factory_delegate.cc", - "platform/audio_stream_factory_delegate.h", "platform/audio_stream_handler.cc", "platform/audio_stream_handler.h", "platform/file_provider_impl.cc", @@ -156,8 +158,11 @@ source_set("tests") { "//chromeos/dbus:test_support", "//chromeos/dbus/audio", "//chromeos/dbus/power", + "//chromeos/services/assistant/proxy", + "//chromeos/services/assistant/proxy:audio_input_bindings", "//chromeos/services/assistant/public/cpp", "//chromeos/services/assistant/public/mojom", + "//chromeos/services/libassistant/public/mojom", "//components/prefs:test_support", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager:test_support", @@ -171,6 +176,7 @@ source_set("tests") { sources = [ "platform/audio_devices_unittest.cc", + "platform/audio_input_host_unittest.cc", "service_unittest.cc", "test_support/fully_initialized_assistant_state.cc", "test_support/fully_initialized_assistant_state.h", @@ -185,7 +191,6 @@ source_set("tests") { "assistant_device_settings_delegate_unittest.cc", "assistant_manager_service_impl_unittest.cc", "media_session/assistant_media_session_unittest.cc", - "platform/audio_input_impl_unittest.cc", "platform/audio_output_provider_impl_unittest.cc", "platform/network_provider_impl_unittest.cc", "platform/power_manager_provider_impl_unittest.cc", @@ -228,6 +233,7 @@ static_library("test_support") { ] deps = [ "//base", + "//chromeos/services/assistant/proxy:audio_input_bindings", "//chromeos/services/assistant/public/cpp", "//chromeos/services/assistant/public/mojom", "//chromeos/services/assistant/public/shared", diff --git a/chromeos/services/assistant/assistant_manager_service_delegate_impl.cc b/chromeos/services/assistant/assistant_manager_service_delegate_impl.cc index 6f6a5ec8e83917..0b0b23a48d0fee 100644 --- a/chromeos/services/assistant/assistant_manager_service_delegate_impl.cc +++ b/chromeos/services/assistant/assistant_manager_service_delegate_impl.cc @@ -11,6 +11,7 @@ #include "ash/public/cpp/assistant/assistant_state_base.h" #include "chromeos/services/assistant/platform/audio_input_host_impl.h" #include "chromeos/services/assistant/platform_api_impl.h" +#include "chromeos/services/assistant/proxy/assistant_proxy.h" #include "chromeos/services/assistant/service_context.h" #include "libassistant/shared/internal_api/assistant_manager_internal.h" #include "libassistant/shared/public/assistant_manager.h" @@ -27,9 +28,11 @@ AssistantManagerServiceDelegateImpl::~AssistantManagerServiceDelegateImpl() = default; std::unique_ptr -AssistantManagerServiceDelegateImpl::CreateAudioInputHost() { +AssistantManagerServiceDelegateImpl::CreateAudioInputHost( + AudioInputBindings bindings) { return std::make_unique( - context_->cras_audio_handler(), context_->power_manager_client(), + std::move(bindings), context_->cras_audio_handler(), + context_->power_manager_client(), context_->assistant_state()->locale().value()); } diff --git a/chromeos/services/assistant/assistant_manager_service_delegate_impl.h b/chromeos/services/assistant/assistant_manager_service_delegate_impl.h index 8283643798fd7a..21d6b6ccd4603c 100644 --- a/chromeos/services/assistant/assistant_manager_service_delegate_impl.h +++ b/chromeos/services/assistant/assistant_manager_service_delegate_impl.h @@ -26,7 +26,8 @@ class AssistantManagerServiceDelegateImpl ~AssistantManagerServiceDelegateImpl() override; // AssistantManagerServiceDelegate implementation: - std::unique_ptr CreateAudioInputHost() override; + std::unique_ptr CreateAudioInputHost( + AudioInputBindings bindings) override; std::unique_ptr CreatePlatformApi( AssistantMediaSession* media_session, scoped_refptr background_thread_task_runner) diff --git a/chromeos/services/assistant/assistant_manager_service_impl.cc b/chromeos/services/assistant/assistant_manager_service_impl.cc index 07fc4e1cc28e7f..058dec0a283ace 100644 --- a/chromeos/services/assistant/assistant_manager_service_impl.cc +++ b/chromeos/services/assistant/assistant_manager_service_impl.cc @@ -258,9 +258,8 @@ AssistantManagerServiceImpl::AssistantManagerServiceImpl( assistant_proxy_->AddSpeechRecognitionObserver( speech_recognition_observer_->BindNewPipeAndPassRemote()); - audio_input_host_ = delegate_->CreateAudioInputHost(); - - platform_api_->InitializeAudioInputHost(*audio_input_host_); + audio_input_host_ = delegate_->CreateAudioInputHost( + assistant_proxy_->ExtractAudioInputBindings()); settings_delegate_ = std::make_unique(context); diff --git a/chromeos/services/assistant/platform/audio_input_host_impl.cc b/chromeos/services/assistant/platform/audio_input_host_impl.cc index 4f6dcd6e60787e..8fd8d153c78ba1 100644 --- a/chromeos/services/assistant/platform/audio_input_host_impl.cc +++ b/chromeos/services/assistant/platform/audio_input_host_impl.cc @@ -7,7 +7,8 @@ #include "base/check.h" #include "base/optional.h" #include "chromeos/services/assistant/platform/audio_devices.h" -#include "chromeos/services/assistant/platform/audio_input_impl.h" +#include "chromeos/services/assistant/proxy/audio_input_bindings.h" +#include "chromeos/services/assistant/public/cpp/assistant_client.h" #include "chromeos/services/assistant/public/cpp/features.h" namespace chromeos { @@ -15,36 +16,64 @@ namespace assistant { namespace { -AudioInputImpl::LidState ConvertLidState( - chromeos::PowerManagerClient::LidState state) { +using MojomLidState = chromeos::libassistant::mojom::LidState; + +MojomLidState ConvertLidState(chromeos::PowerManagerClient::LidState state) { switch (state) { case chromeos::PowerManagerClient::LidState::CLOSED: - return AudioInputImpl::LidState::kClosed; + return MojomLidState::kClosed; case chromeos::PowerManagerClient::LidState::OPEN: - return AudioInputImpl::LidState::kOpen; + return MojomLidState::kOpen; case chromeos::PowerManagerClient::LidState::NOT_PRESENT: // If there is no lid, it can't be closed. - return AudioInputImpl::LidState::kOpen; + return MojomLidState::kOpen; } } } // namespace +// Delegate that will fetch an audio stream factory from the |AssistantClient|. +class AudioStreamFactoryDelegateImpl + : public chromeos::libassistant::mojom::AudioStreamFactoryDelegate { + public: + explicit AudioStreamFactoryDelegateImpl( + mojo::PendingReceiver< + chromeos::libassistant::mojom::AudioStreamFactoryDelegate> + pending_receiver) + : receiver_(this, std::move(pending_receiver)) {} + + AudioStreamFactoryDelegateImpl(const AudioStreamFactoryDelegateImpl&) = + delete; + AudioStreamFactoryDelegateImpl& operator=( + const AudioStreamFactoryDelegateImpl&) = delete; + ~AudioStreamFactoryDelegateImpl() override = default; + + void GetAudioStreamFactory(GetAudioStreamFactoryCallback callback) override { + mojo::PendingRemote result; + AssistantClient::Get()->RequestAudioStreamFactory( + result.InitWithNewPipeAndPassReceiver()); + std::move(callback).Run(std::move(result)); + } + + private: + mojo::Receiver + receiver_; +}; + chromeos::assistant::AudioInputHostImpl::AudioInputHostImpl( + AudioInputBindings bindings, CrasAudioHandler* cras_audio_handler, chromeos::PowerManagerClient* power_manager_client, const std::string& locale) - : power_manager_client_(power_manager_client), + : remote_(std::move(bindings.pending_audio_input_controller_remote)), + power_manager_client_(power_manager_client), power_manager_client_observer_(this), - audio_devices_(cras_audio_handler, locale) { + audio_devices_(cras_audio_handler, locale), + audio_stream_factory_delegate_( + std::make_unique(std::move( + bindings.pending_audio_stream_factory_delegate_receiver))) { DCHECK(power_manager_client_); -} -AudioInputHostImpl::~AudioInputHostImpl() = default; - -void AudioInputHostImpl::Initialize(AudioInputImpl* audio_input) { - DCHECK(audio_input); - audio_input_ = audio_input; audio_devices_observation_.Observe(&audio_devices_); power_manager_client_observer_.Observe(power_manager_client_); power_manager_client_->GetSwitchStates( @@ -52,17 +81,19 @@ void AudioInputHostImpl::Initialize(AudioInputImpl* audio_input) { weak_factory_.GetWeakPtr())); } +AudioInputHostImpl::~AudioInputHostImpl() = default; + void AudioInputHostImpl::SetMicState(bool mic_open) { - audio_input_->SetMicState(mic_open); + remote_->SetMicOpen(mic_open); } void AudioInputHostImpl::SetDeviceId( const base::Optional& device_id) { - audio_input_->SetDeviceId(device_id.value_or("")); + remote_->SetDeviceId(device_id); } void AudioInputHostImpl::OnConversationTurnStarted() { - audio_input_->OnConversationTurnStarted(); + remote_->OnConversationTurnStarted(); // Inform power manager of a wake notification when Libassistant // recognized hotword and started a conversation. We intentionally // avoid using |NotifyUserActivity| because it is not suitable for @@ -71,16 +102,16 @@ void AudioInputHostImpl::OnConversationTurnStarted() { } void AudioInputHostImpl::OnConversationTurnFinished() { - audio_input_->OnConversationTurnFinished(); + remote_->OnConversationTurnFinished(); } void AudioInputHostImpl::OnHotwordEnabled(bool enable) { - audio_input_->OnHotwordEnabled(enable); + remote_->SetHotwordEnabled(enable); } void AudioInputHostImpl::SetHotwordDeviceId( const base::Optional& device_id) { - audio_input_->SetHotwordDeviceId(device_id.value_or("")); + remote_->SetHotwordDeviceId(device_id); } void AudioInputHostImpl::LidEventReceived( @@ -89,13 +120,13 @@ void AudioInputHostImpl::LidEventReceived( // Lid switch event still gets fired during system suspend, which enables // us to stop DSP recording correctly when user closes lid after the device // goes to sleep. - audio_input_->OnLidStateChanged(ConvertLidState(state)); + remote_->SetLidState(ConvertLidState(state)); } void AudioInputHostImpl::OnInitialLidStateReceived( base::Optional switch_states) { if (switch_states.has_value()) - audio_input_->OnLidStateChanged(ConvertLidState(switch_states->lid_state)); + remote_->SetLidState(ConvertLidState(switch_states->lid_state)); } } // namespace assistant diff --git a/chromeos/services/assistant/platform/audio_input_host_impl.h b/chromeos/services/assistant/platform/audio_input_host_impl.h index fc3583a84d9e03..062bad97547b24 100644 --- a/chromeos/services/assistant/platform/audio_input_host_impl.h +++ b/chromeos/services/assistant/platform/audio_input_host_impl.h @@ -16,24 +16,31 @@ #include "base/time/time.h" #include "chromeos/dbus/power/power_manager_client.h" #include "chromeos/services/assistant/platform/audio_devices.h" +#include "chromeos/services/libassistant/public/mojom/audio_input_controller.mojom.h" +#include "mojo/public/cpp/bindings/remote.h" namespace chromeos { namespace assistant { +class AudioStreamFactoryDelegateImpl; +struct AudioInputBindings; + +// Class that provides the bridge between the ChromeOS Browser thread and the +// Libassistant audio input mojom service. class COMPONENT_EXPORT(ASSISTANT_SERVICE) AudioInputHostImpl : public AudioInputHost, private chromeos::PowerManagerClient::Observer, private AudioDevices::Observer { public: - AudioInputHostImpl(CrasAudioHandler* cras_audio_handler, + AudioInputHostImpl(AudioInputBindings bindings, + CrasAudioHandler* cras_audio_handler, chromeos::PowerManagerClient* power_manager_client, const std::string& locale); - AudioInputHostImpl(const AudioInputHostImpl&) = delete; + AudioInputHostImpl(const AudioInputHost&) = delete; AudioInputHostImpl& operator=(const AudioInputHostImpl&) = delete; ~AudioInputHostImpl() override; // AudioInputHost implementation: - void Initialize(AudioInputImpl* audio_input) override; void SetMicState(bool mic_open) override; void OnHotwordEnabled(bool enable) override; void OnConversationTurnStarted() override; @@ -52,8 +59,7 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AudioInputHostImpl void OnInitialLidStateReceived( base::Optional switch_states); - // Owned by |PlatformApiImpl| which also owns |this|. - AudioInputImpl* audio_input_ = nullptr; + mojo::Remote remote_; chromeos::PowerManagerClient* const power_manager_client_; base::ScopedObservation @@ -64,6 +70,9 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE) AudioInputHostImpl AudioDevices audio_devices_; AudioDevices::ScopedObservation audio_devices_observation_{this}; + std::unique_ptr + audio_stream_factory_delegate_; + base::WeakPtrFactory weak_factory_{this}; }; diff --git a/chromeos/services/assistant/platform/audio_input_host_unittest.cc b/chromeos/services/assistant/platform/audio_input_host_unittest.cc new file mode 100644 index 00000000000000..db1098c02b56e0 --- /dev/null +++ b/chromeos/services/assistant/platform/audio_input_host_unittest.cc @@ -0,0 +1,313 @@ +// Copyright 2020 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 "chromeos/services/assistant/platform/audio_input_host_impl.h" + +#include "base/optional.h" +#include "base/run_loop.h" +#include "base/test/mock_callback.h" +#include "base/test/scoped_feature_list.h" +#include "base/test/task_environment.h" +#include "chromeos/audio/cras_audio_handler.h" +#include "chromeos/dbus/power/fake_power_manager_client.h" +#include "chromeos/services/assistant/proxy/audio_input_bindings.h" +#include "chromeos/services/assistant/public/cpp/features.h" +#include "chromeos/services/assistant/test_support/scoped_assistant_client.h" +#include "chromeos/services/libassistant/public/mojom/audio_input_controller.mojom.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace chromeos { +namespace assistant { + +namespace { + +using LidState = chromeos::PowerManagerClient::LidState; +using MojomLidState = chromeos::libassistant::mojom::LidState; +using MojomAudioInputController = + chromeos::libassistant::mojom::AudioInputController; +using MojomAudioStreamFactoryDelegate = + chromeos::libassistant::mojom::AudioStreamFactoryDelegate; +using ::testing::_; +using ::testing::NiceMock; + +class ScopedFakeAssistantClient : public ScopedAssistantClient { + public: + ScopedFakeAssistantClient() = default; + ~ScopedFakeAssistantClient() override = default; + + // ScopedAssistantClient overrides: + void RequestAudioStreamFactory( + mojo::PendingReceiver receiver) override {} + + private: + DISALLOW_COPY_AND_ASSIGN(ScopedFakeAssistantClient); +}; + +class AudioInputControllerMock : public MojomAudioInputController { + public: + AudioInputControllerMock() = default; + AudioInputControllerMock(const AudioInputControllerMock&) = delete; + AudioInputControllerMock& operator=(const AudioInputControllerMock&) = delete; + ~AudioInputControllerMock() override = default; + + mojo::PendingRemote BindNewPipeAndPassRemote() { + receiver_.reset(); + return receiver_.BindNewPipeAndPassRemote(); + } + + MOCK_METHOD(void, SetMicOpen, (bool mic_open)); + MOCK_METHOD(void, SetHotwordEnabled, (bool enable)); + MOCK_METHOD(void, + SetDeviceId, + (const base::Optional& device_id)); + MOCK_METHOD(void, + SetHotwordDeviceId, + (const base::Optional& device_id)); + MOCK_METHOD(void, + SetLidState, + (chromeos::libassistant::mojom::LidState new_state)); + MOCK_METHOD(void, OnConversationTurnStarted, ()); + MOCK_METHOD(void, OnConversationTurnFinished, ()); + + private: + mojo::Receiver receiver_{this}; +}; + +class ScopedCrasAudioHandler { + public: + ScopedCrasAudioHandler() { CrasAudioHandler::InitializeForTesting(); } + ScopedCrasAudioHandler(const ScopedCrasAudioHandler&) = delete; + ScopedCrasAudioHandler& operator=(const ScopedCrasAudioHandler&) = delete; + ~ScopedCrasAudioHandler() { CrasAudioHandler::Shutdown(); } + + CrasAudioHandler* Get() { return CrasAudioHandler::Get(); } +}; + +class AssistantAudioInputHostTest : public testing::Test { + public: + AssistantAudioInputHostTest() { PowerManagerClient::InitializeFake(); } + + AssistantAudioInputHostTest(const AssistantAudioInputHostTest&) = delete; + AssistantAudioInputHostTest& operator=(const AssistantAudioInputHostTest&) = + delete; + ~AssistantAudioInputHostTest() override { + // |audio_input_host_| uses the fake power manager client, so must be + // destroyed before the power manager client. + audio_input_host_.reset(); + chromeos::PowerManagerClient::Shutdown(); + } + + void SetUp() override { + // Enable DSP Hotword + scoped_feature_list_.InitAndEnableFeature(features::kEnableDspHotword); + + CreateNewAudioInputHost(); + } + + AudioInputControllerMock& mojom_audio_input_controller() { + return audio_input_controller_; + } + + mojo::Remote& + audio_stream_factory_delegate() { + return audio_stream_factory_delegate_; + } + + AudioInputHostImpl& audio_input_host() { + CHECK(audio_input_host_); + return *audio_input_host_; + } + + void CreateNewAudioInputHost() { + audio_stream_factory_delegate_.reset(); + auto bindings = AudioInputBindings( + audio_input_controller_.BindNewPipeAndPassRemote(), + audio_stream_factory_delegate_.BindNewPipeAndPassReceiver()); + + audio_input_host_ = std::make_unique( + std::move(bindings), cras_audio_handler_.Get(), + FakePowerManagerClient::Get(), "default-locale"); + + FlushPendingMojomCalls(); + } + + void DestroyAudioInputHost() { audio_input_host_ = nullptr; } + + void ReportLidEvent(LidState state) { + FakePowerManagerClient::Get()->SetLidState(state, + base::TimeTicks::UnixEpoch()); + FlushPendingMojomCalls(); + } + + void SetLidState(LidState state) { ReportLidEvent(state); } + + void SetDeviceId(const base::Optional& device_id) { + audio_input_host().SetDeviceId(device_id); + FlushPendingMojomCalls(); + } + + void SetHotwordDeviceId(const base::Optional& device_id) { + audio_input_host().SetHotwordDeviceId(device_id); + FlushPendingMojomCalls(); + } + + void OnHotwordEnabled(bool enabled) { + audio_input_host().OnHotwordEnabled(enabled); + FlushPendingMojomCalls(); + } + + void SetMicState(bool mic_open) { + audio_input_host().SetMicState(mic_open); + FlushPendingMojomCalls(); + } + + void OnConversationTurnStarted() { + audio_input_host().OnConversationTurnStarted(); + FlushPendingMojomCalls(); + } + + void OnConversationTurnFinished() { + audio_input_host().OnConversationTurnFinished(); + FlushPendingMojomCalls(); + } + + void FlushPendingMojomCalls() { base::RunLoop().RunUntilIdle(); } + + private: + base::test::TaskEnvironment task_environment_; + base::test::ScopedFeatureList scoped_feature_list_; + ScopedFakeAssistantClient assistant_client_; + ScopedCrasAudioHandler cras_audio_handler_; + NiceMock audio_input_controller_; + mojo::Remote audio_stream_factory_delegate_; + std::unique_ptr audio_input_host_; +}; + +} // namespace + +TEST_F(AssistantAudioInputHostTest, ShouldSendLidOpenEventsToMojom) { + EXPECT_CALL(mojom_audio_input_controller(), + SetLidState(MojomLidState::kOpen)); + ReportLidEvent(LidState::OPEN); +} + +TEST_F(AssistantAudioInputHostTest, ShouldSendLidClosedEventsToMojom) { + EXPECT_CALL(mojom_audio_input_controller(), + SetLidState(MojomLidState::kClosed)); + ReportLidEvent(LidState::CLOSED); +} + +TEST_F(AssistantAudioInputHostTest, ShouldSendLidNotPresentEventsToMojom) { + // If there is no lid it can not be closed by the user so we consider it to be + // open. + EXPECT_CALL(mojom_audio_input_controller(), + SetLidState(MojomLidState::kOpen)); + ReportLidEvent(LidState::NOT_PRESENT); +} + +TEST_F(AssistantAudioInputHostTest, ShouldReadCurrentLidStateWhenLaunching) { + DestroyAudioInputHost(); + SetLidState(LidState::OPEN); + EXPECT_CALL(mojom_audio_input_controller(), + SetLidState(MojomLidState::kOpen)); + CreateNewAudioInputHost(); + + DestroyAudioInputHost(); + SetLidState(LidState::CLOSED); + EXPECT_CALL(mojom_audio_input_controller(), + SetLidState(MojomLidState::kClosed)); + CreateNewAudioInputHost(); +} + +TEST_F(AssistantAudioInputHostTest, ShouldSendDeviceIdToMojom) { + EXPECT_CALL(mojom_audio_input_controller(), + SetDeviceId(base::Optional("device-id"))); + SetDeviceId("device-id"); +} + +TEST_F(AssistantAudioInputHostTest, ShouldUnsetDeviceIdWhenItsEmpty) { + // Note this variable is required as directly passing base::nullopt into the + // EXPECT_CALL doesn't compile. + const base::Optional expected = base::nullopt; + EXPECT_CALL(mojom_audio_input_controller(), SetDeviceId(expected)); + + SetDeviceId(base::nullopt); +} + +TEST_F(AssistantAudioInputHostTest, ShouldSendHotwordDeviceIdToMojom) { + EXPECT_CALL( + mojom_audio_input_controller(), + SetHotwordDeviceId(base::Optional("hotword-device-id"))); + SetHotwordDeviceId("hotword-device-id"); +} + +TEST_F(AssistantAudioInputHostTest, ShouldUnsetHotwordDeviceIdWhenItsEmpty) { + // Note this variable is required as directly passing base::nullopt into the + // EXPECT_CALL doesn't compile. + const base::Optional expected = base::nullopt; + EXPECT_CALL(mojom_audio_input_controller(), SetHotwordDeviceId(expected)); + + SetHotwordDeviceId(base::nullopt); +} +TEST_F(AssistantAudioInputHostTest, ShouldSendHotwordEnabledToMojom) { + EXPECT_CALL(mojom_audio_input_controller(), SetHotwordEnabled(true)); + OnHotwordEnabled(true); + + EXPECT_CALL(mojom_audio_input_controller(), SetHotwordEnabled(false)); + OnHotwordEnabled(false); +} + +TEST_F(AssistantAudioInputHostTest, ShouldSendMicOpenToMojom) { + EXPECT_CALL(mojom_audio_input_controller(), SetMicOpen(true)); + SetMicState(/*mic_open=*/true); + + EXPECT_CALL(mojom_audio_input_controller(), SetMicOpen(false)); + SetMicState(/*mic_open=*/false); +} + +TEST_F(AssistantAudioInputHostTest, + ShouldSendOnConversationTurnStartedToMojom) { + EXPECT_CALL(mojom_audio_input_controller(), OnConversationTurnStarted); + OnConversationTurnStarted(); +} + +TEST_F(AssistantAudioInputHostTest, + ShouldSendOnConversationTurnFinishedToMojom) { + EXPECT_CALL(mojom_audio_input_controller(), OnConversationTurnFinished); + OnConversationTurnFinished(); +} + +TEST_F(AssistantAudioInputHostTest, + ShouldSendAudioStreamFactoryFromAssistantClientToCallbackWhenRequested) { + auto& delegate = audio_stream_factory_delegate(); + ASSERT_TRUE(delegate.is_bound()) << "Initialize() was not called"; + + base::MockCallback< + MojomAudioStreamFactoryDelegate::GetAudioStreamFactoryCallback> + callback; + + EXPECT_CALL(callback, Run(_)); + + delegate->GetAudioStreamFactory(callback.Get()); + FlushPendingMojomCalls(); +} + +TEST_F( + AssistantAudioInputHostTest, + ShouldNotCrashWhenRequestingAudioStreamFactoryAfterAudioInputHostIsGone) { + auto& delegate = audio_stream_factory_delegate(); + ASSERT_TRUE(delegate.is_bound()) << "Initialize() was not called"; + + DestroyAudioInputHost(); + + base::MockCallback< + MojomAudioStreamFactoryDelegate::GetAudioStreamFactoryCallback> + callback; + delegate->GetAudioStreamFactory(callback.Get()); + FlushPendingMojomCalls(); +} + +} // namespace assistant +} // namespace chromeos diff --git a/chromeos/services/assistant/platform/audio_input_impl_unittest.cc b/chromeos/services/assistant/platform/audio_input_impl_unittest.cc deleted file mode 100644 index 28b6d5ffb21eb2..00000000000000 --- a/chromeos/services/assistant/platform/audio_input_impl_unittest.cc +++ /dev/null @@ -1,281 +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 "chromeos/services/assistant/platform/audio_input_impl.h" - -#include -#include - -#include "base/macros.h" -#include "base/test/scoped_feature_list.h" -#include "base/test/task_environment.h" -#include "chromeos/audio/cras_audio_handler.h" -#include "chromeos/dbus/power/fake_power_manager_client.h" -#include "chromeos/services/assistant/platform/audio_input_host_impl.h" -#include "chromeos/services/assistant/platform/audio_stream_factory_delegate.h" -#include "chromeos/services/assistant/public/cpp/features.h" -#include "chromeos/services/assistant/test_support/scoped_assistant_client.h" -#include "media/audio/audio_device_description.h" -#include "services/audio/public/cpp/fake_stream_factory.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" - -namespace chromeos { -namespace assistant { - -namespace { - -using LidState = chromeos::PowerManagerClient::LidState; -using ::testing::_; - -class ScopedFakeAssistantClient : public ScopedAssistantClient { - public: - ScopedFakeAssistantClient() = default; - ~ScopedFakeAssistantClient() override = default; - - // ScopedAssistantClient overrides: - void RequestAudioStreamFactory( - mojo::PendingReceiver receiver) override { - if (!fake_stream_factory_.receiver_.is_bound()) - fake_stream_factory_.receiver_.Bind(std::move(receiver)); - } - - private: - audio::FakeStreamFactory fake_stream_factory_; - - DISALLOW_COPY_AND_ASSIGN(ScopedFakeAssistantClient); -}; - -class ScopedCrasAudioHandler { - public: - ScopedCrasAudioHandler() { CrasAudioHandler::InitializeForTesting(); } - ScopedCrasAudioHandler(const ScopedCrasAudioHandler&) = delete; - ScopedCrasAudioHandler& operator=(const ScopedCrasAudioHandler&) = delete; - ~ScopedCrasAudioHandler() { CrasAudioHandler::Shutdown(); } - - CrasAudioHandler* Get() { return CrasAudioHandler::Get(); } -}; - -} // namespace - -class AudioInputImplTest : public testing::Test, - public assistant_client::AudioInput::Observer { - public: - AudioInputImplTest() { - // Enable DSP feature flag. - scoped_feature_list_.InitAndEnableFeature(features::kEnableDspHotword); - - PowerManagerClient::InitializeFake(); - - CreateNewAudioInputImpl(); - } - - ~AudioInputImplTest() override { - audio_input_impl_->RemoveObserver(this); - audio_input_impl_.reset(); - // |audio_input_host_| uses the fake power manager client, so must be - // destroyed before the power manager client. - audio_input_host_.reset(); - chromeos::PowerManagerClient::Shutdown(); - } - - bool GetRecordingStatus() const { - return audio_input_impl_->IsRecordingForTesting(); - } - - std::string GetOpenDeviceId() const { - return audio_input_impl_->GetOpenDeviceIdForTesting().value_or(""); - } - - bool IsUsingDeadStreamDetection() const { - return audio_input_impl_->IsUsingDeadStreamDetectionForTesting().value_or( - false); - } - - bool IsUsingHotwordDevice() const { - return audio_input_impl_->IsUsingHotwordDeviceForTesting(); - } - - void CreateNewAudioInputImpl() { - audio_input_impl_ = std::make_unique( - &audio_stream_factory_delegate_, "fake-device-id"); - - audio_input_host_ = std::make_unique( - cras_audio_handler_.Get(), FakePowerManagerClient::Get(), - "initial-locale"); - audio_input_host_->Initialize(audio_input_impl_.get()); - audio_input_host_->SetDeviceId("initial-device-id"); - - audio_input_impl_->AddObserver(this); - - // Allow the asynchronous triggered events to run. - base::RunLoop().RunUntilIdle(); - } - - void StopAudioRecording() { - SetLidState(LidState::CLOSED); - // Allow the asynchronous triggered events to run. - base::RunLoop().RunUntilIdle(); - } - - AudioInputImpl* audio_input_impl() { return audio_input_impl_.get(); } - - AudioInputHost& audio_input_host() { return *audio_input_host_; } - - // assistant_client::AudioInput::Observer overrides: - void OnAudioBufferAvailable(const assistant_client::AudioBuffer& buffer, - int64_t timestamp) override {} - void OnAudioError(assistant_client::AudioInput::Error error) override {} - void OnAudioStopped() override {} - - protected: - void ReportLidEvent(LidState state) { - FakePowerManagerClient::Get()->SetLidState(state, - base::TimeTicks::UnixEpoch()); - } - - void SetLidState(LidState state) { ReportLidEvent(state); } - - void StartAudioRecording() { - // We are guaranteed to start audio recording if the following conditions - // are all met. - SetLidState(LidState::OPEN); - audio_input_impl()->SetMicState(/*mic_open=*/true); - audio_input_impl_->AddObserver(this); - EXPECT_TRUE(GetRecordingStatus()); - } - - private: - base::test::TaskEnvironment task_environment_; - base::test::ScopedFeatureList scoped_feature_list_; - ScopedFakeAssistantClient fake_assistant_client_; - DefaultAudioStreamFactoryDelegate audio_stream_factory_delegate_; - ScopedCrasAudioHandler cras_audio_handler_; - std::unique_ptr audio_input_impl_; - std::unique_ptr audio_input_host_; - - DISALLOW_COPY_AND_ASSIGN(AudioInputImplTest); -}; - -TEST_F(AudioInputImplTest, StopRecordingWhenLidClosed) { - // Trigger a lid open event. - ReportLidEvent(LidState::OPEN); - EXPECT_TRUE(GetRecordingStatus()); - - // Trigger a lid closed event. - ReportLidEvent(LidState::CLOSED); - EXPECT_FALSE(GetRecordingStatus()); - - // Trigger a lid open event again. - ReportLidEvent(LidState::OPEN); - EXPECT_TRUE(GetRecordingStatus()); -} - -TEST_F(AudioInputImplTest, StartRecordingWhenThereIsNoLid) { - ReportLidEvent(LidState::NOT_PRESENT); - EXPECT_TRUE(GetRecordingStatus()); -} - -TEST_F(AudioInputImplTest, StopRecordingWithNoPreferredDevice) { - // Start as recording. - ReportLidEvent(LidState::OPEN); - EXPECT_TRUE(GetRecordingStatus()); - - // Preferred input device is lost. - audio_input_impl()->SetDeviceId(std::string()); - EXPECT_FALSE(GetRecordingStatus()); - - // Preferred input device is set again. - audio_input_impl()->SetDeviceId("fake-device_id"); - EXPECT_TRUE(GetRecordingStatus()); -} - -TEST_F(AudioInputImplTest, StopRecordingWhenDisableHotword) { - // Start as recording. - ReportLidEvent(LidState::OPEN); - EXPECT_TRUE(GetRecordingStatus()); - - // Hotword disabled should stop recording. - audio_input_impl()->OnHotwordEnabled(false); - EXPECT_FALSE(GetRecordingStatus()); - - // Hotword enabled again should start recording. - audio_input_impl()->OnHotwordEnabled(true); - EXPECT_TRUE(GetRecordingStatus()); -} - -TEST_F(AudioInputImplTest, StartRecordingWhenDisableHotwordAndForceOpenMic) { - // Start as recording. - ReportLidEvent(LidState::OPEN); - EXPECT_TRUE(GetRecordingStatus()); - - // Hotword disabled should stop recording. - audio_input_impl()->OnHotwordEnabled(false); - EXPECT_FALSE(GetRecordingStatus()); - - // Force open mic should start recording. - audio_input_impl()->SetMicState(true); - EXPECT_TRUE(GetRecordingStatus()); - - // Stop force open mic should stop recording. - audio_input_impl()->SetMicState(false); - EXPECT_FALSE(GetRecordingStatus()); -} - -TEST_F(AudioInputImplTest, ShouldReadCurrentLidStateWhenLaunching) { - SetLidState(LidState::OPEN); - CreateNewAudioInputImpl(); - EXPECT_TRUE(GetRecordingStatus()); - - SetLidState(LidState::CLOSED); - CreateNewAudioInputImpl(); - EXPECT_FALSE(GetRecordingStatus()); -} - -TEST_F(AudioInputImplTest, ShouldUseDefaultDeviceIdIfNoDeviceIdIsSet) { - audio_input_impl()->SetDeviceId(std::string()); - audio_input_impl()->SetHotwordDeviceId(std::string()); - - StartAudioRecording(); - - EXPECT_EQ(media::AudioDeviceDescription::kDefaultDeviceId, GetOpenDeviceId()); -} - -TEST_F(AudioInputImplTest, SettingHotwordDeviceDoesNotAffectRecordingState) { - StartAudioRecording(); - - // Hotword device does not change recording state. - audio_input_impl()->SetHotwordDeviceId(std::string()); - EXPECT_TRUE(GetRecordingStatus()); - - audio_input_impl()->SetHotwordDeviceId("fake-hotword-device"); - EXPECT_TRUE(GetRecordingStatus()); -} - -TEST_F(AudioInputImplTest, SettingHotwordDeviceUsesHotwordDeviceForRecording) { - StartAudioRecording(); - - // Hotword device does not change recording state. - audio_input_impl()->SetHotwordDeviceId(std::string()); - EXPECT_TRUE(GetRecordingStatus()); - EXPECT_FALSE(IsUsingHotwordDevice()); - - audio_input_impl()->SetHotwordDeviceId("fake-hotword-device"); - EXPECT_TRUE(GetRecordingStatus()); - EXPECT_TRUE(IsUsingHotwordDevice()); -} - -TEST_F(AudioInputImplTest, - DeadStreamDetectionShouldBeDisabledWhenUsingHotwordDevice) { - StartAudioRecording(); - - audio_input_impl()->SetHotwordDeviceId(std::string()); - EXPECT_TRUE(IsUsingDeadStreamDetection()); - - audio_input_impl()->SetHotwordDeviceId("fake-hotword-device"); - EXPECT_FALSE(IsUsingDeadStreamDetection()); -} - -} // namespace assistant -} // namespace chromeos diff --git a/chromeos/services/assistant/platform_api_impl.cc b/chromeos/services/assistant/platform_api_impl.cc index dc59df392b8797..91f7c4f17d45c3 100644 --- a/chromeos/services/assistant/platform_api_impl.cc +++ b/chromeos/services/assistant/platform_api_impl.cc @@ -19,7 +19,6 @@ #include "libassistant/shared/public/platform_factory.h" #include "media/audio/audio_device_description.h" -using assistant_client::AudioInputProvider; using assistant_client::AudioOutputProvider; using assistant_client::AuthProvider; using assistant_client::FileProvider; @@ -82,8 +81,7 @@ PlatformApiImpl::PlatformApiImpl( mojo::PendingRemote battery_monitor, scoped_refptr main_thread_task_runner, scoped_refptr background_task_runner) - : audio_input_provider_(), - audio_output_provider_(media_session, + : audio_output_provider_(media_session, background_task_runner, media::AudioDeviceDescription::kDefaultDeviceId) { // Only enable native power features if they are supported by the UI. @@ -98,10 +96,6 @@ PlatformApiImpl::PlatformApiImpl( PlatformApiImpl::~PlatformApiImpl() = default; -AudioInputProviderImpl& PlatformApiImpl::GetAudioInputProvider() { - return audio_input_provider_; -} - AudioOutputProvider& PlatformApiImpl::GetAudioOutputProvider() { return audio_output_provider_; } @@ -122,9 +116,5 @@ SystemProvider& PlatformApiImpl::GetSystemProvider() { return *system_provider_; } -void PlatformApiImpl::InitializeAudioInputHost(AudioInputHost& host) { - host.Initialize(&audio_input_provider_.GetAudioInput()); -} - } // namespace assistant } // namespace chromeos diff --git a/chromeos/services/assistant/platform_api_impl.h b/chromeos/services/assistant/platform_api_impl.h index 782ddc81863922..e3fc11eeed3c19 100644 --- a/chromeos/services/assistant/platform_api_impl.h +++ b/chromeos/services/assistant/platform_api_impl.h @@ -10,7 +10,6 @@ #include #include -#include "chromeos/services/assistant/platform/audio_input_provider_impl.h" #include "chromeos/services/assistant/platform/audio_output_provider_impl.h" #include "chromeos/services/assistant/platform/file_provider_impl.h" #include "chromeos/services/assistant/platform/network_provider_impl.h" @@ -39,16 +38,12 @@ class PlatformApiImpl : public CrosPlatformApi { scoped_refptr background_task_runner); ~PlatformApiImpl() override; - // assistant_client::PlatformApi overrides - AudioInputProviderImpl& GetAudioInputProvider() override; assistant_client::AudioOutputProvider& GetAudioOutputProvider() override; assistant_client::AuthProvider& GetAuthProvider() override; assistant_client::FileProvider& GetFileProvider() override; assistant_client::NetworkProvider& GetNetworkProvider() override; assistant_client::SystemProvider& GetSystemProvider() override; - void InitializeAudioInputHost(AudioInputHost& host) override; - private: // ChromeOS does not use auth manager, so we don't yet need to implement a // real auth provider. @@ -82,7 +77,6 @@ class PlatformApiImpl : public CrosPlatformApi { void Reset() override; }; - AudioInputProviderImpl audio_input_provider_; AudioOutputProviderImpl audio_output_provider_; FakeAuthProvider auth_provider_; FileProviderImpl file_provider_; diff --git a/chromeos/services/assistant/proxy/BUILD.gn b/chromeos/services/assistant/proxy/BUILD.gn index b5ffae829268f1..bf9fc5f35541f5 100644 --- a/chromeos/services/assistant/proxy/BUILD.gn +++ b/chromeos/services/assistant/proxy/BUILD.gn @@ -5,29 +5,49 @@ import("//build/buildflag_header.gni") import("//build/config/chromeos/ui_mode.gni") import("//chromeos/assistant/assistant.gni") -assert(enable_cros_libassistant) - source_set("proxy") { + sources = [] + deps = [] + + if (enable_cros_libassistant) { + sources += [ + "assistant_proxy.cc", + "assistant_proxy.h", + "conversation_controller_proxy.cc", + "conversation_controller_proxy.h", + "libassistant_service_host.h", + "service_controller_proxy.cc", + "service_controller_proxy.h", + ] + + public_deps = [ "//chromeos/services/libassistant/public/mojom" ] + + deps += [ + ":audio_input_bindings", + "//base", + "//chromeos/assistant/internal", + "//chromeos/assistant/internal/proto/google3", + "//chromeos/constants", + "//chromeos/services/assistant/public/cpp", + "//chromeos/services/assistant/public/cpp/migration", + "//chromeos/services/libassistant", + "//services/network/public/cpp", + ] + } +} + +source_set("audio_input_bindings") { sources = [ - "assistant_proxy.cc", - "assistant_proxy.h", - "conversation_controller_proxy.cc", - "conversation_controller_proxy.h", - "libassistant_service_host.h", - "service_controller_proxy.cc", - "service_controller_proxy.h", + "audio_input_bindings.cc", + "audio_input_bindings.h", ] public_deps = [ "//chromeos/services/libassistant/public/mojom" ] deps = [ "//base", - "//chromeos/assistant/internal", - "//chromeos/assistant/internal/proto/google3", "//chromeos/constants", "//chromeos/services/assistant/public/cpp", - "//chromeos/services/assistant/public/cpp/migration", - "//chromeos/services/libassistant", "//services/network/public/cpp", ] } diff --git a/chromeos/services/assistant/proxy/assistant_proxy.cc b/chromeos/services/assistant/proxy/assistant_proxy.cc index 664dce52de0c9a..2a7edf22dac035 100644 --- a/chromeos/services/assistant/proxy/assistant_proxy.cc +++ b/chromeos/services/assistant/proxy/assistant_proxy.cc @@ -98,12 +98,16 @@ void AssistantProxy::BindControllers( display_controller_remote_.BindNewPipeAndPassReceiver(), pending_service_controller_remote.InitWithNewPipeAndPassReceiver()); - service_controller_proxy_ = std::make_unique( - host, std::move(pending_url_loader_factory), - std::move(pending_service_controller_remote)); conversation_controller_proxy_ = std::make_unique( std::move(pending_conversation_controller_remote)); + service_controller_proxy_ = std::make_unique( + host, std::move(pending_url_loader_factory), + std::move(pending_service_controller_remote)); + + audio_input_bindings_ = AudioInputBindings( + std::move(pending_audio_input_controller_remote), + std::move(pending_audio_stream_factory_delegate_receiver)); } scoped_refptr @@ -116,6 +120,11 @@ ServiceControllerProxy& AssistantProxy::service_controller() { return *service_controller_proxy_; } +AudioInputBindings AssistantProxy::ExtractAudioInputBindings() { + DCHECK(audio_input_bindings_.has_value()); + return std::move(audio_input_bindings_.value()); +} + ConversationControllerProxy& AssistantProxy::conversation_controller_proxy() { DCHECK(conversation_controller_proxy_); return *conversation_controller_proxy_; diff --git a/chromeos/services/assistant/proxy/assistant_proxy.h b/chromeos/services/assistant/proxy/assistant_proxy.h index ec70b340baa02d..526b1ea4b8f98f 100644 --- a/chromeos/services/assistant/proxy/assistant_proxy.h +++ b/chromeos/services/assistant/proxy/assistant_proxy.h @@ -8,6 +8,7 @@ #include #include "base/threading/thread.h" +#include "chromeos/services/assistant/proxy/audio_input_bindings.h" #include "chromeos/services/libassistant/public/mojom/conversation_controller.mojom.h" #include "chromeos/services/libassistant/public/mojom/service.mojom.h" #include "mojo/public/cpp/bindings/remote.h" @@ -64,6 +65,9 @@ class AssistantProxy { mojo::PendingRemote< chromeos::libassistant::mojom::SpeechRecognitionObserver> observer); + // Extract the audio input bindings so they can be bound and used. + AudioInputBindings ExtractAudioInputBindings(); + private: using AudioInputControllerMojom = chromeos::libassistant::mojom::AudioInputController; @@ -95,8 +99,11 @@ class AssistantProxy { mojo::Remote libassistant_service_remote_; mojo::Remote display_controller_remote_; - std::unique_ptr service_controller_proxy_; std::unique_ptr conversation_controller_proxy_; + std::unique_ptr service_controller_proxy_; + + // Will be nullopt after ExtractAudioInputBindings() is called. + base::Optional audio_input_bindings_; // The thread on which the Libassistant service runs. // Warning: must be the last object, so it is destroyed (and flushed) first. diff --git a/chromeos/services/assistant/proxy/audio_input_bindings.cc b/chromeos/services/assistant/proxy/audio_input_bindings.cc new file mode 100644 index 00000000000000..89da5d7960b57a --- /dev/null +++ b/chromeos/services/assistant/proxy/audio_input_bindings.cc @@ -0,0 +1,29 @@ +// Copyright 2021 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 "chromeos/services/assistant/proxy/audio_input_bindings.h" + +#include + +namespace chromeos { +namespace assistant { + +AudioInputBindings::AudioInputBindings( + mojo::PendingRemote + pending_audio_input_controller_remote, + mojo::PendingReceiver< + chromeos::libassistant::mojom::AudioStreamFactoryDelegate> + pending_audio_stream_factory_delegate_receiver) + : pending_audio_input_controller_remote( + std::move(pending_audio_input_controller_remote)), + pending_audio_stream_factory_delegate_receiver( + std::move(pending_audio_stream_factory_delegate_receiver)) {} + +AudioInputBindings::AudioInputBindings(AudioInputBindings&&) = default; +AudioInputBindings& AudioInputBindings::operator=(AudioInputBindings&&) = + default; +AudioInputBindings::~AudioInputBindings() = default; + +} // namespace assistant +} // namespace chromeos diff --git a/chromeos/services/assistant/proxy/audio_input_bindings.h b/chromeos/services/assistant/proxy/audio_input_bindings.h new file mode 100644 index 00000000000000..64bbde544bcd0e --- /dev/null +++ b/chromeos/services/assistant/proxy/audio_input_bindings.h @@ -0,0 +1,36 @@ +// Copyright 2021 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 CHROMEOS_SERVICES_ASSISTANT_PROXY_AUDIO_INPUT_BINDINGS_H_ +#define CHROMEOS_SERVICES_ASSISTANT_PROXY_AUDIO_INPUT_BINDINGS_H_ + +#include "chromeos/services/libassistant/public/mojom/audio_input_controller.mojom-forward.h" +#include "mojo/public/cpp/bindings/pending_remote.h" + +namespace chromeos { +namespace assistant { + +// Contains the bindings needed for the audio input handling. +struct AudioInputBindings { + AudioInputBindings( + mojo::PendingRemote + pending_audio_input_controller_remote, + mojo::PendingReceiver< + chromeos::libassistant::mojom::AudioStreamFactoryDelegate> + pending_audio_stream_factory_delegate_receiver); + AudioInputBindings(AudioInputBindings&&); + AudioInputBindings& operator=(AudioInputBindings&&); + ~AudioInputBindings(); + + mojo::PendingRemote + pending_audio_input_controller_remote; + mojo::PendingReceiver< + chromeos::libassistant::mojom::AudioStreamFactoryDelegate> + pending_audio_stream_factory_delegate_receiver; +}; + +} // namespace assistant +} // namespace chromeos + +#endif // CHROMEOS_SERVICES_ASSISTANT_PROXY_AUDIO_INPUT_BINDINGS_H_ diff --git a/chromeos/services/assistant/public/cpp/migration/BUILD.gn b/chromeos/services/assistant/public/cpp/migration/BUILD.gn index 12b06fbd9e46b5..35cc1566830730 100644 --- a/chromeos/services/assistant/public/cpp/migration/BUILD.gn +++ b/chromeos/services/assistant/public/cpp/migration/BUILD.gn @@ -41,6 +41,7 @@ component("test_support") { "//base", "//chromeos/assistant/internal:test_support", "//chromeos/assistant/internal/proto/google3", + "//chromeos/services/assistant/proxy:audio_input_bindings", "//libassistant/shared/public", ] } diff --git a/chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h b/chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h index f92b2f265517cf..62f14399ab452e 100644 --- a/chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h +++ b/chromeos/services/assistant/public/cpp/migration/assistant_manager_service_delegate.h @@ -7,7 +7,6 @@ #include -#include "base/macros.h" #include "base/single_thread_task_runner.h" namespace assistant_client { @@ -22,15 +21,21 @@ namespace assistant { class AssistantMediaSession; class AudioInputHost; class CrosPlatformApi; +struct AudioInputBindings; // Interface class that provides factory methods for assistant internal // functionality. class AssistantManagerServiceDelegate { public: AssistantManagerServiceDelegate() = default; + AssistantManagerServiceDelegate(const AssistantManagerServiceDelegate&) = + delete; + AssistantManagerServiceDelegate& operator=( + const AssistantManagerServiceDelegate&) = delete; virtual ~AssistantManagerServiceDelegate() = default; - virtual std::unique_ptr CreateAudioInputHost() = 0; + virtual std::unique_ptr CreateAudioInputHost( + AudioInputBindings bindings) = 0; virtual std::unique_ptr CreatePlatformApi( AssistantMediaSession* media_session, @@ -44,9 +49,6 @@ class AssistantManagerServiceDelegate { virtual assistant_client::AssistantManagerInternal* UnwrapAssistantManagerInternal( assistant_client::AssistantManager* assistant_manager) = 0; - - private: - DISALLOW_COPY_AND_ASSIGN(AssistantManagerServiceDelegate); }; } // namespace assistant diff --git a/chromeos/services/assistant/public/cpp/migration/audio_input_host.h b/chromeos/services/assistant/public/cpp/migration/audio_input_host.h index 2314831117758f..598989d6e70a17 100644 --- a/chromeos/services/assistant/public/cpp/migration/audio_input_host.h +++ b/chromeos/services/assistant/public/cpp/migration/audio_input_host.h @@ -12,19 +12,12 @@ namespace chromeos { namespace assistant { -class AudioInputImpl; - // Class that provides the bridge between the ChromeOS UI thread and the // Libassistant audio input class. class COMPONENT_EXPORT(ASSISTANT_SERVICE) AudioInputHost { public: virtual ~AudioInputHost() = default; - // Initialize this class by setting the backend that it's supposed to use. - // TODO(b/171748795): Should be gone when the Libassistant V2 migration is - // completed. - virtual void Initialize(AudioInputImpl* audio_input) = 0; - // Called when the mic state associated with the interaction is changed. virtual void SetMicState(bool mic_open) = 0; diff --git a/chromeos/services/assistant/public/cpp/migration/cros_platform_api.h b/chromeos/services/assistant/public/cpp/migration/cros_platform_api.h index 41f4ee1200695e..f760a00c99dd6d 100644 --- a/chromeos/services/assistant/public/cpp/migration/cros_platform_api.h +++ b/chromeos/services/assistant/public/cpp/migration/cros_platform_api.h @@ -8,7 +8,6 @@ #include "base/macros.h" namespace assistant_client { -class AudioInputProvider; class AudioOutputProvider; class AuthProvider; class FileProvider; @@ -19,10 +18,7 @@ class SystemProvider; namespace chromeos { namespace assistant { -class AudioInputHost; - -// Platform API required by the voice assistant, extended with some methods used -// when ChromeOS needs to make changes to the platform state. +// Platform API required by the Google assistant. // Note that this no longer inherits from |assistant_client::PlatformApi|, // because we are in the process of migrating its functionality from here to the // Libassistant mojom service. @@ -31,14 +27,6 @@ class CrosPlatformApi { CrosPlatformApi() = default; virtual ~CrosPlatformApi() = default; - // Initialize the AudioInputHost. - // TODO(b/171748795): Should be gone when the Libassistant V2 migration is - // completed. - virtual void InitializeAudioInputHost(AudioInputHost&) = 0; - - // Returns the platform's audio input provider. - virtual assistant_client::AudioInputProvider& GetAudioInputProvider() = 0; - // Returns the platform's audio output provider. virtual assistant_client::AudioOutputProvider& GetAudioOutputProvider() = 0; diff --git a/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.cc b/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.cc index 73c9b52201eaf0..92d82bcb6a049c 100644 --- a/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.cc +++ b/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.cc @@ -9,6 +9,7 @@ #include "chromeos/assistant/internal/test_support/fake_assistant_manager.h" #include "chromeos/assistant/internal/test_support/fake_assistant_manager_internal.h" #include "chromeos/services/assistant//public/cpp/migration/fake_platform_api.h" +#include "chromeos/services/assistant/proxy/audio_input_bindings.h" #include "chromeos/services/assistant/public/cpp/migration/audio_input_host.h" namespace chromeos { @@ -24,7 +25,6 @@ class FakeAudioInputHost : public AudioInputHost { ~FakeAudioInputHost() override = default; // AudioInputHost implementation: - void Initialize(AudioInputImpl* audio_input) override {} void SetMicState(bool mic_open) override {} void OnHotwordEnabled(bool enable) override {} void OnConversationTurnStarted() override {} @@ -44,7 +44,8 @@ FakeAssistantManagerServiceDelegate::~FakeAssistantManagerServiceDelegate() = default; std::unique_ptr -FakeAssistantManagerServiceDelegate::CreateAudioInputHost() { +FakeAssistantManagerServiceDelegate::CreateAudioInputHost( + AudioInputBindings bindings) { return std::make_unique(); } diff --git a/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.h b/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.h index 1adddb283f5f22..bc562c99360c2a 100644 --- a/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.h +++ b/chromeos/services/assistant/public/cpp/migration/fake_assistant_manager_service_delegate.h @@ -25,8 +25,9 @@ class COMPONENT_EXPORT(ASSISTANT_SERVICE_MIGRATION_TEST_SUPPORT) FakeAssistantManager* assistant_manager(); - // AssistantManagerServiceDelegate: - std::unique_ptr CreateAudioInputHost() override; + // AssistantManagerServiceDelegate implementation: + std::unique_ptr CreateAudioInputHost( + AudioInputBindings bindings) override; std::unique_ptr CreatePlatformApi( AssistantMediaSession* media_session, scoped_refptr background_thread_task_runner) diff --git a/chromeos/services/assistant/public/cpp/migration/fake_platform_api.cc b/chromeos/services/assistant/public/cpp/migration/fake_platform_api.cc index 77560ef07f52ac..841a8c20c44890 100644 --- a/chromeos/services/assistant/public/cpp/migration/fake_platform_api.cc +++ b/chromeos/services/assistant/public/cpp/migration/fake_platform_api.cc @@ -72,11 +72,6 @@ FakePlatformApi::FakePlatformApi() FakePlatformApi::~FakePlatformApi() = default; -assistant_client::AudioInputProvider& FakePlatformApi::GetAudioInputProvider() { - NOTIMPLEMENTED(); - abort(); -} - assistant_client::AudioOutputProvider& FakePlatformApi::GetAudioOutputProvider() { return *audio_output_provider_.get(); diff --git a/chromeos/services/assistant/public/cpp/migration/fake_platform_api.h b/chromeos/services/assistant/public/cpp/migration/fake_platform_api.h index b730a4c02d0761..4a9389a1e8c906 100644 --- a/chromeos/services/assistant/public/cpp/migration/fake_platform_api.h +++ b/chromeos/services/assistant/public/cpp/migration/fake_platform_api.h @@ -7,7 +7,6 @@ #include -#include "base/macros.h" #include "chromeos/services/assistant/public/cpp/migration/cros_platform_api.h" namespace chromeos { @@ -19,20 +18,18 @@ namespace assistant { class FakePlatformApi : public CrosPlatformApi { public: FakePlatformApi(); + FakePlatformApi(const FakePlatformApi&) = delete; + FakePlatformApi& operator=(const FakePlatformApi&) = delete; ~FakePlatformApi() override; - // CrosPlatformApi overrides - assistant_client::AudioInputProvider& GetAudioInputProvider() override; + // CrosPlatformApi implementation: assistant_client::AudioOutputProvider& GetAudioOutputProvider() override; assistant_client::AuthProvider& GetAuthProvider() override; assistant_client::FileProvider& GetFileProvider() override; assistant_client::NetworkProvider& GetNetworkProvider() override; assistant_client::SystemProvider& GetSystemProvider() override; - void InitializeAudioInputHost(AudioInputHost&) override {} private: - DISALLOW_COPY_AND_ASSIGN(FakePlatformApi); - std::unique_ptr audio_output_provider_; }; diff --git a/chromeos/services/libassistant/audio/audio_input_stream.cc b/chromeos/services/libassistant/audio/audio_input_stream.cc index 0e3ea06a0bb13f..eeec3f9e0f0ba5 100644 --- a/chromeos/services/libassistant/audio/audio_input_stream.cc +++ b/chromeos/services/libassistant/audio/audio_input_stream.cc @@ -17,10 +17,12 @@ namespace libassistant { namespace { +#if !BUILDFLAG(ENABLE_FAKE_ASSISTANT_MICROPHONE) audio::DeadStreamDetection ToDeadStreamDetection(bool detect_dead_stream) { return detect_dead_stream ? audio::DeadStreamDetection::kEnabled : audio::DeadStreamDetection::kDisabled; } +#endif // !BUILDFLAG(ENABLE_FAKE_ASSISTANT_MICROPHONE) } // namespace diff --git a/chromeos/services/libassistant/libassistant_service.cc b/chromeos/services/libassistant/libassistant_service.cc index 40f6f374010620..4b6b8ea06803f0 100644 --- a/chromeos/services/libassistant/libassistant_service.cc +++ b/chromeos/services/libassistant/libassistant_service.cc @@ -35,7 +35,8 @@ LibassistantService::LibassistantService( service_controller_->AddAndFireAssistantManagerObserver( display_controller_.get()); - platform_api_->SetAudioInputProvider(&platform_api->GetAudioInputProvider()) + platform_api_ + ->SetAudioInputProvider(&audio_input_controller_->audio_input_provider()) .SetAudioOutputProvider(&platform_api->GetAudioOutputProvider()) .SetAuthProvider(&platform_api->GetAuthProvider()) .SetFileProvider(&platform_api->GetFileProvider()) diff --git a/components/payments/content/android/java/src/org/chromium/components/payments/ErrorMessageUtil.java b/components/payments/content/android/java/src/org/chromium/components/payments/ErrorMessageUtil.java index dd97c84d32fd2d..2ebdfe8a56e3b6 100644 --- a/components/payments/content/android/java/src/org/chromium/components/payments/ErrorMessageUtil.java +++ b/components/payments/content/android/java/src/org/chromium/components/payments/ErrorMessageUtil.java @@ -4,6 +4,8 @@ package org.chromium.components.payments; +import androidx.annotation.VisibleForTesting; + import org.chromium.base.annotations.JNINamespace; import org.chromium.base.annotations.NativeMethods; @@ -27,7 +29,8 @@ public static String getNotSupportedErrorMessage(Set methods) { * ErrorMessageUtilJni. */ @NativeMethods - /* package */ interface Natives { + @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE) + public interface Natives { String getNotSupportedErrorMessage(String[] methods); } } diff --git a/components/sync/driver/profile_sync_service.cc b/components/sync/driver/profile_sync_service.cc index cadc4a8b0de1d3..4289125a1e3a6c 100644 --- a/components/sync/driver/profile_sync_service.cc +++ b/components/sync/driver/profile_sync_service.cc @@ -632,10 +632,7 @@ void ProfileSyncService::Shutdown() { // All observers must be gone now: All KeyedServices should have unregistered // their observers already before, in their own Shutdown(), and all others // should have done it now when they got the shutdown notification. - // Note: "might_have_observers" sounds like it might be inaccurate, but it can - // only return false positives while an iteration over the ObserverList is - // ongoing. - DCHECK(!observers_.might_have_observers()); + DCHECK(observers_.empty()); auth_manager_.reset(); } @@ -932,7 +929,7 @@ void ProfileSyncService::OnEngineInitialized( sync_prefs_.SetBirthday(birthday); sync_prefs_.SetBagOfChips(bag_of_chips); - if (protocol_event_observers_.might_have_observers()) { + if (!protocol_event_observers_.empty()) { engine_->RequestBufferedProtocolEventsAndEnableForwarding(); } @@ -1643,7 +1640,7 @@ void ProfileSyncService::RemoveProtocolEventObserver( ProtocolEventObserver* observer) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); protocol_event_observers_.RemoveObserver(observer); - if (engine_ && !protocol_event_observers_.might_have_observers()) { + if (engine_ && protocol_event_observers_.empty()) { engine_->DisableProtocolEventForwarding(); } } diff --git a/components/sync/js/sync_js_controller.cc b/components/sync/js/sync_js_controller.cc index 1d598f63ff9d94..70259990d7d9ce 100644 --- a/components/sync/js/sync_js_controller.cc +++ b/components/sync/js/sync_js_controller.cc @@ -44,9 +44,8 @@ void SyncJsController::UpdateBackendEventHandler() { // event handler we pass to it if we don't have any event // handlers. WeakHandle backend_event_handler = - js_event_handlers_.might_have_observers() - ? MakeWeakHandle(AsWeakPtr()) - : WeakHandle(); + js_event_handlers_.empty() ? WeakHandle() + : MakeWeakHandle(AsWeakPtr()); js_backend_.Call(FROM_HERE, &JsBackend::SetJsEventHandler, backend_event_handler); } diff --git a/components/viz/service/display/renderer_pixeltest.cc b/components/viz/service/display/renderer_pixeltest.cc index a0b28be9bc1322..4903b9c90bbe72 100644 --- a/components/viz/service/display/renderer_pixeltest.cc +++ b/components/viz/service/display/renderer_pixeltest.cc @@ -3914,10 +3914,9 @@ TEST_F(SoftwareRendererPixelTest, PictureDrawQuadDisableImageFiltering) { std::unique_ptr recording = cc::FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); - cc::PaintFlags flags; - flags.setFilterQuality(kLow_SkFilterQuality); - recording->add_draw_image_with_flags(surface->makeImageSnapshot(), - gfx::Point(), flags); + recording->add_draw_image_with_flags( + surface->makeImageSnapshot(), gfx::Point(), + SkSamplingOptions(SkFilterMode::kLinear), cc::PaintFlags()); recording->Rerecord(); scoped_refptr raster_source = recording->CreateRasterSource(); @@ -3965,10 +3964,9 @@ TEST_F(SoftwareRendererPixelTest, PictureDrawQuadNearestNeighbor) { std::unique_ptr recording = cc::FakeRecordingSource::CreateFilledRecordingSource(viewport.size()); - cc::PaintFlags flags; - flags.setFilterQuality(kLow_SkFilterQuality); - recording->add_draw_image_with_flags(surface->makeImageSnapshot(), - gfx::Point(), flags); + recording->add_draw_image_with_flags( + surface->makeImageSnapshot(), gfx::Point(), + SkSamplingOptions(SkFilterMode::kLinear), cc::PaintFlags()); recording->Rerecord(); scoped_refptr raster_source = recording->CreateRasterSource(); diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc index 4154888737ae26..849356c422a32c 100644 --- a/content/renderer/child_frame_compositing_helper.cc +++ b/content/renderer/child_frame_compositing_helper.cc @@ -114,7 +114,7 @@ ChildFrameCompositingHelper::PaintContentsToDisplayList() { .set_image(SkImage::MakeFromBitmap(*sad_bitmap), cc::PaintImage::GetNextContentId()) .TakePaintImage(); - display_list->push(image, x, y, nullptr); + display_list->push(image, x, y); if (device_scale_factor_ != 1.f) display_list->push(); diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc index a68c1ae487cf45..56a4316d81233b 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc @@ -396,7 +396,8 @@ void PepperGraphics2DHost::Paint(cc::PaintCanvas* canvas, // TODO(khushalsagar): Can this be cached on image_data_, and invalidated when // the bitmap changes? canvas->drawImage(cc::PaintImage::CreateFromBitmap(std::move(backing_bitmap)), - pixel_origin.x(), pixel_origin.y(), &flags); + pixel_origin.x(), pixel_origin.y(), SkSamplingOptions(), + &flags); } void PepperGraphics2DHost::ViewInitiatedPaint() { diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.arm64.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.arm64.zip.sha1 index ea7053be1f54e6..a162f7d8f925a1 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.arm64.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.arm64.zip.sha1 @@ -1 +1 @@ -e025fca34cea2100a63112dae7100a5a168d1932 \ No newline at end of file +bc8d018d3fdc32b74ba277a595cc74b00eb96ced \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.x64.zip.sha1 b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.x64.zip.sha1 index 1bf1a2b6181a0d..2d25e7688d1d01 100644 --- a/ios/google_internal/frameworks/chrome_internal_dynamic_framework.x64.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_internal_dynamic_framework.x64.zip.sha1 @@ -1 +1 @@ -d61fb65e4aa99acf4c87b505ce1f9732bfecaa46 \ No newline at end of file +1f66a439250843c0c04eccbef9fe36f9e6a17849 \ No newline at end of file diff --git a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.arm64.zip.sha1 b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.arm64.zip.sha1 index d492d52c338b07..9fae7210c54b4c 100644 --- a/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.arm64.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_sso_internal_dynamic_framework.arm64.zip.sha1 @@ -1 +1 @@ -992043db64b8e67fe75c8ac28fe559e9f33fae2d \ No newline at end of file +af2c9939ec146114d28eca2758c06ae57f0550a9 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.arm64.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.arm64.zip.sha1 index 8d53bf4cee03f9..fcd397ec77d523 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.arm64.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.arm64.zip.sha1 @@ -1 +1 @@ -51e6072c2cfc02cf45376a275076783b2fbddbb2 \ No newline at end of file +8afa9332f3a3190fcbe70f0048d4211b92377f8e \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.x64.zip.sha1 b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.x64.zip.sha1 index bf9b2d31cb96f6..2a810a8a18598a 100644 --- a/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.x64.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_dogfood_internal_dynamic_framework.x64.zip.sha1 @@ -1 +1 @@ -d754761a5e5f07cd3f6c58c154b78428e7e4e3f6 \ No newline at end of file +f2aa0710eadd021f5356c58c4ff9c9c22dab60e5 \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.arm64.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.arm64.zip.sha1 index 3e864b9204c0fd..7f53363d043641 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.arm64.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.arm64.zip.sha1 @@ -1 +1 @@ -628b2ce8ed463a6b45332ac2cf2b1d54de9920f2 \ No newline at end of file +1e3d6724b6e59969591f111d2104ce38da345cef \ No newline at end of file diff --git a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.x64.zip.sha1 b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.x64.zip.sha1 index d529157cecb944..f8bd76f767c938 100644 --- a/ios/google_internal/frameworks/remoting_internal_dynamic_framework.x64.zip.sha1 +++ b/ios/google_internal/frameworks/remoting_internal_dynamic_framework.x64.zip.sha1 @@ -1 +1 @@ -604a3f7f4d53279a2752fbed4025cfd78f884419 \ No newline at end of file +f6fc777189aa33c7d9546cba528b468f49757b5f \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.arm64.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.arm64.zip.sha1 index 9f8788cfd17bbc..d9223a7548a91d 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.arm64.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.arm64.zip.sha1 @@ -1 +1 @@ -67541a05a393db395048749c9fd8aff27b36ded0 \ No newline at end of file +12aeb2841ea2f769aa0d076a4156b9a64834dc22 \ No newline at end of file diff --git a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.x64.zip.sha1 b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.x64.zip.sha1 index 6c066dd01be845..8f877e864cb5bf 100644 --- a/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.x64.zip.sha1 +++ b/ios/google_internal/frameworks/web_view_shell_internal_dynamic_framework.x64.zip.sha1 @@ -1 +1 @@ -50f1a5c478d9c565bdf1be3bf01ce1abae3b7f37 \ No newline at end of file +03eacd6f368578c3053134de0c3a8022f8253d19 \ No newline at end of file diff --git a/media/gpu/ipc/service/picture_buffer_manager.cc b/media/gpu/ipc/service/picture_buffer_manager.cc index 5eed6cb7c0ca4b..b1cb6e3e26f89e 100644 --- a/media/gpu/ipc/service/picture_buffer_manager.cc +++ b/media/gpu/ipc/service/picture_buffer_manager.cc @@ -13,7 +13,6 @@ #include "base/logging.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h" -#include "components/viz/common/resources/resource_format_utils.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/video_util.h" @@ -84,11 +83,13 @@ class PictureBufferManagerImpl : public PictureBufferManager { DCHECK(planes); DCHECK_LE(planes, static_cast(VideoFrame::kMaxPlanes)); - // TODO(sandersd): Consider requiring that CreatePictureBuffers() is - // called with the context current. - if (!command_buffer_helper_->MakeContextCurrent()) { - DVLOG(1) << "Failed to make context current"; - return std::vector(); + if (!use_shared_image) { + // TODO(sandersd): Consider requiring that CreatePictureBuffers() is + // called with the context current. + if (!command_buffer_helper_->MakeContextCurrent()) { + DVLOG(1) << "Failed to make context current"; + return std::vector(); + } } std::vector picture_buffers; @@ -96,34 +97,25 @@ class PictureBufferManagerImpl : public PictureBufferManager { PictureBufferData picture_data = {pixel_format, texture_size, use_shared_image}; - for (uint32_t j = 0; j < planes; j++) { - // Use the plane size for texture-backed shared and non-shared images. - // Adjust the size by the subsampling factor. - const size_t width = - VideoFrame::Columns(j, pixel_format, texture_size.width()); - const size_t height = - VideoFrame::Rows(j, pixel_format, texture_size.height()); - - picture_data.texture_sizes.emplace_back(width, height); - - // Create a texture for this plane. - // When using shared images, the VDA might not require GL textures to - // exist. - // TODO(crbug.com/1011555): Do not allocate GL textures when unused. - GLuint service_id = command_buffer_helper_->CreateTexture( - texture_target, GL_RGBA, width, height, GL_RGBA, GL_UNSIGNED_BYTE); - DCHECK(service_id); - picture_data.service_ids.push_back(service_id); - - // The texture is not cleared yet, but it will be before the VDA - // outputs it. Rather than requiring output to happen on the GPU - // thread, mark the texture as cleared immediately. - command_buffer_helper_->SetCleared(service_id); - - // Generate a mailbox while we are still on the GPU thread. - picture_data.mailbox_holders[j] = gpu::MailboxHolder( - command_buffer_helper_->CreateMailbox(service_id), gpu::SyncToken(), - texture_target); + if (!use_shared_image) { + for (uint32_t j = 0; j < planes; j++) { + // Create a texture for this plane. + GLuint service_id = command_buffer_helper_->CreateTexture( + texture_target, GL_RGBA, texture_size.width(), + texture_size.height(), GL_RGBA, GL_UNSIGNED_BYTE); + DCHECK(service_id); + picture_data.service_ids.push_back(service_id); + + // The texture is not cleared yet, but it will be before the VDA + // outputs it. Rather than requiring output to happen on the GPU + // thread, mark the texture as cleared immediately. + command_buffer_helper_->SetCleared(service_id); + + // Generate a mailbox while we are still on the GPU thread. + picture_data.mailbox_holders[j] = gpu::MailboxHolder( + command_buffer_helper_->CreateMailbox(service_id), + gpu::SyncToken(), texture_target); + } } // Generate a picture buffer ID and record the picture buffer. @@ -140,9 +132,8 @@ class PictureBufferManagerImpl : public PictureBufferManager { // TODO(sandersd): Refactor the bind image callback to use service IDs so // that we can get rid of the client IDs altogether. picture_buffers.emplace_back( - picture_buffer_id, texture_size, picture_data.texture_sizes, - picture_data.service_ids, picture_data.service_ids, texture_target, - pixel_format); + picture_buffer_id, texture_size, picture_data.service_ids, + picture_data.service_ids, texture_target, pixel_format); } return picture_buffers; } @@ -225,12 +216,12 @@ class PictureBufferManagerImpl : public PictureBufferManager { // If this |picture| has a SharedImage, then keep a reference to the // SharedImage in |picture_buffer_data| and update the gpu::MailboxHolder. - for (uint32_t i = 0; i < VideoFrame::kMaxPlanes; i++) { - if (auto scoped_shared_image = picture.scoped_shared_image(i)) { - picture_buffer_data.scoped_shared_images.push_back(scoped_shared_image); - picture_buffer_data.mailbox_holders[i] = - scoped_shared_image->GetMailboxHolder(); - } + DCHECK_EQ(picture_buffer_data.use_shared_image, + !!picture.scoped_shared_image()); + if (auto scoped_shared_image = picture.scoped_shared_image()) { + picture_buffer_data.scoped_shared_image = scoped_shared_image; + picture_buffer_data.mailbox_holders[0] = + scoped_shared_image->GetMailboxHolder(); } // Create and return a VideoFrame for the picture buffer. @@ -322,6 +313,7 @@ class PictureBufferManagerImpl : public PictureBufferManager { DCHECK(gpu_task_runner_->BelongsToCurrentThread()); std::vector service_ids; + scoped_refptr scoped_shared_image; { base::AutoLock lock(picture_buffers_lock_); const auto& it = picture_buffers_.find(picture_buffer_id); @@ -329,9 +321,16 @@ class PictureBufferManagerImpl : public PictureBufferManager { DCHECK(it->second.dismissed); DCHECK(!it->second.IsInUse()); service_ids = std::move(it->second.service_ids); + scoped_shared_image = std::move(it->second.scoped_shared_image); picture_buffers_.erase(it); } + // If this PictureBuffer is using a SharedImage, let it fall out of scope. + if (scoped_shared_image) { + DCHECK(service_ids.empty()); + return; + } + if (!command_buffer_helper_->MakeContextCurrent()) return; @@ -352,8 +351,7 @@ class PictureBufferManagerImpl : public PictureBufferManager { bool use_shared_image = false; std::vector service_ids; gpu::MailboxHolder mailbox_holders[VideoFrame::kMaxPlanes]; - std::vector texture_sizes; - std::vector> scoped_shared_images; + scoped_refptr scoped_shared_image; bool dismissed = false; // The same picture buffer can be output from the VDA multiple times diff --git a/media/gpu/ipc/service/vda_video_decoder.cc b/media/gpu/ipc/service/vda_video_decoder.cc index c2616e19fcc191..820ab74a90c676 100644 --- a/media/gpu/ipc/service/vda_video_decoder.cc +++ b/media/gpu/ipc/service/vda_video_decoder.cc @@ -768,10 +768,6 @@ gpu::SharedImageStub* VdaVideoDecoder::GetSharedImageStub() const { return command_buffer_helper_->GetSharedImageStub(); } -CommandBufferHelper* VdaVideoDecoder::GetCommandBufferHelper() const { - return command_buffer_helper_.get(); -} - void VdaVideoDecoder::NotifyErrorOnParentThread( VideoDecodeAccelerator::Error error) { DVLOG(1) << __func__ << "(" << error << ")"; diff --git a/media/gpu/ipc/service/vda_video_decoder.h b/media/gpu/ipc/service/vda_video_decoder.h index 138cc5760694b4..37746cac31e3d8 100644 --- a/media/gpu/ipc/service/vda_video_decoder.h +++ b/media/gpu/ipc/service/vda_video_decoder.h @@ -129,7 +129,6 @@ class VdaVideoDecoder : public VideoDecoder, void NotifyResetDone() override; void NotifyError(VideoDecodeAccelerator::Error error) override; gpu::SharedImageStub* GetSharedImageStub() const override; - CommandBufferHelper* GetCommandBufferHelper() const override; // Tasks and thread hopping. static void CleanupOnGpuThread(std::unique_ptr); diff --git a/media/gpu/windows/dxva_picture_buffer_win.cc b/media/gpu/windows/dxva_picture_buffer_win.cc index aee9e03824a1b9..e3452d2017cc02 100644 --- a/media/gpu/windows/dxva_picture_buffer_win.cc +++ b/media/gpu/windows/dxva_picture_buffer_win.cc @@ -494,8 +494,6 @@ bool EGLStreamPictureBuffer::BindSampleToTexture( DCHECK_EQ(BOUND, state_); state_ = IN_CLIENT; - shared_images_.resize(picture_buffer_.service_texture_ids().size()); - current_d3d_sample_ = sample; EGLDisplay egl_display = gl::GLSurfaceEGL::GetHardwareDisplay(); diff --git a/media/gpu/windows/dxva_picture_buffer_win.h b/media/gpu/windows/dxva_picture_buffer_win.h index c14b3c8a25d9c9..891e763653ebcc 100644 --- a/media/gpu/windows/dxva_picture_buffer_win.h +++ b/media/gpu/windows/dxva_picture_buffer_win.h @@ -68,31 +68,6 @@ class DXVAPictureBuffer { color_space_ = color_space; } - const std::vector>& shared_images() - const { - return shared_images_; - } - - void set_shared_image( - size_t plane, - scoped_refptr shared_image) { - DCHECK(plane < shared_images_.size()); - shared_images_[plane] = std::move(shared_image); - } - - // Picture buffer data used to create a shared image backing. - const PictureBuffer::TextureIds& service_texture_ids() const { - return picture_buffer_.service_texture_ids(); - } - - gfx::Size texture_size(size_t plane) { - return picture_buffer_.texture_size(plane); - } - - VideoPixelFormat pixel_format() const { - return picture_buffer_.pixel_format(); - } - // Returns true if these could in theory be used as an overlay. May // still be drawn using GL depending on the scene and precise hardware // support. @@ -121,8 +96,6 @@ class DXVAPictureBuffer { gfx::ColorSpace color_space_; scoped_refptr gl_image_; - std::vector> shared_images_; - DISALLOW_COPY_AND_ASSIGN(DXVAPictureBuffer); }; diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.cc b/media/gpu/windows/dxva_video_decode_accelerator_win.cc index 0f8d8fb9926675..cc0f16e30e89f6 100644 --- a/media/gpu/windows/dxva_video_decode_accelerator_win.cc +++ b/media/gpu/windows/dxva_video_decode_accelerator_win.cc @@ -21,7 +21,6 @@ #include "base/atomicops.h" #include "base/base_paths_win.h" #include "base/bind.h" -#include "base/bind_post_task.h" #include "base/callback.h" #include "base/command_line.h" #include "base/file_version_info.h" @@ -39,19 +38,12 @@ #include "base/win/scoped_co_mem.h" #include "base/win/windows_version.h" #include "build/build_config.h" -#include "components/viz/common/resources/resource_format_utils.h" -#include "gpu/command_buffer/common/shared_image_usage.h" -#include "gpu/command_buffer/service/shared_image_backing_d3d.h" -#include "gpu/command_buffer/service/shared_image_factory.h" #include "gpu/config/gpu_driver_bug_workarounds.h" #include "gpu/config/gpu_preferences.h" -#include "gpu/ipc/service/shared_image_stub.h" #include "media/base/media_log.h" #include "media/base/media_switches.h" -#include "media/base/video_frame.h" #include "media/base/win/mf_helpers.h" #include "media/filters/vp9_parser.h" -#include "media/gpu/command_buffer_helper.h" #include "media/gpu/windows/d3d11_video_device_format_support.h" #include "media/gpu/windows/dxva_picture_buffer_win.h" #include "media/gpu/windows/supported_profile_helpers.h" @@ -67,7 +59,6 @@ #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_fence.h" -#include "ui/gl/gl_image_dxgi.h" #include "ui/gl/gl_surface_egl.h" #include "ui/gl/gl_switches.h" @@ -181,36 +172,6 @@ HRESULT g_last_device_removed_reason; namespace media { -bool VideoPixelFormatToVizFormat( - VideoPixelFormat pixel_format, - size_t textures_per_picture, - std::array& texture_formats) { - switch (pixel_format) { - case PIXEL_FORMAT_ARGB: - case PIXEL_FORMAT_XRGB: - case PIXEL_FORMAT_ABGR: - case PIXEL_FORMAT_BGRA: - DCHECK_EQ(textures_per_picture, 1u); - texture_formats[0] = - (pixel_format == PIXEL_FORMAT_ABGR) ? viz::RGBA_8888 : viz::BGRA_8888; - return true; - case PIXEL_FORMAT_NV12: - DCHECK_EQ(textures_per_picture, 2u); - texture_formats[0] = viz::RED_8; // Y - texture_formats[1] = viz::RG_88; // UV - return true; - case PIXEL_FORMAT_P016LE: - // TODO(crbug.com/1011555): P010 formats are not fully supported. - // The required Viz formats (viz::R16_EXT and viz::RG16_EXT) are not yet - // supported. - DCHECK_EQ(textures_per_picture, 2u); - return false; - default: // Unsupported - NOTREACHED(); - return false; - } -} - constexpr VideoCodecProfile kSupportedProfiles[] = { H264PROFILE_BASELINE, H264PROFILE_MAIN, H264PROFILE_HIGH, VP8PROFILE_ANY, VP9PROFILE_PROFILE0, VP9PROFILE_PROFILE2, @@ -1374,13 +1335,6 @@ GLenum DXVAVideoDecodeAccelerator::GetSurfaceInternalFormat() const { return GL_BGRA_EXT; } -bool DXVAVideoDecodeAccelerator::SupportsSharedImagePictureBuffers() const { - // Shared image is needed to display overlays which can be used directly - // by the video processor. - // TODO(crbug.com/1011555): Support for non-bind cases. - return GetPictureBufferMechanism() == PictureBufferMechanism::BIND; -} - // static VideoDecodeAccelerator::SupportedProfiles DXVAVideoDecodeAccelerator::GetSupportedProfiles( @@ -2188,18 +2142,12 @@ void DXVAVideoDecodeAccelerator::NotifyPictureReady( int input_buffer_id, const gfx::Rect& visible_rect, const gfx::ColorSpace& color_space, - bool allow_overlay, - std::vector> shared_images) { + bool allow_overlay) { DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); // This task could execute after the decoder has been torn down. if (GetState() != kUninitialized && client_) { Picture picture(picture_buffer_id, input_buffer_id, visible_rect, color_space, allow_overlay); - - for (uint32_t i = 0; i < shared_images.size(); i++) { - picture.set_scoped_shared_image(shared_images[i], i); - } - decoded_any_frames_ = true; client_->PictureReady(picture); } @@ -2668,100 +2616,13 @@ void DXVAVideoDecodeAccelerator::BindPictureBufferToSample( DCHECK(!output_picture_buffers_.empty()); - // BindSampleToTexture configures GLImage with the DX11 output texture. - // The DX11 texture is then accessed through the GLImage to create a shared - // image backing below. bool result = picture_buffer->BindSampleToTexture(this, sample); - RETURN_AND_NOTIFY_ON_FAILURE(result, "Failed to bind sample to texture", + RETURN_AND_NOTIFY_ON_FAILURE(result, "Failed to complete copying surface", PLATFORM_FAILURE, ); - // Create the DX11 texture backed shared images (texture per plane). - std::vector> scoped_shared_images; - if (SupportsSharedImagePictureBuffers()) { - gl::GLImageDXGI* gl_image_dxgi = - gl::GLImageDXGI::FromGLImage(picture_buffer->gl_image().get()); - DCHECK(gl_image_dxgi); - - const size_t textures_per_picture = - picture_buffer->service_texture_ids().size(); - - // Get the viz resource format per texture. - std::array viz_formats; - { - const bool result = VideoPixelFormatToVizFormat( - picture_buffer->pixel_format(), textures_per_picture, viz_formats); - RETURN_AND_NOTIFY_ON_FAILURE( - result, "Could not convert pixel format to viz format", - PLATFORM_FAILURE, ); - } - - CommandBufferHelper* helper = client_->GetCommandBufferHelper(); - DCHECK(helper); - - for (uint32_t texture_idx = 0; texture_idx < textures_per_picture; - texture_idx++) { - // Usage flags to allow the display compositor to draw from it, video - // to decode, and allow webgl/canvas access. - constexpr uint32_t shared_image_usage = - gpu::SHARED_IMAGE_USAGE_VIDEO_DECODE | gpu::SHARED_IMAGE_USAGE_GLES2 | - gpu::SHARED_IMAGE_USAGE_RASTER | gpu::SHARED_IMAGE_USAGE_DISPLAY | - gpu::SHARED_IMAGE_USAGE_SCANOUT; - - // Create a shared image - // TODO(crbug.com/1011555): Need key shared mutex if shared image is ever - // used by another device. - scoped_refptr gl_texture = - gpu::gles2::TexturePassthrough::CheckedCast(helper->GetTexture( - picture_buffer->service_texture_ids()[texture_idx])); - - // Create a new shared image mailbox. The existing mailbox belonging to - // this |picture_buffer| will be updated when the video frame is created. - const auto& mailbox = gpu::Mailbox::GenerateForSharedImage(); - - auto shared_image = std::make_unique( - mailbox, viz_formats[texture_idx], - picture_buffer->texture_size(texture_idx), - picture_buffer->color_space(), kTopLeft_GrSurfaceOrigin, - kPremul_SkAlphaType, shared_image_usage, - /*swap_chain=*/nullptr, std::move(gl_texture), - picture_buffer->gl_image(), - /*buffer_index=*/0, gl_image_dxgi->texture(), - base::win::ScopedHandle(), - /*dxgi_keyed_mutex=*/nullptr); - - // Caller is assumed to provide cleared d3d textures. - shared_image->SetCleared(); - - gpu::SharedImageStub* shared_image_stub = client_->GetSharedImageStub(); - DCHECK(shared_image_stub); - const bool success = shared_image_stub->factory()->RegisterBacking( - std::move(shared_image), /* legacy_mailbox */ true); - if (!success) { - RETURN_AND_NOTIFY_ON_FAILURE(false, "Failed to register shared image", - PLATFORM_FAILURE, ); - } - - auto destroy_shared_image_callback = base::BindPostTask( - main_thread_task_runner_, - base::BindOnce( - shared_image_stub->GetSharedImageDestructionCallback(mailbox), - gpu::SyncToken())); - - // Wrap the factory ref with a scoped shared image. The factory ref - // is used instead of requiring a destruction call-back. - auto scoped_shared_image = - base::MakeRefCounted( - mailbox, GetTextureTarget(), - std::move(destroy_shared_image_callback)); - - scoped_shared_images.push_back(std::move(scoped_shared_image)); - } - } - NotifyPictureReady( picture_buffer->id(), input_buffer_id, picture_buffer->visible_rect(), - picture_buffer->color_space(), picture_buffer->AllowOverlay(), - std::move(scoped_shared_images)); + picture_buffer->color_space(), picture_buffer->AllowOverlay()); { base::AutoLock lock(decoder_lock_); diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.h b/media/gpu/windows/dxva_video_decode_accelerator_win.h index 34be05ec8219cc..35f9278adbc3e0 100644 --- a/media/gpu/windows/dxva_video_decode_accelerator_win.h +++ b/media/gpu/windows/dxva_video_decode_accelerator_win.h @@ -112,7 +112,6 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator const scoped_refptr& decode_task_runner) override; GLenum GetSurfaceInternalFormat() const override; - bool SupportsSharedImagePictureBuffers() const override; static VideoDecodeAccelerator::SupportedProfiles GetSupportedProfiles( const gpu::GpuPreferences& gpu_preferences, @@ -270,9 +269,7 @@ class MEDIA_GPU_EXPORT DXVAVideoDecodeAccelerator int input_buffer_id, const gfx::Rect& visible_rect, const gfx::ColorSpace& color_space, - bool allow_overlay, - std::vector> - shared_images = {}); + bool allow_overlay); // Sends pending input buffer processed acks to the client if we don't have // output samples waiting to be processed. diff --git a/media/renderers/paint_canvas_video_renderer.cc b/media/renderers/paint_canvas_video_renderer.cc index 0ca47503b90474..62371d1314957f 100644 --- a/media/renderers/paint_canvas_video_renderer.cc +++ b/media/renderers/paint_canvas_video_renderer.cc @@ -978,7 +978,6 @@ void PaintCanvasVideoRenderer::Paint( cc::PaintFlags video_flags; video_flags.setAlpha(flags.getAlpha()); video_flags.setBlendMode(flags.getBlendMode()); - video_flags.setFilterQuality(flags.getFilterQuality()); const bool need_rotation = video_transformation.rotation != VIDEO_ROTATION_0; const bool need_scaling = @@ -1044,11 +1043,13 @@ void PaintCanvasVideoRenderer::Paint( canvas->drawImageRect(image, gfx::RectToSkRect(video_frame->visible_rect()), SkRect::MakeWH(video_frame->visible_rect().width(), video_frame->visible_rect().height()), + SkSamplingOptions(flags.getFilterQuality()), &video_flags, SkCanvas::kStrict_SrcRectConstraint); } else { DCHECK_EQ(video_frame->visible_rect().size(), gfx::Size(image.width(), image.height())); - canvas->drawImage(image, 0, 0, &video_flags); + canvas->drawImage(image, 0, 0, SkSamplingOptions(flags.getFilterQuality()), + &video_flags); } if (need_transform) diff --git a/media/video/picture.cc b/media/video/picture.cc index 8e191581d5d045..5763f3b412990f 100644 --- a/media/video/picture.cc +++ b/media/video/picture.cc @@ -53,37 +53,17 @@ PictureBuffer::PictureBuffer(int32_t id, DCHECK_EQ(client_texture_ids.size(), texture_mailboxes.size()); } -PictureBuffer::PictureBuffer(int32_t id, - const gfx::Size& size, - const TextureSizes& texture_sizes, - const TextureIds& client_texture_ids, - const TextureIds& service_texture_ids, - uint32_t texture_target, - VideoPixelFormat pixel_format) - : id_(id), - size_(size), - texture_sizes_(texture_sizes), - client_texture_ids_(client_texture_ids), - service_texture_ids_(service_texture_ids), - texture_target_(texture_target), - pixel_format_(pixel_format) { - // We either not have client texture ids at all, or if we do, then their - // number must be the same as the number of service texture ids. - DCHECK(client_texture_ids_.empty() || - client_texture_ids_.size() == service_texture_ids_.size()); -} - PictureBuffer::PictureBuffer(const PictureBuffer& other) = default; PictureBuffer::~PictureBuffer() = default; -gfx::Size PictureBuffer::texture_size(size_t plane) const { - if (plane >= texture_sizes_.size()) { - LOG(ERROR) << "Missing texture size for plane " << plane; - return gfx::Size(); +gpu::Mailbox PictureBuffer::texture_mailbox(size_t plane) const { + if (plane >= texture_mailboxes_.size()) { + LOG(ERROR) << "No mailbox for plane " << plane; + return gpu::Mailbox(); } - return texture_sizes_[plane]; + return texture_mailboxes_[plane]; } Picture::Picture(int32_t picture_buffer_id, diff --git a/media/video/picture.h b/media/video/picture.h index 0b2173d5d0bff4..3ec0a1f8107e2f 100644 --- a/media/video/picture.h +++ b/media/video/picture.h @@ -13,7 +13,6 @@ #include "base/memory/ref_counted.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/media_export.h" -#include "media/base/video_frame.h" #include "media/base/video_types.h" #include "ui/gfx/color_space.h" #include "ui/gfx/geometry/rect.h" @@ -26,7 +25,6 @@ namespace media { class MEDIA_EXPORT PictureBuffer { public: using TextureIds = std::vector; - using TextureSizes = std::vector; PictureBuffer(int32_t id, const gfx::Size& size); PictureBuffer(int32_t id, @@ -44,13 +42,6 @@ class MEDIA_EXPORT PictureBuffer { const std::vector& texture_mailboxes, uint32_t texture_target, VideoPixelFormat pixel_format); - PictureBuffer(int32_t id, - const gfx::Size& size, - const TextureSizes& texture_sizes, - const TextureIds& client_texture_ids, - const TextureIds& service_texture_ids, - uint32_t texture_target, - VideoPixelFormat pixel_format); PictureBuffer(const PictureBuffer& other); ~PictureBuffer(); @@ -73,12 +64,11 @@ class MEDIA_EXPORT PictureBuffer { VideoPixelFormat pixel_format() const { return pixel_format_; } - gfx::Size texture_size(size_t plane) const; + gpu::Mailbox texture_mailbox(size_t plane) const; private: int32_t id_; gfx::Size size_; - TextureSizes texture_sizes_; TextureIds client_texture_ids_; TextureIds service_texture_ids_; std::vector texture_mailboxes_; @@ -161,16 +151,11 @@ class MEDIA_EXPORT Picture { } void set_scoped_shared_image( - scoped_refptr scoped_shared_image, - uint32_t plane = 0) { - DCHECK(plane < scoped_shared_images_.size()); - scoped_shared_images_[plane] = scoped_shared_image; + scoped_refptr scoped_shared_image) { + scoped_shared_image_ = scoped_shared_image; } - - scoped_refptr scoped_shared_image( - uint32_t plane = 0) const { - DCHECK(plane < scoped_shared_images_.size()); - return scoped_shared_images_[plane]; + scoped_refptr scoped_shared_image() const { + return scoped_shared_image_; } private: @@ -183,8 +168,7 @@ class MEDIA_EXPORT Picture { bool size_changed_; bool texture_owner_; bool wants_promotion_hint_; - std::array, VideoFrame::kMaxPlanes> - scoped_shared_images_; + scoped_refptr scoped_shared_image_; }; } // namespace media diff --git a/media/video/video_decode_accelerator.cc b/media/video/video_decode_accelerator.cc index c7a506de59b741..b15a8aa2adbf57 100644 --- a/media/video/video_decode_accelerator.cc +++ b/media/video/video_decode_accelerator.cc @@ -71,11 +71,6 @@ gpu::SharedImageStub* VideoDecodeAccelerator::Client::GetSharedImageStub() return nullptr; } -CommandBufferHelper* VideoDecodeAccelerator::Client::GetCommandBufferHelper() - const { - return nullptr; -} - VideoDecodeAccelerator::~VideoDecodeAccelerator() = default; void VideoDecodeAccelerator::Decode(scoped_refptr buffer, diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index 3d861342323d6d..8f712d8b0a196d 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -38,8 +38,6 @@ class SharedImageStub; namespace media { -class CommandBufferHelper; - // Video decoder interface. // This interface is extended by the various components that ultimately // implement the backend of PPB_VideoDecoder_Dev. @@ -264,10 +262,6 @@ class MEDIA_EXPORT VideoDecodeAccelerator { // Default implementation returns nullptr. virtual gpu::SharedImageStub* GetSharedImageStub() const; - // Return the CommandBufferHelper through which GL passthrough textures may - // be created. Default implementation returns nullptr. - virtual CommandBufferHelper* GetCommandBufferHelper() const; - protected: virtual ~Client() {} }; diff --git a/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.cc b/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.cc index 35a58b2dcd2af4..62b78885b2a2a6 100644 --- a/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.cc +++ b/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.cc @@ -18,10 +18,11 @@ namespace { void DrawInternal(cc::PaintCanvas* canvas, const FloatRect& dest_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, const PaintFlags& flags, Image::ImageClampingMode clamping_mode, const PaintImage& image) { - canvas->drawImageRect(image, src_rect, dest_rect, &flags, + canvas->drawImageRect(image, src_rect, dest_rect, sampling, &flags, WebCoreClampingModeToSkiaRectConstraint(clamping_mode)); } } // namespace @@ -30,16 +31,19 @@ void PaintWorkletDeferredImage::Draw(cc::PaintCanvas* canvas, const PaintFlags& flags, const FloatRect& dest_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, RespectImageOrientationEnum, ImageClampingMode clamping_mode, ImageDecodingMode) { - DrawInternal(canvas, dest_rect, src_rect, flags, clamping_mode, image_); + DrawInternal(canvas, dest_rect, src_rect, sampling, flags, clamping_mode, + image_); } void PaintWorkletDeferredImage::DrawTile(GraphicsContext& context, const FloatRect& src_rect, RespectImageOrientationEnum) { - DrawInternal(context.Canvas(), FloatRect(), src_rect, context.FillFlags(), + DrawInternal(context.Canvas(), FloatRect(), src_rect, + context.ImageSamplingOptions(), context.FillFlags(), kClampImageToSourceRect, image_); } diff --git a/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.h b/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.h index d82c56208fef13..ecccd20e76c88f 100644 --- a/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.h +++ b/third_party/blink/renderer/core/css/cssom/paint_worklet_deferred_image.h @@ -35,6 +35,7 @@ class CORE_EXPORT PaintWorkletDeferredImage : public GeneratedImage { const cc::PaintFlags&, const FloatRect&, const FloatRect&, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc index 0a846acb3293a7..01cf79e21a9599 100644 --- a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc +++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc @@ -323,7 +323,8 @@ scoped_refptr FlipImageVertically( canvas->translate(0, -input->height()); cc::PaintFlags paint; paint.setBlendMode(SkBlendMode::kSrc); - canvas->drawImage(input->PaintImageForCurrentFrame(), 0, 0, &paint); + canvas->drawImage(input->PaintImageForCurrentFrame(), 0, 0, + SkSamplingOptions(), &paint); return resource_provider->Snapshot(input->CurrentFrameOrientation()); } @@ -355,7 +356,7 @@ scoped_refptr GetImageWithAlphaDisposition( cc::PaintFlags paint; paint.setBlendMode(SkBlendMode::kSrc); resource_provider->Canvas()->drawImage(image->PaintImageForCurrentFrame(), - 0, 0, &paint); + 0, 0, SkSamplingOptions(), &paint); return resource_provider->Snapshot(image->CurrentFrameOrientation()); } @@ -392,14 +393,13 @@ scoped_refptr ScaleImage( CreateProvider(image->ContextProviderWrapper(), image_info, image, false /* fallback_to_software */); if (resource_provider) { - cc::PaintFlags paint; - paint.setFilterQuality(parsed_options.resize_quality); + SkSamplingOptions sampling(parsed_options.resize_quality); resource_provider->Canvas()->drawImageRect( image->PaintImageForCurrentFrame(), SkRect::MakeWH(src_image_info.width(), src_image_info.height()), SkRect::MakeWH(parsed_options.resize_width, parsed_options.resize_height), - &paint, SkCanvas::kStrict_SrcRectConstraint); + sampling, nullptr, SkCanvas::kStrict_SrcRectConstraint); return resource_provider->Snapshot(image->CurrentFrameOrientation()); } } @@ -487,13 +487,12 @@ static scoped_refptr CropImageAndApplyColorSpaceConversion( true /* fallback_to_software*/); if (!resource_provider) return nullptr; - cc::PaintFlags paint; - resource_provider->Canvas()->drawImageRect( - paint_image, - SkRect::MakeXYWH(src_rect.X(), src_rect.Y(), src_rect.Width(), - src_rect.Height()), - SkRect::MakeWH(src_rect.Width(), src_rect.Height()), &paint, - SkCanvas::kStrict_SrcRectConstraint); + cc::PaintCanvas* canvas = resource_provider->Canvas(); + canvas->drawImageRect(paint_image, + SkRect::MakeXYWH(src_rect.X(), src_rect.Y(), + src_rect.Width(), src_rect.Height()), + SkRect::MakeWH(src_rect.Width(), src_rect.Height()), + SkCanvas::kStrict_SrcRectConstraint); result = resource_provider->Snapshot(image->CurrentFrameOrientation()); } @@ -978,7 +977,7 @@ ScriptPromise ImageBitmap::CreateAsync(ImageElementBase* image, SVGImageForContainer::Create(To(input.get()), FloatSize(input_rect.Size()), 1, NullURL()) ->Draw(canvas, cc::PaintFlags(), FloatRect(draw_dst_rect), - FloatRect(draw_src_rect), + FloatRect(draw_src_rect), SkSamplingOptions(), // The following will all be ignored. kRespectImageOrientation, Image::kDoNotClampImageToSourceRect, Image::kSyncDecode); diff --git a/third_party/blink/renderer/core/layout/shapes/shape.cc b/third_party/blink/renderer/core/layout/shapes/shape.cc index 5eafd64713aee3..ace00d2eab04b2 100644 --- a/third_party/blink/renderer/core/layout/shapes/shape.cc +++ b/third_party/blink/renderer/core/layout/shapes/shape.cc @@ -277,8 +277,8 @@ static bool ExtractImageData(Image* image, SkiaPaintCanvas canvas(surface->getCanvas()); canvas.clear(SK_ColorTRANSPARENT); image->Draw(&canvas, flags, FloatRect(image_dest_rect), image_source_rect, - respect_orientation, Image::kDoNotClampImageToSourceRect, - Image::kSyncDecode); + SkSamplingOptions(), respect_orientation, + Image::kDoNotClampImageToSourceRect, Image::kSyncDecode); return true; } diff --git a/third_party/blink/renderer/core/page/drag_image_test.cc b/third_party/blink/renderer/core/page/drag_image_test.cc index 6a2c5d59475455..22b4631e12cf4f 100644 --- a/third_party/blink/renderer/core/page/drag_image_test.cc +++ b/third_party/blink/renderer/core/page/drag_image_test.cc @@ -70,6 +70,7 @@ class TestImage : public Image { const cc::PaintFlags&, const FloatRect&, const FloatRect&, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override { diff --git a/third_party/blink/renderer/core/svg/graphics/svg_image.cc b/third_party/blink/renderer/core/svg/graphics/svg_image.cc index a5b61b0bb9d190..0a388732479964 100644 --- a/third_party/blink/renderer/core/svg/graphics/svg_image.cc +++ b/third_party/blink/renderer/core/svg/graphics/svg_image.cc @@ -495,6 +495,7 @@ void SVGImage::Draw(cc::PaintCanvas* canvas, const PaintFlags& flags, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) { diff --git a/third_party/blink/renderer/core/svg/graphics/svg_image.h b/third_party/blink/renderer/core/svg/graphics/svg_image.h index 4a1b722ef37ef3..6a675aab80e6cf 100644 --- a/third_party/blink/renderer/core/svg/graphics/svg_image.h +++ b/third_party/blink/renderer/core/svg/graphics/svg_image.h @@ -161,6 +161,7 @@ class CORE_EXPORT SVGImage final : public Image { const cc::PaintFlags&, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.cc b/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.cc index e9d6574ca0c1bf..9814e891f269cf 100644 --- a/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.cc +++ b/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.cc @@ -35,6 +35,7 @@ void SVGImageForContainer::Draw(cc::PaintCanvas* canvas, const cc::PaintFlags& flags, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) { diff --git a/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.h b/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.h index 27490a437c5136..a69c124303578e 100644 --- a/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.h +++ b/third_party/blink/renderer/core/svg/graphics/svg_image_for_container.h @@ -80,6 +80,7 @@ class CORE_EXPORT SVGImageForContainer final : public Image { const cc::PaintFlags&, const FloatRect&, const FloatRect&, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/core/svg/graphics/svg_image_test.cc b/third_party/blink/renderer/core/svg/graphics/svg_image_test.cc index 7c41a7aeb35434..3cd3299501885e 100644 --- a/third_party/blink/renderer/core/svg/graphics/svg_image_test.cc +++ b/third_party/blink/renderer/core/svg/graphics/svg_image_test.cc @@ -60,7 +60,7 @@ class SVGImageTest : public testing::Test, private ScopedMockOverlayScrollbars { SkiaPaintCanvas canvas(null_canvas.get()); PaintFlags flags; FloatRect dummy_rect(0, 0, 100, 100); - image->Draw(&canvas, flags, dummy_rect, dummy_rect, + image->Draw(&canvas, flags, dummy_rect, dummy_rect, SkSamplingOptions(), kRespectImageOrientation, Image::kDoNotClampImageToSourceRect, Image::kSyncDecode); } diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc index 6979afbe446e8e..511c5643482684 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc @@ -1154,12 +1154,14 @@ bool BaseRenderingContext2D::ShouldDrawImageAntialiased( dest_rect.Height() * fabs(height_expansion) < 1; } -void BaseRenderingContext2D::DrawImageInternal(cc::PaintCanvas* c, - CanvasImageSource* image_source, - Image* image, - const FloatRect& src_rect, - const FloatRect& dst_rect, - const PaintFlags* flags) { +void BaseRenderingContext2D::DrawImageInternal( + cc::PaintCanvas* c, + CanvasImageSource* image_source, + Image* image, + const FloatRect& src_rect, + const FloatRect& dst_rect, + const SkSamplingOptions& sampling, + const PaintFlags* flags) { int initial_save_count = c->getSaveCount(); PaintFlags image_flags = *flags; @@ -1209,7 +1211,7 @@ void BaseRenderingContext2D::DrawImageInternal(cc::PaintCanvas* c, image->SizeAsFloat(kRespectImageOrientation), src_rect); } image_flags.setAntiAlias(ShouldDrawImageAntialiased(dst_rect)); - image->Draw(c, image_flags, dst_rect, corrected_src_rect, + image->Draw(c, image_flags, dst_rect, corrected_src_rect, sampling, respect_orientation, Image::kDoNotClampImageToSourceRect, Image::kSyncDecode); } else { @@ -1309,8 +1311,11 @@ void BaseRenderingContext2D::drawImage(ScriptState* script_state, [this, &image_source, &image, &src_rect, dst_rect]( cc::PaintCanvas* c, const PaintFlags* flags) // draw lambda { + SkSamplingOptions sampling( + flags ? flags->getFilterQuality() : kNone_SkFilterQuality, + SkSamplingOptions::kMedium_asMipmapLinear); DrawImageInternal(c, image_source, image.get(), src_rect, dst_rect, - flags); + sampling, flags); }, [this, &dst_rect](const SkIRect& clip_bounds) // overdraw test lambda { return RectContainsTransformedRect(dst_rect, clip_bounds); }, diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h index 57291ae0ce219c..d18a41b60b1224 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h @@ -454,6 +454,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, Image*, const FloatRect& src_rect, const FloatRect& dst_rect, + const SkSamplingOptions&, const PaintFlags*); void ClipInternal(const Path&, const String& winding_rule_string); diff --git a/third_party/blink/renderer/modules/canvas/imagebitmap/image_bitmap_rendering_context_base.cc b/third_party/blink/renderer/modules/canvas/imagebitmap/image_bitmap_rendering_context_base.cc index 4b94289ec1650e..6d57d4e62e183a 100644 --- a/third_party/blink/renderer/modules/canvas/imagebitmap/image_bitmap_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/canvas/imagebitmap/image_bitmap_rendering_context_base.cc @@ -109,7 +109,8 @@ bool ImageBitmapRenderingContextBase::PushFrame() { cc::PaintFlags paint_flags; paint_flags.setBlendMode(SkBlendMode::kSrc); Host()->ResourceProvider()->Canvas()->drawImage( - image->PaintImageForCurrentFrame(), 0, 0, &paint_flags); + image->PaintImageForCurrentFrame(), 0, 0, SkSamplingOptions(), + &paint_flags); scoped_refptr resource = Host()->ResourceProvider()->ProduceCanvasResource(); Host()->PushFrame( diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc index 7e73707405c2d4..36bfc3a3ac77bf 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc @@ -1847,7 +1847,7 @@ bool WebGLRenderingContextBase::CopyRenderingResultsFromDrawingBuffer( cc::PaintFlags paint_flags; paint_flags.setBlendMode(SkBlendMode::kSrc); resource_provider->Canvas()->drawImage(image->PaintImageForCurrentFrame(), 0, - 0, &paint_flags); + 0, SkSamplingOptions(), &paint_flags); return true; } @@ -5248,8 +5248,9 @@ scoped_refptr WebGLRenderingContextBase::DrawImageIntoBuffer( // TODO(ccameron): WebGL should produce sRGB images. // https://crbug.com/672299 image->Draw(resource_provider->Canvas(), flags, FloatRect(dest_rect), - FloatRect(src_rect), kRespectImageOrientation, - Image::kDoNotClampImageToSourceRect, Image::kSyncDecode); + FloatRect(src_rect), SkSamplingOptions(), + kRespectImageOrientation, Image::kDoNotClampImageToSourceRect, + Image::kSyncDecode); return resource_provider->Snapshot(); } diff --git a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.cc index 76058e13ac69c2..0780c1ef2c0580 100644 --- a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.cc +++ b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.cc @@ -171,6 +171,7 @@ void AcceleratedStaticBitmapImage::Draw( const cc::PaintFlags& flags, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, RespectImageOrientationEnum should_respect_image_orientation, ImageClampingMode image_clamping_mode, ImageDecodingMode decode_mode) { @@ -184,7 +185,7 @@ void AcceleratedStaticBitmapImage::Draw( .set_decoding_mode(paint_image_decoding_mode) .TakePaintImage(); } - StaticBitmapImage::DrawHelper(canvas, flags, dst_rect, src_rect, + StaticBitmapImage::DrawHelper(canvas, flags, dst_rect, src_rect, sampling, image_clamping_mode, should_respect_image_orientation, paint_image); } @@ -368,7 +369,7 @@ AcceleratedStaticBitmapImage::ConvertToColorSpace( return nullptr; } - provider->Canvas()->drawImage(PaintImageForCurrentFrame(), 0, 0, nullptr); + provider->Canvas()->drawImage(PaintImageForCurrentFrame(), 0, 0); return provider->Snapshot(orientation_); } diff --git a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h index 8ed9660db5b83f..533484369e45cd 100644 --- a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image.h @@ -81,6 +81,7 @@ class PLATFORM_EXPORT AcceleratedStaticBitmapImage final const cc::PaintFlags&, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image.cc b/third_party/blink/renderer/platform/graphics/bitmap_image.cc index d3518d06ad1404..d1e33d3d96f69c 100644 --- a/third_party/blink/renderer/platform/graphics/bitmap_image.cc +++ b/third_party/blink/renderer/platform/graphics/bitmap_image.cc @@ -259,6 +259,7 @@ void BitmapImage::Draw( const PaintFlags& flags, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, RespectImageOrientationEnum should_respect_image_orientation, ImageClampingMode clamp_mode, ImageDecodingMode decode_mode) { @@ -317,7 +318,7 @@ void BitmapImage::Draw( uint32_t stable_id = image.stable_id(); bool is_lazy_generated = image.IsLazyGenerated(); canvas->drawImageRect(std::move(image), adjusted_src_rect, adjusted_dst_rect, - &flags, + sampling, &flags, WebCoreClampingModeToSkiaRectConstraint(clamp_mode)); if (is_lazy_generated) { diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image.h b/third_party/blink/renderer/platform/graphics/bitmap_image.h index 0084c5998ff9e5..0431630fdcf035 100644 --- a/third_party/blink/renderer/platform/graphics/bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/bitmap_image.h @@ -131,6 +131,7 @@ class PLATFORM_EXPORT BitmapImage final : public Image { const cc::PaintFlags&, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc b/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc index 3c93967b85ec24..3160e012c17f68 100644 --- a/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc +++ b/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc @@ -92,7 +92,7 @@ void GenerateBitmapForPaintImage(cc::PaintImage paint_image, bitmap->eraseColor(SK_AlphaTRANSPARENT); FrameSettingImageProvider image_provider(frame_index, client_id); cc::SkiaPaintCanvas canvas(*bitmap, &image_provider); - canvas.drawImage(paint_image, 0u, 0u, nullptr); + canvas.drawImage(paint_image, 0u, 0u); } } // namespace @@ -187,7 +187,7 @@ class BitmapImageTest : public testing::Test { bitmap.allocPixels(info, image->Size().Width() * 4); bitmap.eraseColor(SK_AlphaTRANSPARENT); cc::SkiaPaintCanvas canvas(bitmap); - canvas.drawImage(paint_image, 0u, 0u, nullptr); + canvas.drawImage(paint_image, 0u, 0u); return bitmap; } diff --git a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc index d4353e71cf46a0..1179b83546002c 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc +++ b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc @@ -827,10 +827,10 @@ TEST_F(Canvas2DLayerBridgeTest, EnsureCCImageCacheUse) { SkIRect::MakeWH(5, 5), kNone_SkFilterQuality, SkMatrix::I(), 0u, expected_color_space)}; - bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u, nullptr); + bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u); bridge->GetPaintCanvas()->drawImageRect( images[1].paint_image(), SkRect::MakeWH(5u, 5u), SkRect::MakeWH(5u, 5u), - nullptr, SkCanvas::kFast_SrcRectConstraint); + SkCanvas::kFast_SrcRectConstraint); bridge->NewImageSnapshot(); EXPECT_EQ(image_decode_cache_.decoded_images(), images); @@ -849,10 +849,10 @@ TEST_F(Canvas2DLayerBridgeTest, EnsureCCImageCacheUseWithColorConversion) { SkIRect::MakeWH(5, 5), kNone_SkFilterQuality, SkMatrix::I(), 0u, color_params.GetStorageGfxColorSpace())}; - bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u, nullptr); + bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u); bridge->GetPaintCanvas()->drawImageRect( images[1].paint_image(), SkRect::MakeWH(5u, 5u), SkRect::MakeWH(5u, 5u), - nullptr, SkCanvas::kFast_SrcRectConstraint); + SkCanvas::kFast_SrcRectConstraint); bridge->NewImageSnapshot(); EXPECT_EQ(image_decode_cache_.decoded_images(), images); @@ -876,15 +876,15 @@ TEST_F(Canvas2DLayerBridgeTest, ImagesLockedUntilCacheLimit) { 0u, color_params.GetStorageGfxColorSpace())}; // First 2 images are budgeted, they should remain locked after the op. - bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u, nullptr); - bridge->GetPaintCanvas()->drawImage(images[1].paint_image(), 0u, 0u, nullptr); + bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u); + bridge->GetPaintCanvas()->drawImage(images[1].paint_image(), 0u, 0u); bridge->GetOrCreateResourceProvider()->FlushCanvas(); EXPECT_EQ(image_decode_cache_.num_locked_images(), 2); // Next image is not budgeted, we should unlock all images other than the last // image. image_decode_cache_.set_budget_exceeded(true); - bridge->GetPaintCanvas()->drawImage(images[2].paint_image(), 0u, 0u, nullptr); + bridge->GetPaintCanvas()->drawImage(images[2].paint_image(), 0u, 0u); bridge->GetOrCreateResourceProvider()->FlushCanvas(); EXPECT_EQ(image_decode_cache_.num_locked_images(), 1); @@ -903,7 +903,7 @@ TEST_F(Canvas2DLayerBridgeTest, QueuesCleanupTaskForLockedImages) { cc::DrawImage(cc::CreateDiscardablePaintImage(gfx::Size(10, 10)), false, SkIRect::MakeWH(10, 10), kNone_SkFilterQuality, SkMatrix::I(), 0u, color_params.GetStorageGfxColorSpace()); - bridge->GetPaintCanvas()->drawImage(image.paint_image(), 0u, 0u, nullptr); + bridge->GetPaintCanvas()->drawImage(image.paint_image(), 0u, 0u); bridge->GetOrCreateResourceProvider()->FlushCanvas(); EXPECT_EQ(image_decode_cache_.num_locked_images(), 1); @@ -917,7 +917,6 @@ TEST_F(Canvas2DLayerBridgeTest, ImageCacheOnContextLost) { CanvasPixelFormat::kF16, kOpaque); std::unique_ptr bridge = MakeBridge(IntSize(300, 300), RasterMode::kGPU, color_params); - PaintFlags flags; Vector images = { cc::DrawImage(cc::CreateDiscardablePaintImage(gfx::Size(10, 10)), false, SkIRect::MakeWH(10, 10), kNone_SkFilterQuality, @@ -925,14 +924,14 @@ TEST_F(Canvas2DLayerBridgeTest, ImageCacheOnContextLost) { cc::DrawImage(cc::CreateDiscardablePaintImage(gfx::Size(20, 20)), false, SkIRect::MakeWH(5, 5), kNone_SkFilterQuality, SkMatrix::I(), 0u, color_params.GetStorageGfxColorSpace())}; - bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u, nullptr); + bridge->GetPaintCanvas()->drawImage(images[0].paint_image(), 0u, 0u); // Lose the context and ensure that the image provider is not used. bridge->GetOrCreateResourceProvider()->OnContextDestroyed(); // We should unref all images on the cache when the context is destroyed. EXPECT_EQ(image_decode_cache_.num_locked_images(), 0); image_decode_cache_.set_disallow_cache_use(true); - bridge->GetPaintCanvas()->drawImage(images[1].paint_image(), 0u, 0u, &flags); + bridge->GetPaintCanvas()->drawImage(images[1].paint_image(), 0u, 0u); } TEST_F(Canvas2DLayerBridgeTest, diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource_provider.cc b/third_party/blink/renderer/platform/graphics/canvas_resource_provider.cc index 358c070c86ae79..985ec7aa8188f0 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_resource_provider.cc +++ b/third_party/blink/renderer/platform/graphics/canvas_resource_provider.cc @@ -1493,7 +1493,7 @@ void CanvasResourceProvider::RestoreBackBuffer(const cc::PaintImage& image) { EnsureSkiaCanvas(); cc::PaintFlags copy_paint; copy_paint.setBlendMode(SkBlendMode::kSrc); - skia_canvas_->drawImage(image, 0, 0, ©_paint); + skia_canvas_->drawImage(image, 0, 0, SkSamplingOptions(), ©_paint); } bool CanvasResourceProvider::HasRecordedDrawOps() const { diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource_provider_test.cc b/third_party/blink/renderer/platform/graphics/canvas_resource_provider_test.cc index 16093c69e12d3d..d33fa4ae1c460b 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_resource_provider_test.cc +++ b/third_party/blink/renderer/platform/graphics/canvas_resource_provider_test.cc @@ -558,8 +558,7 @@ TEST_F(CanvasResourceProviderTest, FlushForImage) { EXPECT_FALSE(dst_canvas->IsCachingImage(src_content_id)); - cc::PaintFlags flags; - dst_canvas->drawImage(paint_image, 0, 0, &flags); + dst_canvas->drawImage(paint_image, 0, 0, SkSamplingOptions(), nullptr); EXPECT_TRUE(dst_canvas->IsCachingImage(src_content_id)); diff --git a/third_party/blink/renderer/platform/graphics/crossfade_generated_image.cc b/third_party/blink/renderer/platform/graphics/crossfade_generated_image.cc index 07120a411b4540..ad7135d04662b7 100644 --- a/third_party/blink/renderer/platform/graphics/crossfade_generated_image.cc +++ b/third_party/blink/renderer/platform/graphics/crossfade_generated_image.cc @@ -45,6 +45,7 @@ CrossfadeGeneratedImage::CrossfadeGeneratedImage( void CrossfadeGeneratedImage::DrawCrossfade( cc::PaintCanvas* canvas, + const SkSamplingOptions& sampling, const PaintFlags& flags, RespectImageOrientationEnum respect_orientation, ImageClampingMode clamp_mode, @@ -69,11 +70,11 @@ void CrossfadeGeneratedImage::DrawCrossfade( // RespectImageOrientationEnum from CrossfadeGeneratedImage::draw(). Code was // written this way during refactoring to avoid modifying existing behavior, // but this warrants further investigation. crbug.com/472634 - from_image_->Draw(canvas, image_flags, dest_rect, from_image_rect, + from_image_->Draw(canvas, image_flags, dest_rect, from_image_rect, sampling, kDoNotRespectImageOrientation, clamp_mode, decode_mode); image_flags.setBlendMode(SkBlendMode::kPlus); image_flags.setColor(ScaleAlpha(flags.getColor(), percentage_)); - to_image_->Draw(canvas, image_flags, dest_rect, to_image_rect, + to_image_->Draw(canvas, image_flags, dest_rect, to_image_rect, sampling, respect_orientation, clamp_mode, decode_mode); } @@ -82,6 +83,7 @@ void CrossfadeGeneratedImage::Draw( const PaintFlags& flags, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, RespectImageOrientationEnum respect_orientation, ImageClampingMode clamp_mode, ImageDecodingMode decode_mode) { @@ -92,7 +94,8 @@ void CrossfadeGeneratedImage::Draw( PaintCanvasAutoRestore ar(canvas, true); canvas->clipRect(dst_rect); canvas->concat(SkMatrix::RectToRect(src_rect, dst_rect)); - DrawCrossfade(canvas, flags, respect_orientation, clamp_mode, decode_mode); + DrawCrossfade(canvas, sampling, flags, respect_orientation, clamp_mode, + decode_mode); } void CrossfadeGeneratedImage::DrawTile( @@ -106,10 +109,10 @@ void CrossfadeGeneratedImage::DrawTile( PaintFlags flags = context.FillFlags(); flags.setBlendMode(SkBlendMode::kSrcOver); FloatRect dest_rect((FloatPoint()), crossfade_size_); - flags.setFilterQuality( - context.ComputeFilterQuality(this, dest_rect, src_rect)); - DrawCrossfade(context.Canvas(), flags, respect_orientation, - kClampImageToSourceRect, kSyncDecode); + DrawCrossfade(context.Canvas(), + context.ComputeSamplingOptions(this, dest_rect, src_rect), + flags, respect_orientation, kClampImageToSourceRect, + kSyncDecode); } } // namespace blink diff --git a/third_party/blink/renderer/platform/graphics/crossfade_generated_image.h b/third_party/blink/renderer/platform/graphics/crossfade_generated_image.h index 17fb61c569276a..b98d2a5d50f888 100644 --- a/third_party/blink/renderer/platform/graphics/crossfade_generated_image.h +++ b/third_party/blink/renderer/platform/graphics/crossfade_generated_image.h @@ -56,6 +56,7 @@ class PLATFORM_EXPORT CrossfadeGeneratedImage final : public GeneratedImage { const cc::PaintFlags&, const FloatRect&, const FloatRect&, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; @@ -71,6 +72,7 @@ class PLATFORM_EXPORT CrossfadeGeneratedImage final : public GeneratedImage { private: void DrawCrossfade(cc::PaintCanvas*, + const SkSamplingOptions&, const cc::PaintFlags&, RespectImageOrientationEnum, ImageClampingMode, diff --git a/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc b/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc index 28dc1b0b6535dc..0b9a922727ffa0 100644 --- a/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc +++ b/third_party/blink/renderer/platform/graphics/gpu/image_layer_bridge.cc @@ -46,7 +46,7 @@ scoped_refptr MakeAccelerated( if (!provider || !provider->IsAccelerated()) return nullptr; - provider->Canvas()->drawImage(paint_image, 0, 0, nullptr); + provider->Canvas()->drawImage(paint_image, 0, 0); return provider->Snapshot(); } diff --git a/third_party/blink/renderer/platform/graphics/gradient_generated_image.cc b/third_party/blink/renderer/platform/graphics/gradient_generated_image.cc index 1d2fd6304a4d45..0e44fa9a12e330 100644 --- a/third_party/blink/renderer/platform/graphics/gradient_generated_image.cc +++ b/third_party/blink/renderer/platform/graphics/gradient_generated_image.cc @@ -35,6 +35,7 @@ void GradientGeneratedImage::Draw(cc::PaintCanvas* canvas, const PaintFlags& flags, const FloatRect& dest_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) { diff --git a/third_party/blink/renderer/platform/graphics/gradient_generated_image.h b/third_party/blink/renderer/platform/graphics/gradient_generated_image.h index 1467cd0514a42f..5a5aeb8054fea9 100644 --- a/third_party/blink/renderer/platform/graphics/gradient_generated_image.h +++ b/third_party/blink/renderer/platform/graphics/gradient_generated_image.h @@ -50,6 +50,7 @@ class PLATFORM_EXPORT GradientGeneratedImage final : public GeneratedImage { const PaintFlags&, const FloatRect&, const FloatRect&, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/platform/graphics/graphics_context.cc b/third_party/blink/renderer/platform/graphics/graphics_context.cc index 2b829924af24ac..45a55d8ea31560 100644 --- a/third_party/blink/renderer/platform/graphics/graphics_context.cc +++ b/third_party/blink/renderer/platform/graphics/graphics_context.cc @@ -313,7 +313,7 @@ void GraphicsContext::CompositeRecord(sk_sp record, PaintFlags flags; flags.setBlendMode(op); - flags.setFilterQuality( + SkSamplingOptions sampling( static_cast(ImageInterpolationQuality())); canvas_->save(); canvas_->concat(SkMatrix::RectToRect(src, dest)); @@ -322,7 +322,7 @@ void GraphicsContext::CompositeRecord(sk_sp record, PaintImage::GetNextContentId()) .set_id(PaintImage::GetNextId()) .TakePaintImage(), - 0, 0, &flags); + 0, 0, sampling, &flags); canvas_->restore(); } @@ -779,7 +779,6 @@ void GraphicsContext::DrawImage( PaintFlags image_flags = ImmutableState()->FillFlags(); image_flags.setBlendMode(op); image_flags.setColor(SK_ColorBLACK); - image_flags.setFilterQuality(ComputeFilterQuality(image, dest, src)); // Do not classify the image if the element has any CSS filters. if (!has_filter_property) { @@ -787,8 +786,10 @@ void GraphicsContext::DrawImage( dest); } - image->Draw(canvas_, image_flags, dest, src, should_respect_image_orientation, - Image::kClampImageToSourceRect, decode_mode); + image->Draw(canvas_, image_flags, dest, src, + ComputeSamplingOptions(image, dest, src), + should_respect_image_orientation, Image::kClampImageToSourceRect, + decode_mode); paint_controller_.SetImagePainted(); } @@ -816,11 +817,11 @@ void GraphicsContext::DrawImageRRect( if (dest.IsEmpty() || visible_src.IsEmpty()) return; + SkSamplingOptions sampling = + ComputeSamplingOptions(image, dest.Rect(), src_rect); PaintFlags image_flags = ImmutableState()->FillFlags(); image_flags.setBlendMode(op); image_flags.setColor(SK_ColorBLACK); - image_flags.setFilterQuality( - ComputeFilterQuality(image, dest.Rect(), src_rect)); DarkModeFilterHelper::ApplyToImageIfNeeded(this, image, &image_flags, src_rect, dest.Rect()); @@ -835,13 +836,18 @@ void GraphicsContext::DrawImageRRect( } if (use_shader) { + // Temporarily set filter-quality for the shader. + // Should be replaced with explicit sampling parameter passed to + // ApplyShader() + image_flags.setFilterQuality( + ComputeFilterQuality(image, dest.Rect(), src_rect)); // Shader-based fast path. canvas_->drawRRect(dest, image_flags); } else { // Clip-based fallback. PaintCanvasAutoRestore auto_restore(canvas_, true); canvas_->clipRRect(dest, image_flags.isAntiAlias()); - image->Draw(canvas_, image_flags, dest.Rect(), src_rect, + image->Draw(canvas_, image_flags, dest.Rect(), src_rect, sampling, respect_orientation, Image::kClampImageToSourceRect, decode_mode); } diff --git a/third_party/blink/renderer/platform/graphics/graphics_context.h b/third_party/blink/renderer/platform/graphics/graphics_context.h index 9c1bf44602aa50..d7d00cbb1a87df 100644 --- a/third_party/blink/renderer/platform/graphics/graphics_context.h +++ b/third_party/blink/renderer/platform/graphics/graphics_context.h @@ -157,6 +157,11 @@ class PLATFORM_EXPORT GraphicsContext { return ImmutableState()->GetInterpolationQuality(); } + SkSamplingOptions ImageSamplingOptions() const { + return SkSamplingOptions( + static_cast(ImageInterpolationQuality())); + } + // Specify the device scale factor which may change the way document markers // and fonts are rendered. void SetDeviceScaleFactor(float factor) { device_scale_factor_ = factor; } @@ -381,6 +386,12 @@ class PLATFORM_EXPORT GraphicsContext { const FloatRect& dest, const FloatRect& src) const; + SkSamplingOptions ComputeSamplingOptions(Image* image, + const FloatRect& dest, + const FloatRect& src) const { + return SkSamplingOptions(ComputeFilterQuality(image, dest, src)); + } + // Sets target URL of a clickable area. void SetURLForRect(const KURL&, const IntRect&); diff --git a/third_party/blink/renderer/platform/graphics/identifiability_paint_op_digest_unittest.cc b/third_party/blink/renderer/platform/graphics/identifiability_paint_op_digest_unittest.cc index e9262667aa5600..5f2bc3b0719f5e 100644 --- a/third_party/blink/renderer/platform/graphics/identifiability_paint_op_digest_unittest.cc +++ b/third_party/blink/renderer/platform/graphics/identifiability_paint_op_digest_unittest.cc @@ -425,11 +425,10 @@ TEST(IdentifiabilityPaintOpDigestTest, DigestImageOp) { IdentifiabilityPaintOpDigest identifiability_paintop_digest(kSize); auto paint_record = sk_make_sp(); paint_record->push( - cc::CreateDiscardablePaintImage(gfx::Size(10, 10)), 10.0f, 10.0f, - nullptr); + cc::CreateDiscardablePaintImage(gfx::Size(10, 10)), 10.0f, 10.0f); identifiability_paintop_digest.MaybeUpdateDigest(paint_record, /*num_ops_to_visit=*/1); - EXPECT_EQ(INT64_C(72317288461381383), + EXPECT_EQ(INT64_C(-3447989221783743109), identifiability_paintop_digest.GetToken().ToUkmMetricValue()); EXPECT_FALSE(identifiability_paintop_digest.encountered_skipped_ops()); diff --git a/third_party/blink/renderer/platform/graphics/image.cc b/third_party/blink/renderer/platform/graphics/image.cc index 4281c382acccbf..c8c5def0363ff7 100644 --- a/third_party/blink/renderer/platform/graphics/image.cc +++ b/third_party/blink/renderer/platform/graphics/image.cc @@ -179,7 +179,7 @@ namespace { sk_sp CreatePatternShader(const PaintImage& image, const SkMatrix& shader_matrix, - SkFilterQuality quality_to_use, + const SkSamplingOptions& sampling, bool should_antialias, const FloatSize& spacing, SkTileMode tmx, @@ -200,13 +200,12 @@ sk_sp CreatePatternShader(const PaintImage& image, cc::PaintCanvas* canvas = recorder.beginRecording(tile_rect); PaintFlags flags; flags.setAntiAlias(should_antialias); - flags.setFilterQuality(quality_to_use); canvas->drawImageRect( image, SkRect::MakeXYWH(subset_rect.X(), subset_rect.Y(), subset_rect.Width(), subset_rect.Height()), - SkRect::MakeWH(subset_rect.Width(), subset_rect.Height()), &flags, - SkCanvas::kStrict_SrcRectConstraint); + SkRect::MakeWH(subset_rect.Width(), subset_rect.Height()), sampling, + &flags, SkCanvas::kStrict_SrcRectConstraint); return PaintShader::MakePaintRecord(recorder.finishRecordingAsPicture(), tile_rect, tmx, tmy, &shader_matrix); @@ -279,10 +278,10 @@ void Image::DrawPattern(GraphicsContext& context, const auto tmy = ComputeTileMode(dest_rect.Y(), dest_rect.MaxY(), adjusted_y, adjusted_y + tile_size.Height()); - SkFilterQuality quality_to_use = - context.ComputeFilterQuality(this, dest_rect, FloatRect(subset_rect)); + SkSamplingOptions sampling_to_use = + context.ComputeSamplingOptions(this, dest_rect, FloatRect(subset_rect)); sk_sp tile_shader = CreatePatternShader( - image, local_matrix, quality_to_use, context.ShouldAntialias(), + image, local_matrix, sampling_to_use, context.ShouldAntialias(), FloatSize(repeat_spacing.Width() / oriented_scale.Width(), repeat_spacing.Height() / oriented_scale.Height()), tmx, tmy, subset_rect); @@ -293,7 +292,6 @@ void Image::DrawPattern(GraphicsContext& context, // Note: we can't simply bail, because of arbitrary blend mode. flags.setColor(tile_shader ? SK_ColorBLACK : SK_ColorTRANSPARENT); flags.setBlendMode(composite_op); - flags.setFilterQuality(quality_to_use); flags.setShader(std::move(tile_shader)); context.DrawRect(dest_rect, flags); diff --git a/third_party/blink/renderer/platform/graphics/image.h b/third_party/blink/renderer/platform/graphics/image.h index a497b13c6cdb1c..28bfbfb003beac 100644 --- a/third_party/blink/renderer/platform/graphics/image.h +++ b/third_party/blink/renderer/platform/graphics/image.h @@ -234,6 +234,7 @@ class PLATFORM_EXPORT Image : public ThreadSafeRefCounted { const cc::PaintFlags&, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) = 0; diff --git a/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.cc b/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.cc index 700112561d93fb..30a4717def56d4 100644 --- a/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.cc +++ b/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.cc @@ -18,9 +18,10 @@ MemoryManagedPaintCanvas::~MemoryManagedPaintCanvas() = default; void MemoryManagedPaintCanvas::drawImage(const cc::PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions& sampling, const cc::PaintFlags* flags) { DCHECK(!image.IsPaintWorklet()); - RecordPaintCanvas::drawImage(image, left, top, flags); + RecordPaintCanvas::drawImage(image, left, top, sampling, flags); UpdateMemoryUsage(image); } @@ -28,9 +29,11 @@ void MemoryManagedPaintCanvas::drawImageRect( const cc::PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions& sampling, const cc::PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) { - RecordPaintCanvas::drawImageRect(image, src, dst, flags, constraint); + RecordPaintCanvas::drawImageRect(image, src, dst, sampling, flags, + constraint); UpdateMemoryUsage(image); } diff --git a/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.h b/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.h index 2d2d17a8bd1612..2ca460f4e6900d 100644 --- a/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.h +++ b/third_party/blink/renderer/platform/graphics/memory_managed_paint_canvas.h @@ -31,10 +31,12 @@ class PLATFORM_EXPORT MemoryManagedPaintCanvas final void drawImage(const cc::PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions&, const cc::PaintFlags* flags) override; void drawImageRect(const cc::PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions&, const cc::PaintFlags* flags, SkCanvas::SrcRectConstraint constraint) override; diff --git a/third_party/blink/renderer/platform/graphics/paint_generated_image.cc b/third_party/blink/renderer/platform/graphics/paint_generated_image.cc index 8fa3e7b6e74503..34e0fa15deed59 100644 --- a/third_party/blink/renderer/platform/graphics/paint_generated_image.cc +++ b/third_party/blink/renderer/platform/graphics/paint_generated_image.cc @@ -15,6 +15,7 @@ void PaintGeneratedImage::Draw(cc::PaintCanvas* canvas, const PaintFlags& flags, const FloatRect& dest_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) { diff --git a/third_party/blink/renderer/platform/graphics/paint_generated_image.h b/third_party/blink/renderer/platform/graphics/paint_generated_image.h index 6978106580e850..b5a7b35157b500 100644 --- a/third_party/blink/renderer/platform/graphics/paint_generated_image.h +++ b/third_party/blink/renderer/platform/graphics/paint_generated_image.h @@ -25,6 +25,7 @@ class PLATFORM_EXPORT PaintGeneratedImage : public GeneratedImage { const cc::PaintFlags&, const FloatRect&, const FloatRect&, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/platform/graphics/placeholder_image.cc b/third_party/blink/renderer/platform/graphics/placeholder_image.cc index 4a7480b5b9fd3e..8b5c78df6e339e 100644 --- a/third_party/blink/renderer/platform/graphics/placeholder_image.cc +++ b/third_party/blink/renderer/platform/graphics/placeholder_image.cc @@ -53,6 +53,7 @@ void DrawIcon(cc::PaintCanvas* canvas, const PaintFlags& flags, float x, float y, + const SkSamplingOptions& sampling, float scale_factor) { // Note that |icon_image| will be a 0x0 image when running // blink_platform_unittests. @@ -67,18 +68,19 @@ void DrawIcon(cc::PaintCanvas* canvas, icon_image->PaintImageForCurrentFrame(), IntRect(IntPoint::Zero(), icon_image->Size()), FloatRect(x, y, scale_factor * kIconWidth, scale_factor * kIconHeight), - &flags, SkCanvas::kFast_SrcRectConstraint); + sampling, &flags, SkCanvas::kFast_SrcRectConstraint); } void DrawCenteredIcon(cc::PaintCanvas* canvas, const PaintFlags& flags, const FloatRect& dest_rect, + const SkSamplingOptions& sampling, float scale_factor) { DrawIcon( canvas, flags, dest_rect.X() + (dest_rect.Width() - scale_factor * kIconWidth) / 2.0f, dest_rect.Y() + (dest_rect.Height() - scale_factor * kIconHeight) / 2.0f, - scale_factor); + sampling, scale_factor); } FontDescription CreatePlaceholderFontDescription(float scale_factor) { @@ -248,8 +250,8 @@ PaintImage PlaceholderImage::PaintImageForCurrentFrame() { PaintRecorder paint_recorder; Draw(paint_recorder.beginRecording(FloatRect(dest_rect)), PaintFlags(), - FloatRect(dest_rect), FloatRect(dest_rect), kRespectImageOrientation, - kClampImageToSourceRect, kSyncDecode); + FloatRect(dest_rect), FloatRect(dest_rect), SkSamplingOptions(), + kRespectImageOrientation, kClampImageToSourceRect, kSyncDecode); paint_record_for_current_frame_ = paint_recorder.finishRecordingAsPicture(); paint_record_content_id_ = PaintImage::GetNextContentId(); @@ -272,6 +274,7 @@ void PlaceholderImage::Draw(cc::PaintCanvas* canvas, const PaintFlags& base_flags, const FloatRect& dest_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, RespectImageOrientationEnum respect_orientation, ImageClampingMode image_clamping_mode, ImageDecodingMode decode_mode) { @@ -294,7 +297,7 @@ void PlaceholderImage::Draw(cc::PaintCanvas* canvas, } if (text_.IsEmpty()) { - DrawCenteredIcon(canvas, base_flags, dest_rect, + DrawCenteredIcon(canvas, base_flags, dest_rect, sampling, icon_and_text_scale_factor_); return; } @@ -313,7 +316,7 @@ void PlaceholderImage::Draw(cc::PaintCanvas* canvas, (kIconWidth + 2 * kFeaturePaddingX + kPaddingBetweenIconAndText); if (dest_rect.Width() < icon_and_text_width) { - DrawCenteredIcon(canvas, base_flags, dest_rect, + DrawCenteredIcon(canvas, base_flags, dest_rect, sampling, icon_and_text_scale_factor_); return; } @@ -340,7 +343,7 @@ void PlaceholderImage::Draw(cc::PaintCanvas* canvas, } DrawIcon(canvas, base_flags, icon_x, - feature_y + icon_and_text_scale_factor_ * kIconPaddingY, + feature_y + icon_and_text_scale_factor_ * kIconPaddingY, sampling, icon_and_text_scale_factor_); flags.setColor(SkColorSetARGB(0xAB, 0, 0, 0)); @@ -368,7 +371,8 @@ void PlaceholderImage::DrawPattern( // Ignore the pattern specifications and just draw a single placeholder image // over the whole |dest_rect|. This is done in order to prevent repeated icons // from cluttering tiled background images. - Draw(context.Canvas(), flags, dest_rect, src_rect, respect_orientation, + Draw(context.Canvas(), flags, dest_rect, src_rect, + context.ImageSamplingOptions(), respect_orientation, kClampImageToSourceRect, kUnspecifiedDecode); } diff --git a/third_party/blink/renderer/platform/graphics/placeholder_image.h b/third_party/blink/renderer/platform/graphics/placeholder_image.h index dd3e3f55a19cfb..68819d68ce1bd7 100644 --- a/third_party/blink/renderer/platform/graphics/placeholder_image.h +++ b/third_party/blink/renderer/platform/graphics/placeholder_image.h @@ -46,6 +46,7 @@ class PLATFORM_EXPORT PlaceholderImage final : public Image { const cc::PaintFlags&, const FloatRect& dest_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/renderer/platform/graphics/placeholder_image_test.cc b/third_party/blink/renderer/platform/graphics/placeholder_image_test.cc index 76e28796f73af6..4206775777081e 100644 --- a/third_party/blink/renderer/platform/graphics/placeholder_image_test.cc +++ b/third_party/blink/renderer/platform/graphics/placeholder_image_test.cc @@ -71,12 +71,13 @@ void DrawImageExpectingGrayBoxOnly(PlaceholderImage& image, const FloatRect& dest_rect) { MockPaintCanvas canvas; ExpectDrawGrayBox(canvas, dest_rect); - EXPECT_CALL(canvas, drawImageRect(_, _, _, _, _)).Times(0); + EXPECT_CALL(canvas, drawImageRect(_, _, _, _, _, _)).Times(0); EXPECT_CALL(canvas, drawTextBlob(_, _, _, _)).Times(0); image.Draw(&canvas, PaintFlags(), dest_rect, - FloatRect(0.0f, 0.0f, 100.0f, 100.0f), kRespectImageOrientation, - Image::kClampImageToSourceRect, Image::kUnspecifiedDecode); + FloatRect(0.0f, 0.0f, 100.0f, 100.0f), SkSamplingOptions(), + kRespectImageOrientation, Image::kClampImageToSourceRect, + Image::kUnspecifiedDecode); } void DrawImageExpectingIconOnly(PlaceholderImage& image, @@ -101,13 +102,13 @@ void DrawImageExpectingIconOnly(PlaceholderImage& image, FloatNear(scale_factor * kBaseIconWidth, 0.01)), Property(&SkRect::height, FloatNear(scale_factor * kBaseIconHeight, 0.01))), - /*flags=*/_, /*constraint=*/_)) + /*sampling*/ _, /*flags=*/_, /*constraint=*/_)) .Times(1); EXPECT_CALL(canvas, drawTextBlob(_, _, _, _)).Times(0); image.Draw(&canvas, PaintFlags(), dest_rect, - FloatRect(0.0f, 0.0f, 100.0f, 100.0f), + FloatRect(0.0f, 0.0f, 100.0f, 100.0f), SkSamplingOptions(), kDoNotRespectImageOrientation, Image::kClampImageToSourceRect, Image::kUnspecifiedDecode); } @@ -171,7 +172,7 @@ void DrawImageExpectingIconAndTextLTR(PlaceholderImage& image, FloatNear(scale_factor * kBaseIconWidth, 0.01)), Property(&SkRect::height, FloatNear(scale_factor * kBaseIconHeight, 0.01))), - /*flags=*/_, + /*sampling*/ _, /*flags=*/_, /*constraint=*/_)) .Times(1); @@ -197,7 +198,7 @@ void DrawImageExpectingIconAndTextLTR(PlaceholderImage& image, })); image.Draw(&canvas, PaintFlags(), dest_rect, - FloatRect(0.0f, 0.0f, 100.0f, 100.0f), + FloatRect(0.0f, 0.0f, 100.0f, 100.0f), SkSamplingOptions(), kDoNotRespectImageOrientation, Image::kClampImageToSourceRect, Image::kUnspecifiedDecode); } @@ -284,14 +285,14 @@ TEST_F(PlaceholderImageTest, FormatPlaceholderText) { TEST_F(PlaceholderImageTest, DrawNonIntersectingSrcRect) { MockPaintCanvas canvas; EXPECT_CALL(canvas, drawRect(_, _)).Times(0); - EXPECT_CALL(canvas, drawImageRect(_, _, _, _, _)).Times(0); + EXPECT_CALL(canvas, drawImageRect(_, _, _, _, _, _)).Times(0); EXPECT_CALL(canvas, drawTextBlob(_, _, _, _)).Times(0); PlaceholderImage::Create(nullptr, IntSize(800, 600), 0) ->Draw(&canvas, PaintFlags(), FloatRect(0.0f, 0.0f, 800.0f, 600.0f), // The source rectangle is outside the 800x600 bounds of the image, // so nothing should be drawn. - FloatRect(1000.0f, 0.0f, 800.0f, 600.0f), + FloatRect(1000.0f, 0.0f, 800.0f, 600.0f), SkSamplingOptions(), kDoNotRespectImageOrientation, Image::kClampImageToSourceRect, Image::kUnspecifiedDecode); } @@ -426,7 +427,7 @@ TEST_F(PlaceholderImageTest, DrawWithOriginalResourceSizeRTL) { FloatNear(kScaleFactor * kBaseIconWidth, 0.01)), Property(&SkRect::height, FloatNear(kScaleFactor * kBaseIconHeight, 0.01))), - /*flags=*/_, + /*sampling*/ _, /*flags=*/_, /*constraint=*/_)) .Times(1); @@ -450,7 +451,7 @@ TEST_F(PlaceholderImageTest, DrawWithOriginalResourceSizeRTL) { })); image->Draw(&canvas, PaintFlags(), dest_rect, - FloatRect(0.0f, 0.0f, 100.0f, 100.0f), + FloatRect(0.0f, 0.0f, 100.0f, 100.0f), SkSamplingOptions(), kDoNotRespectImageOrientation, Image::kClampImageToSourceRect, Image::kUnspecifiedDecode); } diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc index 8dcdcdace1506f..631a02551cbf3a 100644 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.cc @@ -47,6 +47,7 @@ void StaticBitmapImage::DrawHelper( const PaintFlags& flags, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, ImageClampingMode clamp_mode, RespectImageOrientationEnum respect_orientation, const PaintImage& image) { @@ -75,7 +76,8 @@ void StaticBitmapImage::DrawHelper( } } - canvas->drawImageRect(image, adjusted_src_rect, adjusted_dst_rect, &flags, + canvas->drawImageRect(image, adjusted_src_rect, adjusted_dst_rect, sampling, + &flags, WebCoreClampingModeToSkiaRectConstraint(clamp_mode)); } diff --git a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h index 77fb6df1e0a1e8..a01b2c2cecfc14 100644 --- a/third_party/blink/renderer/platform/graphics/static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/static_bitmap_image.h @@ -102,6 +102,7 @@ class PLATFORM_EXPORT StaticBitmapImage : public Image { const cc::PaintFlags&, const FloatRect&, const FloatRect&, + const SkSamplingOptions&, ImageClampingMode, RespectImageOrientationEnum, const PaintImage&); diff --git a/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h b/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h index 33276f346f3e77..9f7062fb6a3dc2 100644 --- a/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h +++ b/third_party/blink/renderer/platform/graphics/test/mock_paint_canvas.h @@ -68,15 +68,17 @@ class MockPaintCanvas : public cc::PaintCanvas { SkScalar ry, const PaintFlags& flags)); MOCK_METHOD2(drawPath, void(const SkPath& path, const PaintFlags& flags)); - MOCK_METHOD4(drawImage, + MOCK_METHOD5(drawImage, void(const PaintImage& image, SkScalar left, SkScalar top, + const SkSamplingOptions&, const PaintFlags* flags)); - MOCK_METHOD5(drawImageRect, + MOCK_METHOD6(drawImageRect, void(const PaintImage& image, const SkRect& src, const SkRect& dst, + const SkSamplingOptions&, const PaintFlags* flags, SkCanvas::SrcRectConstraint constraint)); MOCK_METHOD3(drawSkottie, diff --git a/third_party/blink/renderer/platform/graphics/test/stub_image.h b/third_party/blink/renderer/platform/graphics/test/stub_image.h index d43c4d8612a453..a06aae0ddecef2 100644 --- a/third_party/blink/renderer/platform/graphics/test/stub_image.h +++ b/third_party/blink/renderer/platform/graphics/test/stub_image.h @@ -21,6 +21,7 @@ class StubImage : public Image { const cc::PaintFlags&, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override {} diff --git a/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.cc b/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.cc index 3406b920e0d319..f4a9de25760d18 100644 --- a/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.cc +++ b/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.cc @@ -82,12 +82,13 @@ void UnacceleratedStaticBitmapImage::Draw( const cc::PaintFlags& flags, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions& sampling, RespectImageOrientationEnum should_respect_image_orientation, ImageClampingMode clamp_mode, ImageDecodingMode) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - StaticBitmapImage::DrawHelper(canvas, flags, dst_rect, src_rect, clamp_mode, - should_respect_image_orientation, + StaticBitmapImage::DrawHelper(canvas, flags, dst_rect, src_rect, sampling, + clamp_mode, should_respect_image_orientation, PaintImageForCurrentFrame()); } diff --git a/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h b/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h index 8496da774ba74f..061ac1444c30a9 100644 --- a/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h +++ b/third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h @@ -36,6 +36,7 @@ class PLATFORM_EXPORT UnacceleratedStaticBitmapImage final const cc::PaintFlags&, const FloatRect& dst_rect, const FloatRect& src_rect, + const SkSamplingOptions&, RespectImageOrientationEnum, ImageClampingMode, ImageDecodingMode) override; diff --git a/third_party/blink/web_tests/FlagExpectations/use-vulkan=swiftshader b/third_party/blink/web_tests/FlagExpectations/use-vulkan=swiftshader index 7c15f737d4d0ac..cf3a6e1ebb05ec 100644 --- a/third_party/blink/web_tests/FlagExpectations/use-vulkan=swiftshader +++ b/third_party/blink/web_tests/FlagExpectations/use-vulkan=swiftshader @@ -9,3 +9,33 @@ images/color-profile-background-image-space.html [ Skip ] images/color-profile-border-image.html [ Skip ] images/color-profile-group.html [ Skip ] images/color-profile-svg-fill-text.html [ Skip ] +css3/background/background-repeat-round-auto1.html [ Skip ] +css3/background/background-repeat-round-border.html [ Skip ] +css3/background/background-repeat-round-content.html [ Skip ] +css3/background/background-repeat-round-padding.html [ Skip ] +css3/blending/background-blend-mode-default-value.html [ Skip ] +css3/blending/background-blend-mode-gradient-image.html [ Skip ] +css3/blending/background-blend-mode-image-image.html [ Skip ] +css3/blending/background-blend-mode-multiple-background-layers.html [ Skip ] +css3/blending/background-blend-mode-single-layer-no-blending.html [ Skip ] +css3/blending/background-blend-mode-tiled-gradient.html [ Skip ] +css3/blending/effect-background-blend-mode-tiled.html [ Skip ] +css3/blending/mix-blend-mode-isolated-group-1.html [ Skip ] +css3/blending/mix-blend-mode-isolated-group-2.html [ Skip ] +css3/masking/mask-repeat-round-auto1.html [ Skip ] +css3/masking/mask-repeat-round-border.html [ Skip ] +css3/masking/mask-repeat-round-content.html [ Skip ] +css3/masking/mask-repeat-round-padding.html [ Skip ] +images/color-profile-background-image-cover.html [ Skip ] +images/color-profile-background-image-repeat.html [ Skip ] +images/color-profile-image-canvas-pattern.html [ Skip ] +images/color-profile-image-canvas.html [ Skip ] +images/color-profile-image-filter-all.html [ Skip ] +images/color-profile-mask-image-svg.html [ Skip ] +images/color-profile-object.html [ Skip ] +images/rgb-png-with-cmyk-color-profile.html [ Skip ] +images/ycbcr-with-cmyk-color-profile.html [ Skip ] +images/yuv-decode-eligible/color-profile-border-radius.html [ Skip ] +images/yuv-decode-eligible/color-profile-image-profile-match.html [ Skip ] +images/yuv-decode-eligible/color-profile-image.html [ Skip ] +media/color-profile-video-poster-image.html [ Skip ] diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/3d-corners-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/3d-corners-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/3d-corners-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/3d-corners-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/3d-cube-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/3d-cube-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/3d-cube-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/3d-cube-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/absolute-inside-out-of-view-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-inside-out-of-view-fixed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/absolute-inside-out-of-view-fixed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-inside-out-of-view-fixed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/absolute-position-changed-in-composited-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-position-changed-in-composited-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/absolute-position-changed-in-composited-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-position-changed-in-composited-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/absolute-position-changed-with-composited-parent-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-position-changed-with-composited-parent-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/absolute-position-changed-with-composited-parent-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/absolute-position-changed-with-composited-parent-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/animation/busy-indicator-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/animation/busy-indicator-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/animation/busy-indicator-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/animation/busy-indicator-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/animation/state-at-end-event-transform-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/animation/state-at-end-event-transform-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/animation/state-at-end-event-transform-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/animation/state-at-end-event-transform-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility-transformed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility-transformed-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility-transformed-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility-transformed-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-3d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-3d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-3d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-3d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-hierarchical-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-hierarchical-transform-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-hierarchical-transform-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-hierarchical-transform-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-non3d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-non3d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-non3d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-non3d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-simple-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-simple-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-simple-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-simple-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-webgl-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-webgl-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/backface-visibility/backface-visibility-webgl-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/backface-visibility/backface-visibility-webgl-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/background-color/background-color-outside-document-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/background-color-outside-document-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/background-color/background-color-outside-document-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/background-color-outside-document-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/background-color/view-blending-base-background-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/view-blending-base-background-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/background-color/view-blending-base-background-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/background-color/view-blending-base-background-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/checkerboard-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/checkerboard-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/checkerboard-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/checkerboard-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/child-layer-3d-sorting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/child-layer-3d-sorting-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/child-layer-3d-sorting-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/child-layer-3d-sorting-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/clip-child-by-non-stacking-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/clip-child-by-non-stacking-ancestor-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/clip-child-by-non-stacking-ancestor-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/clip-child-by-non-stacking-ancestor-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/color-matching/image-color-matching-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/color-matching/image-color-matching-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/color-matching/image-color-matching-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/color-matching/image-color-matching-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/composited-scaled-child-with-border-radius-parent-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/composited-scaled-child-with-border-radius-parent-clip-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/composited-scaled-child-with-border-radius-parent-clip-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/composited-scaled-child-with-border-radius-parent-clip-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/composited-translated-child-with-border-radius-parent-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/composited-translated-child-with-border-radius-parent-clip-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/composited-translated-child-with-border-radius-parent-clip-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/composited-translated-child-with-border-radius-parent-clip-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/compositing-visible-descendant-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/compositing-visible-descendant-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/compositing-visible-descendant-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/compositing-visible-descendant-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/background-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-clip-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/background-clip-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-clip-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/background-color-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-color-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/background-color-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/background-color-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/body-background-painted-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-painted-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/body-background-painted-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-painted-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/body-background-skipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-skipped-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/body-background-skipped-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/body-background-skipped-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/control-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/control-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/control-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/control-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/filter-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/filter-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/filter-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/hidden-with-visible-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-child-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/hidden-with-visible-child-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-child-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/hidden-with-visible-text-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-text-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/hidden-with-visible-text-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/hidden-with-visible-text-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/layer-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-opacity-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/layer-opacity-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-opacity-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/layer-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-transform-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/layer-transform-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/layer-transform-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/visibility-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/visibility-hidden-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/contents-opaque/visibility-hidden-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/contents-opaque/visibility-hidden-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/clear-fixed-iframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/clear-fixed-iframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/clear-fixed-iframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/clear-fixed-iframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-alpha-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-alpha-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-alpha-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-alpha-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-alpha-large-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-alpha-large-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-alpha-large-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-alpha-large-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-blur-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-blur-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-blur-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-blur-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-blur-large-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-blur-large-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/filter-occlusion-blur-large-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/filter-occlusion-blur-large-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/scrolled-within-boxshadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/scrolled-within-boxshadow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/scrolled-within-boxshadow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/scrolled-within-boxshadow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/tile-occlusion-boundaries-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/tile-occlusion-boundaries-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/tile-occlusion-boundaries-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/tile-occlusion-boundaries-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/translated-boxshadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/translated-boxshadow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/translated-boxshadow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/translated-boxshadow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/unscrolled-within-boxshadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/unscrolled-within-boxshadow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/culling/unscrolled-within-boxshadow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/culling/unscrolled-within-boxshadow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/direct-image-compositing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/direct-image-compositing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/direct-image-compositing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/direct-image-compositing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/draws-content/canvas-background-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/canvas-background-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/draws-content/canvas-background-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/canvas-background-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/draws-content/webgl-background-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/webgl-background-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/draws-content/webgl-background-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/draws-content/webgl-background-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-background-after-style-recalc-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-background-after-style-recalc-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-background-after-style-recalc-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-background-after-style-recalc-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-body-background-positioned-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-body-background-positioned-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-body-background-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-body-background-positioned-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-body-background-positioned-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-changed-in-composited-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-in-composited-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-changed-in-composited-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-in-composited-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-changed-to-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-to-absolute-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-changed-to-absolute-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-to-absolute-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-changed-within-composited-parent-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-within-composited-parent-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-changed-within-composited-parent-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-changed-within-composited-parent-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-scroll-offset-history-restore-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-scroll-offset-history-restore-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/fixed-position-scroll-offset-history-restore-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/fixed-position-scroll-offset-history-restore-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/flat-with-transformed-child-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/flat-with-transformed-child-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/flat-with-transformed-child-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/flat-with-transformed-child-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/force-composite-empty-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/force-composite-empty-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/force-composite-empty-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/force-composite-empty-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/no-overflow-iframe-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-hidden-iframe-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/framesets/composited-frame-alignment-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/framesets/composited-frame-alignment-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/framesets/composited-frame-alignment-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/framesets/composited-frame-alignment-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/generated-content-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/generated-content-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/generated-content-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/generated-content-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/abs-position-inside-opacity-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/abs-position-inside-opacity-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/abs-position-inside-opacity-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/abs-position-inside-opacity-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/ancestor-overflow-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/ancestor-overflow-change-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/ancestor-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/ancestor-overflow-change-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/ancestor-overflow-change-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-clipped-composited-child-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-clipped-composited-child-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-clipped-composited-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-clipped-composited-child-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-clipped-composited-child-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/bounds-ignores-hidden-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/bounds-ignores-hidden-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clip-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clip-inside-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-inside-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clip-inside-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-inside-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clip-with-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-with-shadow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clip-with-shadow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clip-with-shadow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clipping-foreground-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clipping-foreground-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/clipping-foreground-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/clipping-foreground-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/composited-html-size-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-html-size-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/composited-html-size-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-html-size-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/composited-in-columns-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/composited-in-columns-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/composited-in-columns-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/composited-in-columns-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/composited-in-columns-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-in-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-in-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-in-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-in-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-composited-page-scale-down-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-composited-page-scale-down-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-composited-page-scale-down-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-composited-page-scale-down-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-composited-page-scale-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-composited-page-scale-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-composited-page-scale-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-composited-page-scale-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-iframe-composited-page-scale-down-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-iframe-composited-page-scale-down-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-iframe-composited-page-scale-down-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-iframe-composited-page-scale-down-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-iframe-composited-page-scale-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-iframe-composited-page-scale-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-iframe-composited-page-scale-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-iframe-composited-page-scale-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-transform-composited-page-scale-down-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-transform-composited-page-scale-down-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-transform-composited-page-scale-down-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-transform-composited-page-scale-down-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-transform-composited-page-scale-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-transform-composited-page-scale-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/fixed-position-transform-composited-page-scale-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/fixed-position-transform-composited-page-scale-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/flipped-writing-mode-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/flipped-writing-mode-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/flipped-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/flipped-writing-mode-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/flipped-writing-mode-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/foreground-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/foreground-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/foreground-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/foreground-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/foreground-offset-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-offset-change-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/foreground-offset-change-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/foreground-offset-change-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/horizontal-scroll-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/horizontal-scroll-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/horizontal-scroll-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/horizontal-scroll-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-deep-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-deep-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-deep-switch-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-switch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-switch-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/layer-due-to-layer-children-switch-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/layer-due-to-layer-children-switch-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-positioned-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-transformed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/limit-layer-bounds-transformed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/limit-layer-bounds-transformed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/outline-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/outline-change-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/outline-change-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/outline-change-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/partial-layout-update-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/partial-layout-update-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/partial-layout-update-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/partial-layout-update-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/preserve-3d-switching-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/preserve-3d-switching-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/preserve-3d-switching-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/preserve-3d-switching-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/repaint-foreground-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/repaint-foreground-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/repaint-foreground-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/repaint-foreground-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/root-layer-update-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/root-layer-update-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/root-layer-update-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/root-layer-update-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/rtl-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/rtl-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/rtl-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/rtl-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/tall-page-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/tall-page-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/tall-page-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/tall-page-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/transformed-abs-position-inside-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transformed-abs-position-inside-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/transformed-abs-position-inside-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transformed-abs-position-inside-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/vertical-scroll-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/vertical-scroll-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/vertical-scroll-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/vertical-scroll-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/video-fixed-scrolling-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/video-fixed-scrolling-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/video-fixed-scrolling-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/video-fixed-scrolling-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/video-opacity-overlay-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/video-opacity-overlay-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/geometry/video-opacity-overlay-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/geometry/video-opacity-overlay-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-pixel-rotated-link-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-pixel-transparent-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-simple-scaledX-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-simple-scaledX-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-simple-scaledX-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-simple-scaledX-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-skew-matrix-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-skew-matrix-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-skew-matrix-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-skew-matrix-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-with-box-shadow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/gestures/gesture-tapHighlight-with-squashing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/become-composited-nested-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-composited-nested-iframes-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/become-composited-nested-iframes-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-composited-nested-iframes-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/become-overlapped-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-overlapped-iframe-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/become-overlapped-iframe-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/become-overlapped-iframe-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/composited-iframe-alignment-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-iframe-alignment-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/composited-iframe-alignment-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-iframe-alignment-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/composited-iframe-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-iframe-scroll-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/composited-iframe-scroll-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-iframe-scroll-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/composited-parent-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-parent-iframe-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/composited-parent-iframe-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/composited-parent-iframe-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe-delayed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-delayed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe-delayed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-delayed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe2-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe2-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe2-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe3-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/connect-compositing-iframe3-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/connect-compositing-iframe3-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/enter-compositing-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/enter-compositing-iframe-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/enter-compositing-iframe-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/enter-compositing-iframe-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/fixed-position-iframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/fixed-position-iframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/fixed-position-iframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/fixed-position-iframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-content-flipping-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-content-flipping-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-content-flipping-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-content-flipping-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-copy-on-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-copy-on-scroll-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-copy-on-scroll-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-copy-on-scroll-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-in-composited-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-in-composited-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-in-composited-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-in-composited-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-resize-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-resize-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-resize-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-resize-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-size-from-zero-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-size-from-zero-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/iframe-size-from-zero-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/iframe-size-from-zero-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-iframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-iframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-iframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-iframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-nested-iframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-nested-iframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-nested-iframe-hide-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-hide-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-nested-iframe-hide-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-hide-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-nested-iframe-show-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-show-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/invisible-nested-iframe-show-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/invisible-nested-iframe-show-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/nested-composited-iframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/nested-composited-iframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/nested-composited-iframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/nested-composited-iframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/nested-iframe-scrolling-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/nested-iframe-scrolling-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/nested-iframe-scrolling-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/nested-iframe-scrolling-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/overlapped-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/overlapped-iframe-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/overlapped-iframe-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-iframe-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/overlapped-iframe-iframe-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-iframe-iframe-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/overlapped-nested-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-nested-iframes-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/overlapped-nested-iframes-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/overlapped-nested-iframes-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/repaint-after-losing-scrollbars-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/repaint-after-losing-scrollbars-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/repaint-after-losing-scrollbars-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/repaint-after-losing-scrollbars-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/resizer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/resizer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/resizer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/resizer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/scroll-fixed-transformed-element-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scroll-fixed-transformed-element-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/scroll-fixed-transformed-element-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scroll-fixed-transformed-element-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/scroll-grandchild-iframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scroll-grandchild-iframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/scroll-grandchild-iframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scroll-grandchild-iframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/scrolling-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scrolling-iframe-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/scrolling-iframe-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/scrolling-iframe-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/visibility-hidden-transformed-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/visibility-hidden-transformed-content-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/iframes/visibility-hidden-transformed-content-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/iframes/visibility-hidden-transformed-content-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/clip-on-directly-composited-image-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/clip-on-directly-composited-image-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/clip-on-directly-composited-image-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/images/clip-on-directly-composited-image-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/content-image-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/content-image-change-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/content-image-change-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/images/content-image-change-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-background-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-background-color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-background-color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-background-color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-clip-path-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-clip-path-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-clip-path-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-clip-path-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-dynamic-border-draws-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-border-draws-content-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-dynamic-border-draws-content-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-border-draws-content-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-dynamic-clip-path-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-clip-path-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-image-dynamic-clip-path-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-image-dynamic-clip-path-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-svg-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-svg-image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/images/direct-svg-image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/images/direct-svg-image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/img-layer-grow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/img-layer-grow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/img-layer-grow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/img-layer-grow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/img-layer-object-fit-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/img-layer-object-fit-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/img-layer-object-fit-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/img-layer-object-fit-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/animation-overlap-with-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/animation-overlap-with-children-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/animation-overlap-with-children-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/animation-overlap-with-children-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-and-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-and-transform-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-and-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-and-transform-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-and-transform-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-no-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-no-content-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-no-content-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-no-content-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-scroll-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-scroll-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-scroll-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-under-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-under-transform-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-under-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/fixed-position-under-transform-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/fixed-position-under-transform-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overflow-scroll-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-scroll-overlap-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overflow-scroll-overlap-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overflow-scroll-overlap-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-animation-clipping-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-clipping-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-animation-clipping-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-clipping-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-animation-container-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-container-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-animation-container-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-container-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-animation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-animation-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-animation-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-child-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-child-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-child-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-child-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-child-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-clipping-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-clipping-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-clipping-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-clipping-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-3d-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-3d-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-3d-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-3d-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-and-clipped-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-and-clipped-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-layer-with-transform-body-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transforms-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transforms-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/overlap-transforms-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/overlap-transforms-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/rotate3d-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/rotate3d-overlap-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/rotate3d-overlap-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/rotate3d-overlap-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/scroll-partial-update-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/scroll-partial-update-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/scroll-partial-update-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/scroll-partial-update-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/spanOverlapsCanvas-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/spanOverlapsCanvas-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/spanOverlapsCanvas-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/spanOverlapsCanvas-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/spanOverlapsCanvas-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/stacking-context-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/stacking-context-overlap-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/stacking-context-overlap-nested-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-nested-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/stacking-context-overlap-nested-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/stacking-context-overlap-nested-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/translatez-added-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-added-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/translatez-added-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-added-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/translatez-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-overlap-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/translatez-overlap-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-overlap-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/translatez-removed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-removed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layer-creation/translatez-removed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layer-creation/translatez-removed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layers-inside-overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layers-inside-overflow-scroll-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layers-inside-overflow-scroll-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layers-inside-overflow-scroll-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layout-width-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/layout-width-change-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/layout-width-change-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/layout-width-change-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/lots-of-img-layers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/lots-of-img-layers-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/lots-of-img-layers-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/lots-of-img-layers-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/lots-of-img-layers-with-opacity-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/lots-of-img-layers-with-opacity-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/lots-of-img-layers-with-opacity-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/lots-of-img-layers-with-opacity-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/direct-image-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/direct-image-mask-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/direct-image-mask-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/direct-image-mask-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/mask-layer-size-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-layer-size-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/mask-layer-size-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-layer-size-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/mask-of-clipped-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-of-clipped-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/mask-of-clipped-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/mask-of-clipped-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/masked-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/masked-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/masked-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/masked-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/multiple-masks-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/multiple-masks-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/multiple-masks-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/multiple-masks-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/simple-composited-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/simple-composited-mask-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/masks/simple-composited-mask-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/masks/simple-composited-mask-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/massive-scale-interest-rect-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/massive-scale-interest-rect-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/massive-scale-interest-rect-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/massive-scale-interest-rect-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/nested-border-radius-composited-child-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-border-radius-composited-child-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/nested-border-radius-composited-child-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-border-radius-composited-child-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/nested-direct-image-compositing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-direct-image-compositing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/nested-direct-image-compositing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/nested-direct-image-compositing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/opacity-with-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/opacity-with-mask-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/opacity-with-mask-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/opacity-with-mask-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-scrolling-with-clip-path-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/ancestor-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/ancestor-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/ancestor-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/ancestor-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-above-composited-subframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-above-composited-subframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-above-composited-subframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-above-composited-subframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-composited-subframe-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-composited-subframe-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-composited-subframe-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-composited-subframe-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-grandparent-composited-grandchild-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-grandparent-composited-grandchild-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-grandparent-composited-grandchild-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-grandparent-composited-grandchild-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-parent-composited-grandchild-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-parent-composited-grandchild-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-parent-composited-grandchild-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-parent-composited-grandchild-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-squashed-layers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-squashed-layers-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-squashed-layers-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-squashed-layers-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-two-ancestors-composited-grandchild-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-two-ancestors-composited-grandchild-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-on-two-ancestors-composited-grandchild-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-on-two-ancestors-composited-grandchild-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-outside-bounds-of-compositing-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-outside-bounds-of-compositing-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-outside-bounds-of-compositing-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-outside-bounds-of-compositing-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-styles-with-composited-child-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-styles-with-composited-child-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/border-radius-styles-with-composited-child-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/border-radius-styles-with-composited-child-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clip-content-under-overflow-controls-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-content-under-overflow-controls-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clip-content-under-overflow-controls-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-content-under-overflow-controls-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clip-descendents-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-descendents-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clip-descendents-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-descendents-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clip-parent-reset-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-parent-reset-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clip-parent-reset-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clip-parent-reset-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/clipping-ancestor-with-accelerated-scrolling-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/composited-layer-under-border-radius-under-composited-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/composited-layer-under-border-radius-under-composited-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/composited-layer-under-border-radius-under-composited-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/composited-layer-under-border-radius-under-composited-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/content-gains-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-gains-scrollbars-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/content-gains-scrollbars-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-gains-scrollbars-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/content-loses-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-loses-scrollbars-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/content-loses-scrollbars-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/content-loses-scrollbars-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/fixed-position-ancestor-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/fixed-position-ancestor-clip-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/fixed-position-ancestor-clip-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/fixed-position-ancestor-clip-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/fractional-sized-scrolling-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/fractional-sized-scrolling-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/fractional-sized-scrolling-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/fractional-sized-scrolling-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/grandchild-composited-with-border-radius-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/grandchild-with-border-radius-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/image-load-overflow-scrollbars-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/image-load-overflow-scrollbars-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/image-load-overflow-scrollbars-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/image-load-overflow-scrollbars-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/mask-with-filter-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/mask-with-filter-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/mask-with-filter-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/mask-with-filter-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/mask-with-small-content-rect-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/mask-with-small-content-rect-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/mask-with-small-content-rect-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/mask-with-small-content-rect-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-border-radius-clipping-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-border-radius-clipping-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-border-radius-clipping-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-border-radius-clipping-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-render-surfaces-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-render-surfaces-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-render-surfaces-with-intervening-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-with-intervening-clip-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-render-surfaces-with-intervening-clip-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-with-intervening-clip-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-render-surfaces-with-rotation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-with-rotation-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-render-surfaces-with-rotation-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-render-surfaces-with-rotation-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-scrolling-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-scrolling-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/nested-scrolling-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/nested-scrolling-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-auto-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-auto-with-touch-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-no-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-clip-with-accelerated-scrolling-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-compositing-descendant-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-compositing-descendant-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-compositing-descendant-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-compositing-descendant-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-hidden-canvas-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-canvas-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-hidden-canvas-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-canvas-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-hidden-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-with-touch-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-hidden-with-touch-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-hidden-with-touch-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-overlay-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-overlay-with-touch-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-overlay-with-touch-no-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-positioning-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-positioning-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-positioning-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-positioning-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scaled-descendant-overlapping-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scaled-descendant-overlapping-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scaled-descendant-overlapping-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scaled-descendant-overlapping-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scroll-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scroll-with-local-image-background-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-local-image-background-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scroll-with-local-image-background-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-local-image-background-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scroll-with-touch-no-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-layers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-scrollbar-layers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-scrollbar-layers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-visible-with-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-visible-with-touch-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/overflow-visible-with-touch-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/overflow-visible-with-touch-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/paint-neg-z-order-descendants-into-scrolling-contents-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/parent-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/parent-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/parent-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/parent-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/relpos-under-abspos-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/relpos-under-abspos-border-radius-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/relpos-under-abspos-border-radius-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/relpos-under-abspos-border-radius-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/remove-overflow-crash2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/remove-overflow-crash2-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/remove-overflow-crash2-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/remove-overflow-crash2-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/repaint-after-losing-scrollbars-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/repaint-after-losing-scrollbars-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/repaint-after-losing-scrollbars-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/repaint-after-losing-scrollbars-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/resize-painting-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/resize-painting-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/resize-painting-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/resize-painting-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-clip-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-clip-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-clip-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-clip-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-clip-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-clip-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-effect-interleave-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-effect-interleave-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-effect-interleave-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/rotate-then-clip-z-order-interleave-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scaled-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scaled-mask-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scaled-mask-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scaled-mask-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-ancestor-update-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-ancestor-update-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-ancestor-update-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-ancestor-update-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-neg-z-index-and-composited-child-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-neg-z-index-and-composited-child-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-neg-z-index-and-composited-child-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-neg-z-index-and-composited-child-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-painting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-painting-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbar-painting-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbar-painting-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbars-with-clipped-owner-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbars-with-clipped-owner-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrollbars-with-clipped-owner-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrollbars-with-clipped-owner-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/siblings-composited-with-border-radius-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/siblings-composited-with-border-radius-ancestor-one-clipped-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/siblings-with-border-radius-ancestor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/siblings-with-border-radius-ancestor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/siblings-with-border-radius-ancestor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/siblings-with-border-radius-ancestor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/textarea-scroll-touch-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/textarea-scroll-touch-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/textarea-scroll-touch-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/textarea-scroll-touch-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/theme-affects-visual-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/theme-affects-visual-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/theme-affects-visual-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/theme-affects-visual-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/tiled-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/tiled-mask-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/tiled-mask-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/tiled-mask-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/transform-in-empty-container-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/transform-in-empty-container-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/transform-in-empty-container-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/transform-in-empty-container-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/universal-accelerated-overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/universal-accelerated-overflow-scroll-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/update-widget-positions-on-nested-frames-and-scrollers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/update-widget-positions-on-nested-frames-and-scrollers-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/update-widget-positions-on-nested-frames-and-scrollers-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/update-widget-positions-on-nested-frames-and-scrollers-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/zero-size-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/zero-size-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overflow/zero-size-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overflow/zero-size-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overlap-blending/children-opacity-huge-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overlap-blending/children-opacity-huge-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overlap-blending/children-opacity-huge-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overlap-blending/children-opacity-huge-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overlap-blending/children-opacity-no-overlap-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overlap-blending/children-opacity-no-overlap-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overlap-blending/children-opacity-no-overlap-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overlap-blending/children-opacity-no-overlap-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overlap-blending/reflection-opacity-huge-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/overlap-blending/reflection-opacity-huge-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/overlap-blending/reflection-opacity-huge-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/overlap-blending/reflection-opacity-huge-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/perpendicular-layer-sorting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/perpendicular-layer-sorting-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/perpendicular-layer-sorting-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/perpendicular-layer-sorting-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/perspective-interest-rect-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/perspective-interest-rect-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/perspective-interest-rect-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/perspective-interest-rect-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/plugins/webplugin-alpha-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/plugins/webplugin-alpha-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/plugins/webplugin-alpha-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/plugins/webplugin-alpha-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/plugins/webplugin-no-alpha-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/plugins/webplugin-no-alpha-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/plugins/webplugin-no-alpha-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/plugins/webplugin-no-alpha-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/plugins/webplugin-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/plugins/webplugin-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/plugins/webplugin-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/plugins/webplugin-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/preserve-3d-toggle-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/preserve-3d-toggle-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/preserve-3d-toggle-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/preserve-3d-toggle-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/animation-inside-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/animation-inside-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/animation-inside-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/animation-inside-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/backface-hidden-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/backface-hidden-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/backface-hidden-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/backface-hidden-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/become-simple-composited-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/become-simple-composited-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/become-simple-composited-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/become-simple-composited-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/compositing-change-inside-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/compositing-change-inside-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/compositing-change-inside-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/compositing-change-inside-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/deeply-nested-reflections-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/deeply-nested-reflections-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/deeply-nested-reflections-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/deeply-nested-reflections-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/enable-disable-compositing-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/enable-disable-compositing-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/enable-disable-compositing-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/enable-disable-compositing-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/masked-reflection-on-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/masked-reflection-on-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/masked-reflection-on-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/masked-reflection-on-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-animated-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-animated-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-animated-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-animated-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-on-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-on-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-on-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-on-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-opacity-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-opacity-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-opacity-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-opacity-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-size-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-size-change-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-size-change-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-size-change-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-transformed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-transformed-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-transformed2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed2-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-transformed2-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transformed2-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-transition-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transition-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/nested-reflection-transition-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/nested-reflection-transition-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-in-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-in-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-in-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-in-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-on-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-on-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-on-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-on-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-opacity-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-opacity-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-opacity-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-opacity-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-ordering-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-ordering-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-ordering-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-ordering-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-positioning-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-positioning-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-positioning-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-positioning-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-positioning2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-positioning2-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/reflection-positioning2-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/reflection-positioning2-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/remove-add-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/remove-add-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/remove-add-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/remove-add-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/simple-composited-reflections-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/simple-composited-reflections-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/simple-composited-reflections-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/simple-composited-reflections-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/transform-inside-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/transform-inside-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/reflections/transform-inside-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/reflections/transform-inside-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/render-surface-alpha-blending-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/render-surface-alpha-blending-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/render-surface-alpha-blending-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/render-surface-alpha-blending-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rendering-contexts-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rendering-contexts-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rendering-contexts-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rendering-contexts-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rounded-corners-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rounded-corners-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rounded-corners-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rounded-corners-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-scrolled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-scrolled-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-scrolled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-scrolled-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-relative-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-relative-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-iframe-relative-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-iframe-relative-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-overflow-invalidation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-overflow-invalidation-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-overflow-invalidation-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-overflow-invalidation-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-overflow-scrolling-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-overflow-scrolling-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-overflow-scrolling-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-overflow-scrolling-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-relative-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-relative-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/rtl/rtl-relative-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/rtl/rtl-relative-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scaling/tiled-layer-recursion-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scaling/tiled-layer-recursion-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scaling/tiled-layer-recursion-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/scaling/tiled-layer-recursion-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scissor-out-of-viewport-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scissor-out-of-viewport-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scissor-out-of-viewport-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/scissor-out-of-viewport-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scroll-with-ancestor-clip-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scroll-with-ancestor-clip-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scroll-with-ancestor-clip-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/scroll-with-ancestor-clip-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbar-painting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbar-painting-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbar-painting-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbar-painting-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbars/custom-composited-different-track-parts-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/custom-composited-different-track-parts-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbars/custom-composited-different-track-parts-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/custom-composited-different-track-parts-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbars/nested-overlay-scrollbars-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbars/nested-overlay-scrollbars-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbars/nested-overlay-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/scrollbars/nested-overlay-scrollbars-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/scrollbars/nested-overlay-scrollbars-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/self-painting-layers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/self-painting-layers-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/self-painting-layers-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/self-painting-layers-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/shadows/shadow-drawing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/shadows/shadow-drawing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/shadows/shadow-drawing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/shadows/shadow-drawing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/sibling-positioning-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/sibling-positioning-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/sibling-positioning-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/sibling-positioning-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/add-remove-squashed-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/add-remove-squashed-layers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/add-remove-squashed-layers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/add-remove-squashed-layers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/clipping-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/clipping-ancestor-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/clipping-ancestor-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/clipping-ancestor-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/composited-bounds-for-negative-z-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/composited-bounds-for-negative-z-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/composited-bounds-for-negative-z-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/composited-bounds-for-negative-z-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/do-not-squash-non-self-painting-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/frame-clip-squashed-scrolled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/frame-clip-squashed-scrolled-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/frame-clip-squashed-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/frame-clip-squashed-scrolled-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/frame-clip-squashed-scrolled-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/iframes-are-never-squashed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/iframes-are-never-squashed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/iframes-are-never-squashed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/iframes-are-never-squashed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invalidations-with-large-negative-margin-inline-content-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/move-squashing-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/move-squashing-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/move-squashing-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/move-squashing-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/no-squashing-for-filters-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-for-filters-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/no-squashing-for-filters-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-for-filters-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/opacity-squashed-owner-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/opacity-squashed-owner-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/opacity-squashed-owner-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/opacity-squashed-owner-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/repaint-child-of-squashed-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/repaint-child-of-squashed-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/repaint-child-of-squashed-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/repaint-child-of-squashed-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/selection-repaint-with-gaps-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/selection-repaint-with-gaps-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/selection-repaint-with-gaps-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/selection-repaint-with-gaps-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/selection-repaint-with-gaps-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-above-fixed-1-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-1-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-above-fixed-1-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-1-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-above-fixed-2-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-2-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-above-fixed-2-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-2-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-above-fixed-3-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-3-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-above-fixed-3-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-above-fixed-3-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-compositing-hover-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-compositing-hover-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-compositing-hover-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-compositing-hover-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-onto-distant-relative-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-distant-relative-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-onto-distant-relative-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-distant-relative-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-onto-nephew-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-nephew-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-onto-nephew-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-nephew-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-onto-transform-backing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-transform-backing-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-onto-transform-backing-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-onto-transform-backing-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-same-transform-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-same-transform-ancestor-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-same-transform-ancestor-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-same-transform-ancestor-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-simple-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-simple-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-simple-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-simple-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-three-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-three-layers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-three-layers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-three-layers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-transform-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-transform-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-child-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-transform-repainting-child-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-child-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashed-repaints-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-repaints-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashed-repaints-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashed-repaints-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashing-inside-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-inside-perspective-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashing-inside-perspective-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-inside-perspective-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashing-print-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-print-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashing-print-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-print-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashing-sparsity-heuristic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-sparsity-heuristic-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/squashing-sparsity-heuristic-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/squashing-sparsity-heuristic-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/vertical-writing-mode-squashed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/vertical-writing-mode-squashed-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/squashing/vertical-writing-mode-squashed-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/squashing/vertical-writing-mode-squashed-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/text-on-large-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/text-on-large-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/text-on-large-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/text-on-large-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/text-on-scaled-surface-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/text-on-scaled-surface-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/text-on-scaled-surface-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/text-on-scaled-surface-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/transitions/scale-transition-no-start-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/transitions/scale-transition-no-start-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/transitions/scale-transition-no-start-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/transitions/scale-transition-no-start-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/transitions/singular-scale-transition-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/transitions/singular-scale-transition-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/transitions/singular-scale-transition-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/transitions/singular-scale-transition-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/video/video-controls-layer-creation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-layer-creation-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/video/video-controls-layer-creation-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-layer-creation-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/video/video-controls-squashing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-squashing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/video/video-controls-squashing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-controls-squashing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/video/video-poster-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-poster-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/video/video-poster-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/video/video-poster-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/layer-visible-content-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/layer-visible-content-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/layer-visible-content-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/layer-visible-content-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/layer-visible-content-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-composited-transforms-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-composited-transforms-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-composited-transforms-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-composited-transforms-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-dynamic-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-image-layers-dynamic-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-dynamic-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-image-layers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-image-layers-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-image-layers-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-on-distant-descendant-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-on-distant-descendant-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-on-distant-descendant-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-on-distant-descendant-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-simple-canvas2d-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-simple-canvas2d-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-simple-canvas2d-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-simple-canvas2d-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-simple-video-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-simple-video-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-simple-video-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-simple-video-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-simple-webgl-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-simple-webgl-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/visibility/visibility-simple-webgl-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/visibility/visibility-simple-webgl-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-background-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-background-color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-background-color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-background-color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-no-alpha-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-no-alpha-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-no-alpha-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-no-alpha-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-nonpremultiplied-blend-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-nonpremultiplied-blend-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-nonpremultiplied-blend-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-nonpremultiplied-blend-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-reflection-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-reflection-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-reflection-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-reflection-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-repaint-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-repaint-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/webgl/webgl-repaint-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/webgl/webgl-repaint-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/will-change/composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/composited-layers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/will-change/composited-layers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/composited-layers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/will-change/will-change-contents-suppresses-compositing-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/z-order/collect-layers-does-not-initialize-pos-z-order-list-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/z-order/collect-layers-does-not-initialize-pos-z-order-list-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/z-order/collect-layers-does-not-initialize-pos-z-order-list-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/z-order/collect-layers-does-not-initialize-pos-z-order-list-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/z-order/negative-z-index-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/compositing/z-order/negative-z-index-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/compositing/z-order/negative-z-index-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/compositing/z-order/negative-z-index-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/comments-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/basic/comments-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/comments-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/basic/comments-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/containment-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/basic/containment-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/containment-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/basic/containment-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/contextual_selectors-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/basic/contextual_selectors-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/contextual_selectors-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/basic/contextual_selectors-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/grouping-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/basic/grouping-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/grouping-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/basic/grouping-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/id_as_selector-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/basic/id_as_selector-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/id_as_selector-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/basic/id_as_selector-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/inheritance-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/basic/inheritance-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/basic/inheritance-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/basic/inheritance-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/acid_test-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/acid_test-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/acid_test-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom_width-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom_width-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom_width-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom_width-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom_width_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom_width_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_bottom_width_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_bottom_width_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_color_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_color_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_color_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_color_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left_width-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left_width-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left_width-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left_width-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left_width_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left_width_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_left_width_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_left_width_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right_width-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right_width-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right_width-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right_width-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right_width_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right_width_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_right_width_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_right_width_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_style-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_style-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_style-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_style-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_style_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_style_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_style_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_style_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top_width-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top_width-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top_width-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top_width-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top_width_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top_width_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_top_width_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_top_width_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_width-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_width-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_width-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_width-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_width_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_width_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/border_width_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/border_width_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/clear-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/clear-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/clear-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/clear-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/clear_float-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/clear_float-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/clear_float-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/clear_float-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float_elements_in_series-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float_elements_in_series-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float_elements_in_series-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float_elements_in_series-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float_margin-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float_margin-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float_margin-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float_margin-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float_on_text_elements-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float_on_text_elements-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/float_on_text_elements-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/float_on_text_elements-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/height-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/height-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/height-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/height-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_bottom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_bottom-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_bottom-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_bottom-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_bottom_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_bottom_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_bottom_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_bottom_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_left-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_left-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_left-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_left-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_left_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_left_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_left_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_left_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_right-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_right-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_right-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_right-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_right_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_right_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_right_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_right_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_top-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_top-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_top-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_top-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_top_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_top_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/margin_top_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/margin_top_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_bottom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_bottom-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_bottom-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_bottom-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_bottom_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_bottom_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_bottom_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_bottom_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_left-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_left-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_left-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_left-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_left_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_left_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_left_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_left_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_right-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_right-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_right-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_right-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_right_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_right_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_right_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_right_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_top-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_top-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_top-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_top-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_top_inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_top_inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/padding_top_inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/padding_top_inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/width-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/width-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/box_properties/width-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/box_properties/width-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/cascade/cascade_order-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/cascade/cascade_order-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/cascade/cascade_order-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/cascade/cascade_order-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/cascade/important-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/cascade/important-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/cascade/important-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/cascade/important-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/display-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/classification/display-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/display-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/classification/display-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style_image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style_image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style_image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style_image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style_position-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style_position-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style_position-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style_position-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style_type-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style_type-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/list_style_type-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/classification/list_style_type-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/white_space-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/classification/white_space-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/classification/white_space-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/classification/white_space-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_attachment-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_attachment-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_attachment-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_attachment-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_position-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_position-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_position-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_position-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_repeat-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_repeat-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/background_repeat-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/background_repeat-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/color_and_background/color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/color_and_background/color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/conformance/forward_compatible_parsing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/conformance/forward_compatible_parsing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/conformance/forward_compatible_parsing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/conformance/forward_compatible_parsing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_family-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_family-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_family-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_family-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_size-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_size-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_size-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_size-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_style-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_style-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_style-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_style-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_variant-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_variant-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_variant-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_variant-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_weight-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_weight-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/font_properties/font_weight-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/font_properties/font_weight-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/canvas-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/canvas-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/canvas-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/canvas-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/floating_elements-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/floating_elements-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/floating_elements-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/floating_elements-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/height_of_lines-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/height_of_lines-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/height_of_lines-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/height_of_lines-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/horizontal_formatting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/horizontal_formatting-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/horizontal_formatting-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/horizontal_formatting-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/inline_elements-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/inline_elements-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/inline_elements-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/inline_elements-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/replaced_elements-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/replaced_elements-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/replaced_elements-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/replaced_elements-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/vertical_formatting-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/vertical_formatting-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/formatting_model/vertical_formatting-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/formatting_model/vertical_formatting-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/anchor-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/anchor-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/anchor-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/anchor-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/firstletter-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/firstletter-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/firstletter-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/firstletter-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/firstline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/firstline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/firstline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/firstline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/multiple_pseudo_elements-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/multiple_pseudo_elements-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/multiple_pseudo_elements-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/multiple_pseudo_elements-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/pseudo_elements_in_selectors-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/pseudo_elements_in_selectors-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/pseudo/pseudo_elements_in_selectors-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/pseudo/pseudo_elements_in_selectors-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/letter_spacing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/letter_spacing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/letter_spacing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/letter_spacing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/line_height-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/line_height-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/line_height-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/line_height-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_align-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_align-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_align-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_align-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_decoration-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_decoration-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_decoration-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_decoration-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_indent-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_indent-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_indent-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_indent-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_transform-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/text_transform-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/text_transform-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/vertical_align-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/vertical_align-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/vertical_align-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/vertical_align-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/word_spacing-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/word_spacing-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/text_properties/word_spacing-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/text_properties/word_spacing-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/color_units-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/units/color_units-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/color_units-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/units/color_units-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/length_units-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/units/length_units-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/length_units-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/units/length_units-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/percentage_units-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/units/percentage_units-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/percentage_units-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/units/percentage_units-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/urls-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css1/units/urls-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css1/units/urls-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css1/units/urls-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/abspos-non-replaced-width-margin-000-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/abspos-replaced-width-margin-000-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/abspos-replaced-width-margin-000-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/abspos-replaced-width-margin-000-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/abspos-replaced-width-margin-000-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-002-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-002-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-002-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-002-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-003-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-003-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-003-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-003-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-004-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-004-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-004-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-004-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-005-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-005-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-005-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-005-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-006-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-006-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-006-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-006-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-007-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-007-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-007-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-007-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-008-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-008-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-008-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-008-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-009-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-009-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/background-intrinsic-009-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/background-intrinsic-009-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-collapse-offset-002-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-collapse-offset-002-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-collapse-offset-002-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-collapse-offset-002-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-conflict-style-079-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-conflict-style-079-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-conflict-style-079-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-conflict-style-079-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-conflict-style-088-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-conflict-style-088-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-conflict-style-088-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-conflict-style-088-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-spacing-applies-to-015-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-spacing-applies-to-015-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/border-spacing-applies-to-015-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/border-spacing-applies-to-015-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/c543-txt-decor-000-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/c543-txt-decor-000-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/c543-txt-decor-000-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/c543-txt-decor-000-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/height-width-inline-table-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/height-width-inline-table-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/height-width-inline-table-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/height-width-inline-table-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/height-width-table-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/height-width-table-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/height-width-table-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/height-width-table-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/inline-table-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/inline-table-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/inline-table-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/inline-table-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/list-style-position-005-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/list-style-position-005-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/list-style-position-005-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/list-style-position-005-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-002-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-002-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-002-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-002-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-003-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-003-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-003-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-003-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-004-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-004-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-004-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-004-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-005-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-005-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-005-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-005-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-006-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-006-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-006-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-006-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-007-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-007-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-007-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-007-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-008-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-008-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-008-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-008-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-009-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-009-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-009-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-009-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-010-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-010-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-010-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-010-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-012-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-012-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-012-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-012-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-013-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-013-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-013-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-013-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-015-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-015-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/margin-applies-to-015-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/margin-applies-to-015-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/outline-color-applies-to-008-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/outline-color-applies-to-008-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/outline-color-applies-to-008-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/outline-color-applies-to-008-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/outline-color-applies-to-014-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/outline-color-applies-to-014-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/outline-color-applies-to-014-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/outline-color-applies-to-014-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-002-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-002-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-002-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-002-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-horizontal-alignment-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-margins-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-margins-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-margins-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-margins-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-optional-001-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-optional-001-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-optional-001-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-optional-001-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-optional-002-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-optional-002-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-caption-optional-002-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-caption-optional-002-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-height-algorithm-023-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-height-algorithm-023-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-height-algorithm-023-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-height-algorithm-023-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-height-algorithm-024-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-height-algorithm-024-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/20110323/table-height-algorithm-024-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/20110323/table-height-algorithm-024-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-border-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-border-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-border-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-border-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t010403-shand-font-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t010403-shand-font-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040102-keywords-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040102-keywords-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040102-keywords-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040102-keywords-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040102-keywords-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040102-keywords-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040102-keywords-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040102-keywords-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-case-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-case-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-case-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-case-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-case-01-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-case-01-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-case-01-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-case-01-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-02-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-02-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-02-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-02-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-04-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-04-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-04-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-04-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-05-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-05-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-05-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-05-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-06-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-06-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-06-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-06-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-07-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-07-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-07-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-07-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-08-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-08-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-escapes-08-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-escapes-08-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-01-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-01-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-01-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-01-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-02-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-02-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-02-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-02-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-03-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-03-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-03-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-03-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-04-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-04-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-04-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-04-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-05-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-05-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-05-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-05-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-06-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-06-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-06-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-06-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-07-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-07-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-07-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-07-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-08-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-08-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-08-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-08-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-09-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-09-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-09-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-09-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-10-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-10-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-10-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-10-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-11-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-11-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-11-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-11-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-12-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-12-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-12-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-12-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-13-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-13-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040103-ident-13-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040103-ident-13-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atkeyw-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atkeyw-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atkeyw-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atkeyw-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atkeyw-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atkeyw-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atkeyw-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atkeyw-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atkeyw-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atkeyw-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atkeyw-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atkeyw-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-04-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-04-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-atrule-04-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-atrule-04-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-import-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-import-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-import-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-import-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-import-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-import-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-import-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-import-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-import-10-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-import-10-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040105-import-10-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040105-import-10-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040109-c17-comments-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040109-c17-comments-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040109-c17-comments-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040109-c17-comments-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040109-c17-comments-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040109-c17-comments-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040109-c17-comments-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040109-c17-comments-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-00-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-00-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-00-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-00-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-01-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-01-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-01-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-01-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-02-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-02-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-02-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-02-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-03-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-03-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-03-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-03-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-04-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-04-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-c71-fwd-parsing-04-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-c71-fwd-parsing-04-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-01-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-01-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-01-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-01-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-02-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-02-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-02-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-02-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-03-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-03-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-03-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-03-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-04-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-04-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-04-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-04-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-05-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-05-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-05-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-05-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-06-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-06-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0402-syntax-06-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0402-syntax-06-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040302-c61-ex-len-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040302-c61-ex-len-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040302-c61-ex-len-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040302-c61-ex-len-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040302-c61-phys-len-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040302-c61-phys-len-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040302-c61-phys-len-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040302-c61-phys-len-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040302-c61-rel-len-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040302-c61-rel-len-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040302-c61-rel-len-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040302-c61-rel-len-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040303-c62-percent-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040303-c62-percent-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040303-c62-percent-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040303-c62-percent-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040304-c64-uri-00-a-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040304-c64-uri-00-a-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040304-c64-uri-00-a-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040304-c64-uri-00-a-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040306-c63-color-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040306-c63-color-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040306-c63-color-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040306-c63-color-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040306-syntax-01-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040306-syntax-01-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040306-syntax-01-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040306-syntax-01-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040307-syntax-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040307-syntax-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t040307-syntax-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t040307-syntax-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t050201-c12-grouping-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t050201-c12-grouping-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t050201-c12-grouping-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t050201-c12-grouping-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0505-c16-descendant-00-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0505-c16-descendant-00-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0505-c16-descendant-00-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0505-c16-descendant-00-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0505-c16-descendant-01-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0505-c16-descendant-01-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0505-c16-descendant-01-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0505-c16-descendant-01-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0505-c16-descendant-02-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0505-c16-descendant-02-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0505-c16-descendant-02-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0505-c16-descendant-02-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t050803-c14-classes-00-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t050803-c14-classes-00-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t050803-c14-classes-00-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t050803-c14-classes-00-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-c15-ids-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-c15-ids-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-c15-ids-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-c15-ids-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-c15-ids-01-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-c15-ids-01-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-c15-ids-01-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-c15-ids-01-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-id-sel-syntax-01-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-id-sel-syntax-01-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-id-sel-syntax-01-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-id-sel-syntax-01-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-id-sel-syntax-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-id-sel-syntax-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0509-id-sel-syntax-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0509-id-sel-syntax-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0510-c25-pseudo-elmnt-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-anch-00-e-i-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-anch-00-e-i-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-anch-00-e-i-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-anch-00-e-i-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-00-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-00-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-00-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-00-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-01-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-01-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-01-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-01-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-02-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-02-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-02-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-02-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-03-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-03-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0511-c21-pseud-link-03-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0511-c21-pseud-link-03-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-c21-activ-ln-00-e-i-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-c21-activ-ln-00-e-i-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-c21-activ-ln-00-e-i-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-c21-activ-ln-00-e-i-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-c21-focus-ln-00-e-i-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-c21-focus-ln-00-e-i-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-c21-focus-ln-00-e-i-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-c21-focus-ln-00-e-i-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-c21-hover-ln-00-e-i-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-c21-hover-ln-00-e-i-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-c21-hover-ln-00-e-i-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-c21-hover-ln-00-e-i-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-dom-hover-01-c-io-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-dom-hover-01-c-io-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-dom-hover-01-c-io-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-dom-hover-01-c-io-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-dom-hover-02-c-io-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-dom-hover-02-c-io-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051103-dom-hover-02-c-io-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051103-dom-hover-02-c-io-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051201-c23-first-line-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051201-c23-first-line-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051201-c23-first-line-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051201-c23-first-line-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051202-c24-first-lttr-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051202-c24-first-lttr-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051202-c24-first-lttr-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051202-c24-first-lttr-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051202-c26-psudo-nest-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051202-c26-psudo-nest-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t051202-c26-psudo-nest-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t051202-c26-psudo-nest-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0602-c13-inh-underlin-00-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0602-c13-inh-underlin-00-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0602-c13-inh-underlin-00-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0602-c13-inh-underlin-00-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0602-c13-inheritance-00-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0602-c13-inheritance-00-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0602-c13-inheritance-00-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0602-c13-inheritance-00-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0602-inherit-bdr-pad-b-00-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0602-inherit-bdr-pad-b-00-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0602-inherit-bdr-pad-b-00-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0602-inherit-bdr-pad-b-00-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0603-c11-import-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0603-c11-import-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0603-c11-import-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0603-c11-import-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060401-c32-cascading-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060401-c32-cascading-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060401-c32-cascading-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060401-c32-cascading-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060402-c31-important-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060402-c31-important-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060402-c31-important-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060402-c31-important-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060403-c21-pseu-cls-00-e-i-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060403-c21-pseu-id-00-e-i-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060403-c21-pseu-id-00-e-i-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t060403-c21-pseu-id-00-e-i-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t060403-c21-pseu-id-00-e-i-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0801-c412-hz-box-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0801-c412-hz-box-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0801-c412-hz-box-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0801-c412-hz-box-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5501-imrgn-t-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5501-mrgn-t-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-01-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-02-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-03-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-04-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-05-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-imrgn-r-06-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-01-c-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-02-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-02-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-02-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-02-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-03-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-03-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5502-mrgn-r-03-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5502-mrgn-r-03-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5503-imrgn-b-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5503-mrgn-b-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-01-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-02-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-03-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-04-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-05-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-imrgn-l-06-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-01-c-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-02-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-02-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-02-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-02-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-03-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-03-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5504-mrgn-l-03-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5504-mrgn-l-03-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-imrgn-00-a-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-01-e-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-01-e-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-01-e-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-01-e-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-02-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-02-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-02-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-02-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0803-c5505-mrgn-03-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t080301-c411-vt-mrgn-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t080301-c411-vt-mrgn-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t080301-c411-vt-mrgn-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t080301-c411-vt-mrgn-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-ipadn-t-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-ipadn-t-01-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-ipadn-t-02-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-padn-t-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-padn-t-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5506-padn-t-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5506-padn-t-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-01-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-02-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-03-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-ipadn-r-04-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-01-c-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-01-c-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-01-c-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-01-c-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-02-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-02-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-02-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-02-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-03-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-03-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5507-padn-r-03-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5507-padn-r-03-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-01-f-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-02-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5508-ipadn-b-03-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-01-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-02-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-03-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-ipadn-l-04-f-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-01-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-01-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-01-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-01-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-02-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-02-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-02-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-02-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-03-f-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-03-f-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5509-padn-l-03-f-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5509-padn-l-03-f-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-ipadn-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-padn-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-padn-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-padn-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-padn-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-padn-01-e-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-padn-01-e-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-padn-01-e-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-padn-01-e-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-padn-02-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-padn-02-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0804-c5510-padn-02-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0804-c5510-padn-02-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-brdr-tw-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-brdr-tw-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-brdr-rw-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-brdr-rw-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-brdr-bw-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-brdr-bw-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-brdr-lw-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-brdr-lw-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-brdr-w-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-brdr-w-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-brdr-w-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-brdr-w-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-brdr-w-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-brdr-w-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-brdr-w-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-brdr-w-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-brdr-w-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-ibrdr-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-ibrdr-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5515-ibrdr-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5515-ibrdr-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5516-brdr-c-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5516-brdr-c-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5516-brdr-c-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5516-brdr-c-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5517-brdr-s-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5517-brdr-s-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5517-brdr-s-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5517-brdr-s-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5517-ibrdr-s-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5518-brdr-t-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5518-brdr-t-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5518-brdr-t-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5518-brdr-t-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5518-brdr-t-01-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5518-brdr-t-01-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5518-brdr-t-01-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5518-brdr-t-01-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5518-ibrdr-t-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-brdr-r-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-brdr-r-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-brdr-r-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-brdr-r-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-brdr-r-01-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-brdr-r-01-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-brdr-r-01-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-brdr-r-01-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-brdr-r-02-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-brdr-r-02-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-brdr-r-02-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-brdr-r-02-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5519-ibrdr-r-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5520-brdr-b-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5520-brdr-b-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5520-brdr-b-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5520-brdr-b-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5520-brdr-b-01-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5520-brdr-b-01-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5520-brdr-b-01-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5520-brdr-b-01-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5520-ibrdr-b-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-brdr-l-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-brdr-l-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-brdr-l-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-brdr-l-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-brdr-l-01-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-brdr-l-01-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-brdr-l-01-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-brdr-l-01-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-brdr-l-02-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-brdr-l-02-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-brdr-l-02-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-brdr-l-02-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-brdr-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-brdr-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-brdr-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-brdr-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-brdr-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-brdr-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-brdr-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-brdr-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-brdr-02-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-brdr-02-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-brdr-02-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-brdr-02-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-ibrdr-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-ibrdr-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0805-c5522-ibrdr-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0805-c5522-ibrdr-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t09-c5526c-display-00-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t09-c5526c-display-00-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t09-c5526c-display-00-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t09-c5526c-display-00-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090204-display-change-01-b-ao-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090204-display-change-01-b-ao-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090204-display-change-01-b-ao-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090204-display-change-01-b-ao-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090402-c42-ibx-pad-00-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-00-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-00-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-00-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-00-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-01-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-01-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-01-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-01-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-02-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-02-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-02-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-02-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-03-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-03-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-03-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-03-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-04-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-04-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-04-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-04-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-fit-00-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-fit-00-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-fit-00-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-fit-00-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-fit-01-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-fit-01-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-fit-01-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-fit-01-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-wrap-00-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-00-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-wrap-00-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-00-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltblck-01-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltblck-01-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltblck-01-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltblck-01-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltclr-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltcont-00-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltcont-00-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltcont-00-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltcont-00-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-flthw-00-c-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-flthw-00-c-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-flthw-00-c-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-flthw-00-c-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltinln-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltmrgn-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltmult-00-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltmult-00-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltmult-00-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltmult-00-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-01-c-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwrap-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwrap-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5525-fltwrap-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5525-fltwrap-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5526-fltclr-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5526-flthw-00-c-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5526-flthw-00-c-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t0905-c5526-flthw-00-c-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t0905-c5526-flthw-00-c-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-00-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-00-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-00-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-00-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-02-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-02-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-02-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-02-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-03-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-03-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-03-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-03-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-00-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-00-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-00-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-00-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-01-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-01-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-01-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-01-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-02-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-02-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-02-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-02-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-03-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-03-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c414-flt-ln-03-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c414-flt-ln-03-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c5525-flt-l-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c5525-flt-l-00-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c5525-flt-l-00-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c5525-flt-l-00-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c5525-flt-r-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c5525-flt-r-00-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t090501-c5525-flt-r-00-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t090501-c5525-flt-r-00-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-04-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-04-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-04-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-04-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-05-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-05-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-05-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-05-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-06-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-06-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-06-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-06-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-07-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-07-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-07-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-07-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-08-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-08-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-08-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-08-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-09-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-09-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1001-abs-pos-cb-09-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1001-abs-pos-cb-09-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1002-c5523-width-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1002-c5523-width-00-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1002-c5523-width-00-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1002-c5523-width-00-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1002-c5523-width-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1002-c5523-width-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1002-c5523-width-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1002-c5523-width-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1002-c5523-width-02-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1002-c5523-width-02-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1002-c5523-width-02-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1002-c5523-width-02-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100303-c412-blockw-00-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100303-c412-blockw-00-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100303-c412-blockw-00-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100303-c412-blockw-00-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100304-c43-rpl-bbx-00-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1004-c43-rpl-bbx-00-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1004-c43-rpl-ibx-00-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1004-c5524-width-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1004-c5524-width-00-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1004-c5524-width-00-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1004-c5524-width-00-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1005-c5524-width-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1005-c5524-width-00-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1005-c5524-width-00-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1005-c5524-width-00-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1005-c5524-width-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1005-c5524-width-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1005-c5524-width-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1005-c5524-width-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-00-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-00-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-00-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-00-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-01-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-01-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-01-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-01-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-02-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-02-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-02-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-02-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-03-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-03-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1008-c44-ln-box-03-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1008-c44-ln-box-03-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c42-ibx-ht-00-d-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-00-a-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-00-a-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-00-a-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-00-a-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-01-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-01-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-01-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-01-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-02-d-agi-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-02-d-agi-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-02-d-agi-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-03-d-agi-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-03-d-agi-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-03-d-agi-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-03-d-agi-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-04-d-agi-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-04-d-agi-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c544-valgn-04-d-agi-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c544-valgn-04-d-agi-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-leadin-00-d-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-leadin-00-d-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-leadin-00-d-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-leadin-00-d-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-00-c-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-00-c-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-00-c-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-00-c-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-01-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-02-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-03-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t100801-c548-ln-ht-04-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-04-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-04-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-04-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-04-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-05-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-05-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-05-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-05-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-06-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-06-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-06-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-06-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-07-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-07-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-07-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-07-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-08-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-08-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-08-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-08-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-11-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-11-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-11-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-11-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-12-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-12-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-12-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-12-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-13-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-13-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-13-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-13-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-14-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-14-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-14-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-14-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-15-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-15-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-15-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-15-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-16-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-16-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counter-16-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counter-16-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-04-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-04-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-04-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-04-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-05-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-05-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-05-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-05-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-06-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-06-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-06-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-06-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-07-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-07-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-07-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-07-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-08-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-08-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-08-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-08-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-11-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-11-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-11-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-11-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-12-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-12-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-12-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-12-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-13-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-13-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-13-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-13-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-14-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-14-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-14-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-14-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-15-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-15-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-15-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-15-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-16-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-16-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-16-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-16-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-17-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-17-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-17-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-17-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-18-f-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-18-f-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1202-counters-18-f-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1202-counters-18-f-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-implied-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-implied-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-implied-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-implied-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-implied-01-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-implied-01-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-implied-01-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-implied-01-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-implied-02-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-implied-02-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-implied-02-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-implied-02-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-multiple-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-multiple-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-multiple-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-multiple-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-multiple-01-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-multiple-01-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-multiple-01-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-multiple-01-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-order-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-order-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-order-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-order-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-order-01-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-order-01-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-order-01-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-order-01-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-root-e-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-root-e-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1204-root-e-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1204-root-e-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-01-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-01-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-01-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-01-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-02-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-02-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-02-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-02-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-03-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-03-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-03-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-03-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-04-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-04-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120401-scope-04-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120401-scope-04-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120403-content-none-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120403-content-none-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120403-content-none-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120403-content-none-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120403-display-none-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120403-display-none-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120403-display-none-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120403-display-none-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120403-visibility-00-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120403-visibility-00-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t120403-visibility-00-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t120403-visibility-00-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c561-list-displ-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c561-list-displ-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c561-list-displ-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c561-list-displ-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c563-list-type-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c563-list-type-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c563-list-type-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c563-list-type-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c563-list-type-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c563-list-type-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c563-list-type-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c563-list-type-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c564-list-img-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c564-list-img-00-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c564-list-img-00-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c564-list-img-00-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c565-list-pos-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c565-list-pos-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c565-list-pos-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c565-list-pos-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c566-list-stl-00-e-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c566-list-stl-00-e-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c566-list-stl-00-e-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c566-list-stl-00-e-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c566-list-stl-01-c-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c566-list-stl-01-c-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1205-c566-list-stl-01-c-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1205-c566-list-stl-01-c-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1401-c531-color-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1401-c531-color-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1401-c531-color-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1401-c531-color-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1402-c45-bg-canvas-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1402-c45-bg-canvas-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1402-c45-bg-canvas-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1402-c45-bg-canvas-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c532-bgcolor-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c532-bgcolor-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c532-bgcolor-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c532-bgcolor-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c532-bgcolor-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c532-bgcolor-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c532-bgcolor-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c532-bgcolor-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c533-bgimage-00-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c533-bgimage-00-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c533-bgimage-00-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c533-bgimage-00-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c533-bgimage-01-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c533-bgimage-01-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c533-bgimage-01-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c533-bgimage-01-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgre-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgre-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgre-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgre-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgre-01-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgre-01-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgre-01-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgre-01-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-01-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-01-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-01-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-01-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-02-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-02-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-02-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-02-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-03-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-03-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-03-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-03-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-04-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-04-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-04-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-04-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-05-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-05-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c534-bgreps-05-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c534-bgreps-05-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c536-bgpos-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c536-bgpos-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c536-bgpos-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c536-bgpos-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c536-bgpos-01-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c536-bgpos-01-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c536-bgpos-01-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c536-bgpos-01-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1503-c522-font-family-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1503-c522-font-family-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1503-c522-font-family-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1503-c522-font-family-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1504-c523-font-style-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1504-c523-font-style-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1504-c523-font-style-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1504-c523-font-style-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1505-c524-font-var-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1505-c524-font-var-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1505-c524-font-var-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1505-c524-font-var-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1506-c525-font-wt-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1506-c525-font-wt-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1506-c525-font-wt-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1506-c525-font-wt-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-01-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-01-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-01-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-01-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-02-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-02-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-02-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-02-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-03-f-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-03-f-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1507-c526-font-sz-03-f-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1507-c526-font-sz-03-f-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-01-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-01-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-01-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-01-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-02-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-02-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-02-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-02-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-03-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-03-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-03-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-03-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-04-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-04-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-04-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-04-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-05-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-05-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-05-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-05-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-06-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-06-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-06-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-06-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-07-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-07-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-07-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-07-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-08-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-08-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-08-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-08-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-09-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-09-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-09-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-09-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-10-c-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-10-c-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1508-c527-font-10-c-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1508-c527-font-10-c-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1601-c547-indent-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1601-c547-indent-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1601-c547-indent-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1601-c547-indent-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1601-c547-indent-01-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1601-c547-indent-01-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1601-c547-indent-01-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1601-c547-indent-01-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1602-c43-center-00-d-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1602-c43-center-00-d-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1602-c43-center-00-d-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1602-c43-center-00-d-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1602-c546-txt-align-00-b-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1602-c546-txt-align-00-b-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1602-c546-txt-align-00-b-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1602-c546-txt-align-00-b-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1604-c542-letter-sp-00-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1604-c542-letter-sp-00-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1604-c542-letter-sp-00-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1604-c542-letter-sp-00-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1604-c542-letter-sp-01-b-a-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1604-c542-letter-sp-01-b-a-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1604-c542-letter-sp-01-b-a-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1604-c542-letter-sp-01-b-a-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1605-c545-txttrans-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1605-c545-txttrans-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1605-c545-txttrans-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1605-c545-txttrans-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1606-c562-white-sp-00-b-ag-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1606-c562-white-sp-00-b-ag-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t1606-c562-white-sp-00-b-ag-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t1606-c562-white-sp-00-b-ag-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-00-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-00-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-00-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-00-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-01-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-01-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-01-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-01-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-02-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-02-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-02-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-02-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-03-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-03-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-03-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-03-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-04-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-04-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-04-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-04-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-05-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-05-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-05-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-05-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-06-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-06-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-06-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-06-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-07-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-07-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-07-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-07-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-08-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-08-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-08-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-08-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-09-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-09-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-09-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-09-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-10-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-10-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-10-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-10-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-11-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-11-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-11-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-11-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-12-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-12-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-12-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-12-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-13-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-13-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-13-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-13-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-14-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-14-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-14-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-14-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-15-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-15-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-15-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-15-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-16-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-16-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-16-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-16-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-17-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-17-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-17-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-17-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-18-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-18-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-18-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-18-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-19-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-19-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-19-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-19-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-20-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-20-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-20-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-20-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-21-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-21-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-21-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-21-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-22-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-22-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-22-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-22-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-23-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-23-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-23-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-23-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-24-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-24-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-24-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-24-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-25-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-25-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-25-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-25-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-26-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-26-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-26-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-26-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-27-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-27-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-27-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-27-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-28-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-28-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-28-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-28-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-29-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-29-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-29-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-29-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-30-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-30-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-30-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-30-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-31-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-31-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-31-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-31-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-32-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-32-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-32-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-32-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-33-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-33-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-33-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-33-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-34-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-34-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-34-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-34-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-35-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-35-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-35-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-35-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-36-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-36-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-36-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-36-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-37-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-37-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-37-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-37-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-38-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-38-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-38-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-38-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-39-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-39-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-39-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-39-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-40-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-40-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-40-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-40-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-41-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-41-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-41-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-41-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-42-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-42-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-42-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-42-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-43-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-43-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-43-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-43-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-44-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-44-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-44-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-44-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-45-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-45-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-45-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-45-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-46-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-46-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-46-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-46-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-47-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-47-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-47-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-47-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-48-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-48-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-48-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-48-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-49-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-49-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-49-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-49-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-50-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-50-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-50-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-50-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-51-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-51-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-51-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-51-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-52-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-52-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-52-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-52-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-53-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-53-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-53-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-53-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-54-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-54-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-54-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-54-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-55-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-55-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-55-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-55-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-56-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-56-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-56-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-56-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-57-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-57-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-57-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-57-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-58-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-58-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-58-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-58-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-59-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-59-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-59-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-59-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-60-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-60-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-60-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-60-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-61-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-61-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-61-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-61-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-62-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-62-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-62-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-62-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-63-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-63-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-63-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-63-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-64-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-64-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-64-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-64-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-65-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-65-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-65-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-65-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-66-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-66-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-66-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-66-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-67-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-67-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-67-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-67-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-68-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-68-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-68-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-68-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-69-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-69-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-69-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-69-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-70-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-70-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-70-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-70-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-71-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-71-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-71-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-71-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-72-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-72-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-72-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-72-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-73-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-73-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-73-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-73-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-74-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-74-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-74-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-74-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-75-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-75-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-75-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-75-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-76-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-76-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-76-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-76-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-77-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-77-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-77-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-77-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-78-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-78-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-78-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-78-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-79-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-79-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-79-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-79-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-80-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-80-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-80-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-80-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-81-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-81-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-81-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-81-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-82-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-82-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-82-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-82-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-83-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-83-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-83-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-83-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-84-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-84-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-84-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-84-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-85-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-85-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-85-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-85-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-86-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-86-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-86-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-86-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-87-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-87-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-87-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-87-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-88-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-88-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-88-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-88-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-89-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-89-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-89-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-89-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-90-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-90-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-90-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-90-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-91-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-91-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-91-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-91-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-92-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-92-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-92-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-92-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-93-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-93-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-93-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-93-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-94-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-94-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-94-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-94-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-95-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-95-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-95-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-95-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-96-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-96-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-96-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-96-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-97-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-97-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-97-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-97-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-98-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-98-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-98-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-98-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-99-d-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-99-d-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css2.1/t170602-bdr-conflct-w-99-d-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css2.1/t170602-bdr-conflct-w-99-d-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-color-gradient-alignment-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-color-gradient-alignment-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-color-gradient-alignment-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-color-gradient-alignment-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-large-position-and-size-remains-stable-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-large-position-and-size-remains-stable-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-large-position-and-size-remains-stable-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-large-position-and-size-remains-stable-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-percent-position-sprite-zoomed-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-percent-position-sprite-zoomed-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-percent-position-sprite-zoomed-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-percent-position-sprite-zoomed-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-auto1-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-auto1-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-auto1-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-auto1-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-border-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-border-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-border-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-border-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-content-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-content-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-content-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-content-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-padding-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-padding-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-repeat-round-padding-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-repeat-round-padding-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-size-scaled-subset-of-small-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-size-scaled-subset-of-small-image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/background-size-scaled-subset-of-small-image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/background-size-scaled-subset-of-small-image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/zoomed-background-position-accuracy-2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/zoomed-background-position-accuracy-2-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/zoomed-background-position-accuracy-2-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/zoomed-background-position-accuracy-2-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/zoomed-background-position-accuracy-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/background/zoomed-background-position-accuracy-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/background/zoomed-background-position-accuracy-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/background/zoomed-background-position-accuracy-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-crossfade-image-gradient-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-data-uri-svg-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-data-uri-svg-image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-data-uri-svg-image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-data-uri-svg-image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-default-value-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-default-value-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-default-value-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-default-value-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-different-image-formats-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-different-image-formats-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-different-image-formats-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-different-image-formats-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gif-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gif-color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gif-color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gif-color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gradient-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gradient-color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gradient-color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gradient-color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gradient-gradient-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gradient-gradient-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gradient-gradient-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gradient-gradient-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gradient-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gradient-image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-gradient-image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-gradient-image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-image-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-image-color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-image-image-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-image-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-image-image-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-image-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-image-svg-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-svg-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-image-svg-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-image-svg-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-multiple-background-layers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-multiple-background-layers-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-multiple-background-layers-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-multiple-background-layers-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-opaque-layer-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-opaque-layer-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-opaque-layer-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-opaque-layer-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-overlapping-accelerated-elements-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-separate-layer-declaration-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-separate-layer-declaration-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-separate-layer-declaration-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-separate-layer-declaration-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-single-layer-no-blending-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-single-layer-no-blending-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-single-layer-no-blending-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-single-layer-no-blending-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-svg-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-svg-color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-svg-color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-svg-color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-tiled-gradient-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-tiled-gradient-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/background-blend-mode-tiled-gradient-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/background-blend-mode-tiled-gradient-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/effect-background-blend-mode-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/effect-background-blend-mode-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/effect-background-blend-mode-stacking-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-stacking-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/effect-background-blend-mode-stacking-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-stacking-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/effect-background-blend-mode-tiled-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-tiled-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/effect-background-blend-mode-tiled-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/effect-background-blend-mode-tiled-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-layers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-composited-layers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-layers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-composited-reason-children-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-reason-children-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-composited-reason-children-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-composited-reason-children-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolated-group-1-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolated-group-1-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolated-group-1-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolated-group-1-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolated-group-2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolated-group-2-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolated-group-2-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolated-group-2-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolated-group-3-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolated-group-3-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolated-group-3-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolated-group-3-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolation-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolation-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolation-remove-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-remove-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-isolation-remove-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-isolation-remove-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-simple-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-simple-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-simple-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-simple-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-simple-text-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-simple-text-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-simple-text-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-simple-text-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-with-masking-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-with-masking-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/mix-blend-mode-with-masking-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/mix-blend-mode-with-masking-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-color-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-color-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-color-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-color-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-hue-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-hue-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-hue-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-hue-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-luminosity-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-luminosity-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-luminosity-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-luminosity-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-multiply-alpha-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-multiply-alpha-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-multiply-alpha-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-multiply-alpha-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-saturation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-saturation-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/blending/svg-blend-saturation-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/blending/svg-blend-saturation-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/calc/calc-numbers-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/calc/calc-numbers-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/calc/calc-numbers-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/calc/calc-numbers-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/calc/table-border-spacing-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/calc/table-border-spacing-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/calc/table-border-spacing-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/calc/table-border-spacing-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-33-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-33-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-33-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-33-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-35-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-35-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-35-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-35-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-36-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-36-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-36-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-36-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-37-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-37-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/css3-modsel-37-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/css3-modsel-37-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/add-filter-rendering-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/add-filter-rendering-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/add-filter-rendering-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/add-filter-rendering-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-basic-blur-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-basic-blur-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-basic-blur-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-basic-blur-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-border-radius-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-border-radius-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-border-radius-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-border-radius-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-boundary-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-boundary-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-boundary-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-boundary-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-browser-zoom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-browser-zoom-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-browser-zoom-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-browser-zoom-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-clip-radius-zoom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-clip-radius-zoom-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-clip-radius-zoom-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-clip-radius-zoom-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-clip-rect-zoom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-clip-rect-zoom-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-clip-rect-zoom-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-clip-rect-zoom-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-edge-clipping-2-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-edge-clipping-2-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-edge-clipping-2-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-edge-clipping-2-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-edge-pixels-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-edge-pixels-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-edge-pixels-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-edge-pixels-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-plus-mask-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-plus-mask-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-plus-mask-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-plus-mask-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-plus-mask-large-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-plus-mask-large-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-plus-mask-large-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-plus-mask-large-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-transform-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/backdrop-filter-transform-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/backdrop-filter-transform-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/blur-filter-page-scroll-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/blur-filter-page-scroll-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/blur-filter-page-scroll-parents-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-parents-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/blur-filter-page-scroll-parents-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-parents-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/blur-filter-page-scroll-self-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-self-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/blur-filter-page-scroll-self-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/blur-filter-page-scroll-self-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/buffer-offset-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/buffer-offset-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/buffer-offset-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/buffer-offset-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-during-transition-layertree-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-during-transition-layertree-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-during-transition-layertree-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-during-transition-layertree-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-reflected-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-reflected-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/composited-reflected-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/composited-reflected-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/crash-filter-change-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/crash-filter-change-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/crash-filter-change-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/crash-filter-change-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/css-opacity-with-drop-shadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/css-opacity-with-drop-shadow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/css-opacity-with-drop-shadow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/css-opacity-with-drop-shadow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-all-on-background-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-all-on-background-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-all-on-background-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-all-on-background-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-blur-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-blur-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-blur-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-blur-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-blur-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-clamping-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-clamping-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-clamping-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-clamping-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-clamping-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-clamping-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-clamping-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-clamping-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-brightness-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-brightness-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-combined-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-combined-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-combined-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-combined-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-combined-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-combined-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-combined-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-combined-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-contrast-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-contrast-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-contrast-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-contrast-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-contrast-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-contrast-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-contrast-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-contrast-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-drop-shadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-drop-shadow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-drop-shadow-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-drop-shadow-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-drop-shadow-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-grayscale-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-grayscale-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-grayscale-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-grayscale-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-grayscale-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-grayscale-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-grayscale-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-grayscale-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-hue-rotate-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-hue-rotate-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-hue-rotate-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-hue-rotate-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-hue-rotate-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-hue-rotate-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-hue-rotate-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-hue-rotate-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-invert-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-invert-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-invert-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-invert-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-invert-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-invert-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-invert-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-invert-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-opacity-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-opacity-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-opacity-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-opacity-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-opacity-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-opacity-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-opacity-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-opacity-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-colorspace-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-colorspace-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-colorspace-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-colorspace-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-colorspace-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-colorspace-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-colorspace-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-colorspace-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-composite-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-composite-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-composite-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-composite-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-composite-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-composite-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-composite-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-composite-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-external-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-external-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-external-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-external-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-ordering-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-ordering-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-ordering-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-ordering-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-ordering-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-ordering-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-ordering-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-chained-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-chained-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-chained-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-chained-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-chained-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-colormatrix-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-colormatrix-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-colormatrix-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-colormatrix-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-nested-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-nested-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-subregion-nested-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-subregion-nested-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-tile-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-tile-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-tile-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-tile-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-tile-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-tile-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-tile-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-tile-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-zoom-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-zoom-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-zoom-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-zoom-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-zoom-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-zoom-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-reference-zoom-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-reference-zoom-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-saturate-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-saturate-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-saturate-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-saturate-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-saturate-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-saturate-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-saturate-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-saturate-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-sepia-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-sepia-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-sepia-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-sepia-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-sepia-hw-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-sepia-hw-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/effect-sepia-hw-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/effect-sepia-hw-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-change-repaint-composited-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-change-repaint-composited-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-change-repaint-composited-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-change-repaint-composited-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-change-repaint-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-change-repaint-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-change-repaint-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-change-repaint-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-region-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-region-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-region-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-region-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-blur-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-blur-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-blur-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-blur-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-child-layers-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-child-layers-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-child-layers-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-child-layers-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-composited-fallback-crash-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-composited-fallback-crash-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-composited-fallback-crash-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-composited-fallback-crash-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-composited-fallback-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-composited-fallback-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-composited-fallback-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-composited-fallback-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-feimage-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-feimage-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-feimage-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-feimage-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-sepia-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-sepia-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-sepia-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-sepia-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-shadow-clipped-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-shadow-clipped-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-shadow-clipped-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-shadow-clipped-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-shadow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-shadow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-shadow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-shadow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-shadow-rotated-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-shadow-rotated-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-shadow-rotated-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-shadow-rotated-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-turbulence-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-turbulence-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-repaint-turbulence-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-repaint-turbulence-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-with-transform-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-with-transform-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filter-with-transform-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filter-with-transform-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filtered-compositing-descendant-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filtered-compositing-descendant-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filtered-compositing-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filtered-compositing-descendant-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-compositing-descendant-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filtered-inline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-inline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/filtered-inline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/filtered-inline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/multiple-filters-invalidation-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/multiple-filters-invalidation-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/multiple-filters-invalidation-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/multiple-filters-invalidation-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/nested-filter-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/nested-filter-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/nested-filter-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/nested-filter-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/nested-filters-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/nested-filters-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/nested-filters-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/nested-filters-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/regions-expanding-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/regions-expanding-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/regions-expanding-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/regions-expanding-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/remove-filter-rendering-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/remove-filter-rendering-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/remove-filter-rendering-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/remove-filter-rendering-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/should-not-have-compositing-layer-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/should-not-have-compositing-layer-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/should-not-have-compositing-layer-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/should-not-have-compositing-layer-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/simple-filter-rendering-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/filters/simple-filter-rendering-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/filters/simple-filter-rendering-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/filters/simple-filter-rendering-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/button-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/button-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/button-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/button-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/flex-flow-auto-margins-no-available-space-assert-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/flex-flow-auto-margins-no-available-space-assert-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/flex-flow-auto-margins-no-available-space-assert-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/flex-flow-auto-margins-no-available-space-assert-expected.txt diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/flexbox-baseline-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/flexbox-baseline-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/flexbox-baseline-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/flexbox-baseline-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/flexbox-baseline-margins-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/flexbox-baseline-margins-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/flexbox/flexbox-baseline-margins-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/flexbox/flexbox-baseline-margins-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/font-feature-settings-rendering-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/font-feature-settings-rendering-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/font-feature-settings-rendering-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/font-feature-settings-rendering-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-filter-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-filter-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-filter-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-filter-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-overflow-hidden-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-overflow-hidden-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-overflow-hidden-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-overflow-hidden-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-relative-overflow-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-relative-overflow-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-circle-relative-overflow-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-circle-relative-overflow-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-ellipse-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-ellipse-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-ellipse-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-ellipse-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-inset-corners-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-corners-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-inset-corners-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-corners-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-inset-large-radii-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-large-radii-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-inset-large-radii-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-inset-large-radii-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-polygon-evenodd-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-polygon-evenodd-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-polygon-evenodd-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-polygon-evenodd-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-polygon-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-polygon-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-polygon-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-polygon-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-polygon-nonzero-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-polygon-nonzero-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-polygon-nonzero-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-polygon-nonzero-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-restore-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-restore-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/clip-path-restore-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/clip-path-restore-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-luminance-gradient-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-luminance-gradient-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-luminance-gradient-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-luminance-gradient-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-luminance-png-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-luminance-png-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-luminance-png-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-luminance-png-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-luminance-svg-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-luminance-svg-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-luminance-svg-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-luminance-svg-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-auto1-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-auto1-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-auto1-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-auto1-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-border-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-border-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-border-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-border-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-content-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-content-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-content-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-content-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-padding-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-padding-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-round-padding-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-round-padding-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-space-border-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-space-border-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-space-border-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-space-border-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-space-content-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-space-content-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-space-content-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-space-content-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-space-padding-expected.png b/third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-space-padding-expected.png similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/masking/mask-repeat-space-padding-expected.png rename to third_party/blink/web_tests/flag-specific/highdpi/css3/masking/mask-repeat-space-padding-expected.png diff --git a/third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/viewport-percentage-lengths/viewport-percentage-lengths-page-zoom-expected.txt b/third_party/blink/web_tests/flag-specific/highdpi/css3/viewport-percentage-lengths/viewport-percentage-lengths-page-zoom-expected.txt similarity index 100% rename from third_party/blink/web_tests/flag-specific/force-device-scale-factor=1.5/css3/viewport-percentage-lengths/viewport-percentage-lengths-page-zoom-expected.txt rename to third_party/blink/web_tests/flag-specific/highdpi/css3/viewport-percentage-lengths/viewport-percentage-lengths-page-zoom-expected.txt diff --git a/third_party/blink/web_tests/http/tests/devtools/layers/layer-canvas-log-expected.txt b/third_party/blink/web_tests/http/tests/devtools/layers/layer-canvas-log-expected.txt index 6ce89a7e9a33ae..4df594b75025f7 100644 --- a/third_party/blink/web_tests/http/tests/devtools/layers/layer-canvas-log-expected.txt +++ b/third_party/blink/web_tests/http/tests/devtools/layers/layer-canvas-log-expected.txt @@ -80,7 +80,7 @@ Canvas log: } paint : { color : "#FF000000" - filterLevel : "Medium" + filterLevel : "Low" flags : "AntiAlias" strokeCap : "Butt" strokeJoin : "Miter" diff --git a/third_party/blink/web_tests/platform/fuchsia/tables/mozilla/core/bloomberg-expected.png b/third_party/blink/web_tests/platform/fuchsia/tables/mozilla/core/bloomberg-expected.png index 22e578c11d6de0..ccff0cae60e767 100644 Binary files a/third_party/blink/web_tests/platform/fuchsia/tables/mozilla/core/bloomberg-expected.png and b/third_party/blink/web_tests/platform/fuchsia/tables/mozilla/core/bloomberg-expected.png differ diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png index 6283ca4307fb50..a8f1bf2be87743 100644 Binary files a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png and b/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png differ diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png deleted file mode 100644 index 4c229be58dd529..00000000000000 Binary files a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png b/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png deleted file mode 100644 index ca40b5c80e7663..00000000000000 Binary files a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/http/tests/devtools/layers/layer-canvas-log-expected.txt b/third_party/blink/web_tests/platform/mac-mac-arm11.0/http/tests/devtools/layers/layer-canvas-log-expected.txt new file mode 100644 index 00000000000000..6ce89a7e9a33ae --- /dev/null +++ b/third_party/blink/web_tests/platform/mac-mac-arm11.0/http/tests/devtools/layers/layer-canvas-log-expected.txt @@ -0,0 +1,154 @@ +Tests layer command log + +Canvas log: +{ + 0 : { + commandIndex : 0 + method : "drawPaint" + params : { + paint : { + blendMode : "Src" + color : "#00000000" + filterLevel : "None" + flags : "none" + strokeCap : "Butt" + strokeJoin : "Miter" + strokeMiter : 4 + strokeWidth : 0 + styleName : "Fill" + } + } + } + 1 : { + commandIndex : 1 + method : "drawRect" + params : { + paint : { + color : "#FF0000FF" + filterLevel : "Low" + flags : "AntiAlias" + strokeCap : "Butt" + strokeJoin : "Miter" + strokeMiter : 4 + strokeWidth : 0 + styleName : "Fill" + } + rect : { + bottom : 100 + left : 0 + right : 100 + top : 0 + } + } + } + 2 : { + commandIndex : 2 + method : "drawRect" + params : { + paint : { + color : "#FFFF0000" + filterLevel : "Low" + flags : "AntiAlias" + strokeCap : "Butt" + strokeJoin : "Miter" + strokeMiter : 4 + strokeWidth : 0 + styleName : "Fill" + } + rect : { + bottom : 50 + left : 0 + right : 50 + top : 0 + } + } + } + 3 : { + commandIndex : 3 + method : "drawImageRect" + params : { + dst : { + bottom : 71 + left : 0 + right : 19 + top : 50 + } + image : { + height : 21 + opaque : false + width : 19 + } + paint : { + color : "#FF000000" + filterLevel : "Medium" + flags : "AntiAlias" + strokeCap : "Butt" + strokeJoin : "Miter" + strokeMiter : 4 + strokeWidth : 0 + styleName : "Fill" + } + src : { + bottom : 21 + left : 0 + right : 19 + top : 0 + } + } + } + 4 : { + commandIndex : 4 + method : "save" + params : undefined + } + 5 : { + commandIndex : 5 + method : "translate" + params : { + dx : 0 + dy : 71 + } + } + 6 : { + commandIndex : 6 + method : "clipRect" + params : { + SkRegion::Op : "kIntersect_Op" + rect : { + bottom : 150 + left : 0 + right : 300 + top : 0 + } + softClipEdgeStyle : true + } + } + 7 : { + commandIndex : 7 + method : "drawRect" + params : { + paint : { + color : "#7F000000" + filterLevel : "None" + flags : "AntiAlias" + strokeCap : "Butt" + strokeJoin : "Miter" + strokeMiter : 4 + strokeWidth : 0 + styleName : "Fill" + } + rect : { + bottom : 10 + left : 0 + right : 10 + top : 0 + } + } + } + 8 : { + commandIndex : 8 + method : "restore" + params : undefined + } +} + diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png new file mode 100644 index 00000000000000..cb230c1bd503d7 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png new file mode 100644 index 00000000000000..0af66ee3be1141 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png new file mode 100644 index 00000000000000..fbbb3098edaec8 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png differ diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png rename to third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png new file mode 100644 index 00000000000000..e28080baa4f84d Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png new file mode 100644 index 00000000000000..2715102ec8f853 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png new file mode 100644 index 00000000000000..64fa6f41d28829 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png new file mode 100644 index 00000000000000..200168cf0ce8a2 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png new file mode 100644 index 00000000000000..e492aa9af8e0f4 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png new file mode 100644 index 00000000000000..ffd96a86aae1da Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-object-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-object-expected.png new file mode 100644 index 00000000000000..5e115ce58af215 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/color-profile-object-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png new file mode 100644 index 00000000000000..264913ccf946f5 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png differ diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png rename to third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png new file mode 100644 index 00000000000000..cf5c72b242ee60 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png differ diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png rename to third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png new file mode 100644 index 00000000000000..0af66ee3be1141 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png new file mode 100644 index 00000000000000..fbbb3098edaec8 Binary files /dev/null and b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png differ diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png rename to third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png diff --git a/third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png similarity index 100% rename from third_party/blink/web_tests/platform/linux/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png rename to third_party/blink/web_tests/platform/mac-mac-arm11.0/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png diff --git a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png index 27ae3a44d525e8..6f42eeedccd43f 100644 Binary files a/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png and b/third_party/blink/web_tests/platform/mac-mac10.14/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png index cb230c1bd503d7..b863cf322186a5 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png index 0af66ee3be1141..5729eed9a46ba9 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png index fbbb3098edaec8..b1d16f5cbe3e55 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png deleted file mode 100644 index 0c2af13faa9baf..00000000000000 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png index ffd96a86aae1da..157a19de162abf 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png index 264913ccf946f5..45c0c7f6b80758 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png deleted file mode 100644 index 198816dcf4e9fb..00000000000000 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png index cf5c72b242ee60..d290410dd70572 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png deleted file mode 100644 index 7b4d6c5ece647c..00000000000000 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png index 0af66ee3be1141..5729eed9a46ba9 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png index fbbb3098edaec8..b1d16f5cbe3e55 100644 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png and b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png deleted file mode 100644 index 0c2af13faa9baf..00000000000000 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png deleted file mode 100644 index b419bff3c226ef..00000000000000 Binary files a/third_party/blink/web_tests/platform/mac/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png index 2911490ad7ce6e..57e153c6b088e4 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-border-radius-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png index 17f2233d1402f4..1c8096676c8e38 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-filter-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png index b3adb7a18aa3db..b143e8e3935bb4 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png deleted file mode 100644 index 0c2af13faa9baf..00000000000000 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png index 60234a684b68ff..b5234b834e124f 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png index 4c229be58dd529..b49d31e3d2847f 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png deleted file mode 100644 index 198816dcf4e9fb..00000000000000 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png index ca40b5c80e7663..415a0c8aead7ea 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png deleted file mode 100644 index 7b4d6c5ece647c..00000000000000 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png index 17f2233d1402f4..1c8096676c8e38 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png index b3adb7a18aa3db..b143e8e3935bb4 100644 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png and b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-expected.png differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png deleted file mode 100644 index 0c2af13faa9baf..00000000000000 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png deleted file mode 100644 index b419bff3c226ef..00000000000000 Binary files a/third_party/blink/web_tests/platform/win/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png deleted file mode 100644 index 0c2af13faa9baf..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png deleted file mode 100644 index 60234a684b68ff..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png deleted file mode 100644 index 4c229be58dd529..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/cross-fade-background-size-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png deleted file mode 100644 index 198816dcf4e9fb..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png deleted file mode 100644 index ca40b5c80e7663..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/sprite-no-bleed-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png deleted file mode 100644 index 7b4d6c5ece647c..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png deleted file mode 100644 index 0c2af13faa9baf..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png deleted file mode 100644 index b419bff3c226ef..00000000000000 Binary files a/third_party/blink/web_tests/platform/win7/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png and /dev/null differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png new file mode 100644 index 00000000000000..b6a8beb3da9736 Binary files /dev/null and b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png new file mode 100644 index 00000000000000..f88a4a61cbab25 Binary files /dev/null and b/third_party/blink/web_tests/virtual/gpu-rasterization-disable-yuv/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png index 2715102ec8f853..646c8f5b641b14 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-cover-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png index 64fa6f41d28829..ea051633645ff8 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-repeat-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png index 3065ff4105dc52..49066a428b606f 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-background-image-space-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png index 200168cf0ce8a2..991881b69eaa00 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png index e492aa9af8e0f4..73c5b63ec01732 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-image-canvas-pattern-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png index c9069e31d7f8c0..81359a854fd6a3 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-mask-image-svg-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-object-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-object-expected.png index 5e115ce58af215..aaf631d2ee051e 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-object-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/color-profile-object-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png index 1506daa82c066b..8b04cc08203f64 100644 Binary files a/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/rgb-png-with-cmyk-color-profile-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png new file mode 100644 index 00000000000000..f72a8cc0812124 Binary files /dev/null and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/ycbcr-with-cmyk-color-profile-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png new file mode 100644 index 00000000000000..b6a8beb3da9736 Binary files /dev/null and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-image-profile-match-expected.png differ diff --git a/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png new file mode 100644 index 00000000000000..bfb94846990eee Binary files /dev/null and b/third_party/blink/web_tests/virtual/gpu-rasterization/images/yuv-decode-eligible/webp-no-color-profile-lossy-expected.png differ diff --git a/third_party/freetype/README.chromium b/third_party/freetype/README.chromium index 2747dafb74e751..f2f75c9774fb37 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-4-129-g8dc311320 -Revision: 8dc311320c19b6b008fc6f55218b8f238ec982cb +Version: VER-2-10-4-130-g209e9841f +Revision: 209e9841f28ef3b38b9784a39e85edf69a9a853d CPEPrefix: cpe:/a:freetype:freetype:2.10.4 License: Custom license "inspired by the BSD, Artistic, and IJG (Independent JPEG Group) licenses" diff --git a/tools/perf/core/perfetto_binary_roller/binary_deps.json b/tools/perf/core/perfetto_binary_roller/binary_deps.json index fa998e251f5d65..38f7cfe0ecc880 100644 --- a/tools/perf/core/perfetto_binary_roller/binary_deps.json +++ b/tools/perf/core/perfetto_binary_roller/binary_deps.json @@ -1,16 +1,16 @@ { "trace_processor_shell": { "win": { - "hash": "5a4c8b31564d4210e61a0a530740a409afa36e3a", - "remote_path": "perfetto_binaries/trace_processor_shell/win/44860edcd2606f62b21b82c6bf9042309fe70443/trace_processor_shell.exe" + "hash": "74b4cde45b1b94e9821b11275d2fbef30326afac", + "remote_path": "perfetto_binaries/trace_processor_shell/win/122834484af3d2f68b0ee0320d0e9e08e4d59bad/trace_processor_shell.exe" }, "mac": { - "hash": "cfb780b5161f9702c78592332b7c1217083faa49", - "remote_path": "perfetto_binaries/trace_processor_shell/mac/44860edcd2606f62b21b82c6bf9042309fe70443/trace_processor_shell" + "hash": "ebd5fffc654ec195bfc34fed9a6efc975ee8c1d2", + "remote_path": "perfetto_binaries/trace_processor_shell/mac/122834484af3d2f68b0ee0320d0e9e08e4d59bad/trace_processor_shell" }, "linux": { - "hash": "b915bc501e184d2fc8820cefa943c908eb7f5146", - "remote_path": "perfetto_binaries/trace_processor_shell/linux/44860edcd2606f62b21b82c6bf9042309fe70443/trace_processor_shell" + "hash": "841b3e8885a47577c28294d1f85dbf80ac1ebe47", + "remote_path": "perfetto_binaries/trace_processor_shell/linux/122834484af3d2f68b0ee0320d0e9e08e4d59bad/trace_processor_shell" } }, "power_profile.sql": { diff --git a/ui/gfx/image/image_skia_rep_default.cc b/ui/gfx/image/image_skia_rep_default.cc index 49a9f7680168db..66c76570087b27 100644 --- a/ui/gfx/image/image_skia_rep_default.cc +++ b/ui/gfx/image/image_skia_rep_default.cc @@ -84,7 +84,7 @@ sk_sp ImageSkiaRep::GetPaintRecord() const { display_item_list.get(), SkRect::MakeIWH(pixel_width(), pixel_height())); display_item_list->StartPaint(); - record_canvas.drawImage(paint_image(), 0, 0, nullptr); + record_canvas.drawImage(paint_image(), 0, 0); display_item_list->EndPaintOfPairedEnd(); display_item_list->Finalize();