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

Side by Side Diff: Source/web/tests/ViewportTest.cpp

Issue 685003008: Revert of Widen GPU trigger condition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git/+/master
Patch Set: Created 6 years, 1 month 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 2929 matching lines...) Expand 10 before | Expand all | Expand 10 after
2940 FrameTestHelpers::WebViewHelper webViewHelper; 2940 FrameTestHelpers::WebViewHelper webViewHelper;
2941 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion.html", true, 0, 0, setViewportSettings); 2941 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion.html", true, 0, 0, setViewportSettings);
2942 webViewHelper.webView()->resize(WebSize(640, 480)); 2942 webViewHelper.webView()->resize(WebSize(640, 480));
2943 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting()); 2943 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting());
2944 2944
2945 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization-expanded-heur istics.html"); 2945 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization-expanded-heur istics.html");
2946 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion-expanded-heuristics.html", true, 0, 0, setViewportSettings); 2946 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion-expanded-heuristics.html", true, 0, 0, setViewportSettings);
2947 webViewHelper.webView()->resize(WebSize(640, 480)); 2947 webViewHelper.webView()->resize(WebSize(640, 480));
2948 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting()); 2948 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting());
2949 2949
2950 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization-device-width- minimum-scale-1.5.html");
2951 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion-device-width-minimum-scale-1.5.html", true, 0, 0, setViewportSettings);
2952 webViewHelper.webView()->resize(WebSize(640, 480));
2953 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting());
2954
2955 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization-device-width- minimum-scale-0.5.html");
2956 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion-device-width-minimum-scale-0.5.html", true, 0, 0, setViewportSettings);
2957 webViewHelper.webView()->resize(WebSize(640, 480));
2958 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting());
2959
2960 registerMockedHttpURLLoad("viewport/viewport-gpu-rasterization-device-width- non-user-scalable.html");
2961 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-gpu-rasteriza tion-device-width-non-user-scalable.html", true, 0, 0, setViewportSettings);
2962 webViewHelper.webView()->resize(WebSize(640, 480));
2963 EXPECT_TRUE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizatio nForTesting());
2964
2965 registerMockedHttpURLLoad("viewport/viewport-inferred-values-do-not-trigger- gpu-rasterization.html"); 2950 registerMockedHttpURLLoad("viewport/viewport-inferred-values-do-not-trigger- gpu-rasterization.html");
2966 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-inferred-valu es-do-not-trigger-gpu-rasterization.html", true, 0, 0, setViewportSettings); 2951 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-inferred-valu es-do-not-trigger-gpu-rasterization.html", true, 0, 0, setViewportSettings);
2967 webViewHelper.webView()->resize(WebSize(640, 480)); 2952 webViewHelper.webView()->resize(WebSize(640, 480));
2968 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting()); 2953 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting());
2969 2954
2970 registerMockedHttpURLLoad("viewport/viewport-1.html"); 2955 registerMockedHttpURLLoad("viewport/viewport-1.html");
2971 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true , 0, 0, setViewportSettings); 2956 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-1.html", true , 0, 0, setViewportSettings);
2972 webViewHelper.webView()->resize(WebSize(640, 480)); 2957 webViewHelper.webView()->resize(WebSize(640, 480));
2973 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting()); 2958 EXPECT_FALSE(webViewHelper.webViewImpl()->matchesHeuristicsForGpuRasterizati onForTesting());
2974 2959
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
3165 FrameTestHelpers::WebViewHelper webViewHelper; 3150 FrameTestHelpers::WebViewHelper webViewHelper;
3166 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-7.ht ml", true, &webFrameClient, 0, setViewportSettings); 3151 webViewHelper.initializeAndLoad(m_baseURL + "viewport/viewport-warnings-7.ht ml", true, &webFrameClient, 0, setViewportSettings);
3167 3152
3168 Page* page = webViewHelper.webViewImpl()->page(); 3153 Page* page = webViewHelper.webViewImpl()->page();
3169 runViewportTest(page, 320, 352); 3154 runViewportTest(page, 320, 352);
3170 3155
3171 EXPECT_EQ(0U, webFrameClient.messages.size()); 3156 EXPECT_EQ(0U, webFrameClient.messages.size());
3172 } 3157 }
3173 3158
3174 } // namespace 3159 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698