Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 1736893002: Update drag images to paint from the nearest self painting layer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test failures, add a test Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 6876 matching lines...) Expand 10 before | Expand all | Expand 10 after
6887 SkCanvas canvas(bitmap); 6887 SkCanvas canvas(bitmap);
6888 canvas.drawColor(SK_ColorGREEN); 6888 canvas.drawColor(SK_ColorGREEN);
6889 6889
6890 EXPECT_EQ(referenceBitmapSize.width(), dragImage->size().width()); 6890 EXPECT_EQ(referenceBitmapSize.width(), dragImage->size().width());
6891 EXPECT_EQ(referenceBitmapSize.height(), dragImage->size().height()); 6891 EXPECT_EQ(referenceBitmapSize.height(), dragImage->size().height());
6892 const SkBitmap& dragBitmap = dragImage->bitmap(); 6892 const SkBitmap& dragBitmap = dragImage->bitmap();
6893 SkAutoLockPixels lockPixel(dragBitmap); 6893 SkAutoLockPixels lockPixel(dragBitmap);
6894 EXPECT_EQ(0, memcmp(bitmap.getPixels(), dragBitmap.getPixels(), bitmap.getSi ze())); 6894 EXPECT_EQ(0, memcmp(bitmap.getPixels(), dragBitmap.getPixels(), bitmap.getSi ze()));
6895 } 6895 }
6896 6896
6897 TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransformDescendant)
6898 {
6899 FrameTestHelpers::WebViewHelper webViewHelper(this);
6900 OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string ("case-css-3dtransform-descendant"));
6901 EXPECT_TRUE(dragImage);
6902
6903 nodeImageTestValidation(IntSize(40, 40), dragImage.get());
6904 }
6905
6897 TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransform) 6906 TEST_P(ParameterizedWebFrameTest, NodeImageTestCSSTransform)
6898 { 6907 {
6899 FrameTestHelpers::WebViewHelper webViewHelper(this); 6908 FrameTestHelpers::WebViewHelper webViewHelper(this);
6900 OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string ("case-css-transform")); 6909 OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string ("case-css-transform"));
6901 EXPECT_TRUE(dragImage); 6910 EXPECT_TRUE(dragImage);
6902 6911
6903 nodeImageTestValidation(IntSize(40, 40), dragImage.get()); 6912 nodeImageTestValidation(IntSize(40, 40), dragImage.get());
6904 } 6913 }
6905 6914
6906 TEST_P(ParameterizedWebFrameTest, NodeImageTestCSS3DTransform) 6915 TEST_P(ParameterizedWebFrameTest, NodeImageTestCSS3DTransform)
6907 { 6916 {
6908 FrameTestHelpers::WebViewHelper webViewHelper(this); 6917 FrameTestHelpers::WebViewHelper webViewHelper(this);
6909 OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string ("case-css-3dtransform")); 6918 OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string ("case-css-3dtransform"));
6910 EXPECT_TRUE(dragImage); 6919 EXPECT_TRUE(dragImage);
6911 6920
6912 nodeImageTestValidation(IntSize(20, 40), dragImage.get()); 6921 nodeImageTestValidation(IntSize(40, 40), dragImage.get());
6913 } 6922 }
6914 6923
6915 TEST_P(ParameterizedWebFrameTest, NodeImageTestInlineBlock) 6924 TEST_P(ParameterizedWebFrameTest, NodeImageTestInlineBlock)
6916 { 6925 {
6917 FrameTestHelpers::WebViewHelper webViewHelper(this); 6926 FrameTestHelpers::WebViewHelper webViewHelper(this);
6918 OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string ("case-inlineblock")); 6927 OwnPtr<DragImage> dragImage = nodeImageTestSetup(&webViewHelper, std::string ("case-inlineblock"));
6919 EXPECT_TRUE(dragImage); 6928 EXPECT_TRUE(dragImage);
6920 6929
6921 nodeImageTestValidation(IntSize(40, 40), dragImage.get()); 6930 nodeImageTestValidation(IntSize(40, 40), dragImage.get());
6922 } 6931 }
(...skipping 1558 matching lines...) Expand 10 before | Expand all | Expand 10 after
8481 } 8490 }
8482 8491
8483 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange) 8492 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange)
8484 { 8493 {
8485 swapLocalFrameToRemoteFrame(); 8494 swapLocalFrameToRemoteFrame();
8486 executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').p arentElement.style.display = 'none';")); 8495 executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').p arentElement.style.display = 'none';"));
8487 EXPECT_FALSE(remoteFrameClient()->isVisible()); 8496 EXPECT_FALSE(remoteFrameClient()->isVisible());
8488 } 8497 }
8489 8498
8490 } // namespace blink 8499 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698