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

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

Issue 295383008: Remove the forceCompositingMode setting. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address review comment Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/tests/ScrollingCoordinatorChromiumTest.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 OwnPtrWillBeRawPtr<WebCore::RuleSet> ruleSet = WebCore::RuleSet::create( ); 149 OwnPtrWillBeRawPtr<WebCore::RuleSet> ruleSet = WebCore::RuleSet::create( );
150 ruleSet->addRulesFromSheet(styleSheet.get(), WebCore::MediaQueryEvaluato r("screen")); 150 ruleSet->addRulesFromSheet(styleSheet.get(), WebCore::MediaQueryEvaluato r("screen"));
151 151
152 Document* document = webViewHelper->webViewImpl()->page()->mainFrame()-> document(); 152 Document* document = webViewHelper->webViewImpl()->page()->mainFrame()-> document();
153 document->ensureStyleResolver().viewportStyleResolver()->collectViewport Rules(ruleSet.get(), WebCore::ViewportStyleResolver::UserAgentOrigin); 153 document->ensureStyleResolver().viewportStyleResolver()->collectViewport Rules(ruleSet.get(), WebCore::ViewportStyleResolver::UserAgentOrigin);
154 document->ensureStyleResolver().viewportStyleResolver()->resolve(); 154 document->ensureStyleResolver().viewportStyleResolver()->resolve();
155 } 155 }
156 156
157 static void configueCompositingWebView(WebSettings* settings) 157 static void configueCompositingWebView(WebSettings* settings)
158 { 158 {
159 settings->setForceCompositingMode(true);
160 settings->setAcceleratedCompositingEnabled(true); 159 settings->setAcceleratedCompositingEnabled(true);
161 settings->setAcceleratedCompositingForFixedPositionEnabled(true); 160 settings->setAcceleratedCompositingForFixedPositionEnabled(true);
162 settings->setAcceleratedCompositingForOverflowScrollEnabled(true); 161 settings->setAcceleratedCompositingForOverflowScrollEnabled(true);
163 settings->setCompositedScrollingForFramesEnabled(true); 162 settings->setCompositedScrollingForFramesEnabled(true);
164 } 163 }
165 164
166 void initializeTextSelectionWebView(const std::string& url, FrameTestHelpers ::WebViewHelper* webViewHelper) 165 void initializeTextSelectionWebView(const std::string& url, FrameTestHelpers ::WebViewHelper* webViewHelper)
167 { 166 {
168 webViewHelper->initializeAndLoad(url, true); 167 webViewHelper->initializeAndLoad(url, true);
169 webViewHelper->webView()->settings()->setDefaultFontSize(12); 168 webViewHelper->webView()->settings()->setDefaultFontSize(12);
(...skipping 5250 matching lines...) Expand 10 before | Expand all | Expand 10 after
5420 registerMockedHttpURLLoad("link-manifest-change.html"); 5419 registerMockedHttpURLLoad("link-manifest-change.html");
5421 5420
5422 ManifestChangeWebFrameClient webFrameClient; 5421 ManifestChangeWebFrameClient webFrameClient;
5423 FrameTestHelpers::WebViewHelper webViewHelper; 5422 FrameTestHelpers::WebViewHelper webViewHelper;
5424 webViewHelper.initializeAndLoad(m_baseURL + "link-manifest-change.html", tru e, &webFrameClient); 5423 webViewHelper.initializeAndLoad(m_baseURL + "link-manifest-change.html", tru e, &webFrameClient);
5425 5424
5426 EXPECT_EQ(14, webFrameClient.manifestChangeCount()); 5425 EXPECT_EQ(14, webFrameClient.manifestChangeCount());
5427 } 5426 }
5428 5427
5429 } // namespace 5428 } // namespace
OLDNEW
« no previous file with comments | « Source/web/tests/ScrollingCoordinatorChromiumTest.cpp ('k') | Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698