Merge CompositedScrollingForFrames into PreferCompositingToLCDText

Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1223 matching lines @@
     EXPECT_TRUE(toWebViewImpl(webView)->caretOrSelectionRange(&location, &length));
     EXPECT_EQ(location, 0UL);
     EXPECT_EQ(length, testWord.length());
 }
 
 static void configueCompositingWebView(WebSettings* settings)
 {
     settings->setAcceleratedCompositingEnabled(true);
     settings->setPreferCompositingToLCDTextEnabled(true);
     settings->setAcceleratedCompositingForOverflowScrollEnabled(true);
-    settings->setCompositedScrollingForFramesEnabled(true);
 }
 
 TEST_F(WebViewTest, ShowPressOnTransformedLink)
 {
     OwnPtr<FrameTestHelpers::TestWebViewClient> fakeCompositingWebViewClient = adoptPtr(new FrameTestHelpers::TestWebViewClient());
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initialize(true, 0, fakeCompositingWebViewClient.get(), &configueCompositingWebView);
 
     int pageWidth = 640;
     int pageHeight = 480;
@@ skipping 894 matching lines @@
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
     frame->executeScript(WebScriptSource(WebString::fromUTF8("document.execCommand('SelectAll', false, null)")));
     std::string actual = frame->selectionAsText().utf8();
 
     const int kMaxOutputCharacters = 1024;
     std::string expected = frame->contentAsText(kMaxOutputCharacters).utf8();
     EXPECT_EQ(expected, actual);
 }
 
 } // namespace