Remove the composited path from WebViewImpl::paint().

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 227 matching lines @@
 TEST_F(WebViewTest, SetBaseBackgroundColorBeforeMainFrame)
 {
     const WebColor kBlue = 0xFF0000FF;
     WebView* webView = WebViewImpl::create(0);
     EXPECT_NE(kBlue, webView->backgroundColor());
     // webView does not have a frame yet, but we should still be able to set the background color.
     webView->setBaseBackgroundColor(kBlue);
     EXPECT_EQ(kBlue, webView->backgroundColor());
 }
 
+static void disableAccleratedCompositing(WebSettings* webSettings)
+{
+    webSettings->setAcceleratedCompositingEnabled(false);
+}
+
 TEST_F(WebViewTest, SetBaseBackgroundColorAndBlendWithExistingContent)
 {
     const WebColor kAlphaRed = 0x80FF0000;
     const WebColor kAlphaGreen = 0x8000FF00;
     const int kWidth = 100;
     const int kHeight = 100;
 
+    // Make a WebView that is not composited.
+    bool enableJavascript = false;
+    FrameTestHelpers::TestWebFrameClient* frameClient = 0;
+    WebViewClient* viewClient = 0;
+    WebView* webView = m_webViewHelper.initialize(enableJavascript, frameClient, viewClient, &disableAccleratedCompositing);
+
     // Set WebView background to green with alpha.
-    WebView* webView = m_webViewHelper.initialize();
     webView->setBaseBackgroundColor(kAlphaGreen);
     webView->settings()->setShouldClearDocumentBackground(false);
     webView->resize(WebSize(kWidth, kHeight));
     webView->layout();
 
     // Set canvas background to red with alpha.
     SkBitmap bitmap;
     ASSERT_TRUE(bitmap.allocN32Pixels(kWidth, kHeight));
     SkCanvas canvas(bitmap);
     canvas.clear(kAlphaRed);
     webView->paint(&canvas, WebRect(0, 0, kWidth, kHeight));
 
     // The result should be a blend of red and green.
     SkColor color = bitmap.getColor(kWidth / 2, kHeight / 2);
     EXPECT_TRUE(WebCore::redChannel(color));
-    // FIXME: This should be EXPECT_TRUE. This looks to only work
-    // if compositing is disabled, which is no longer a shipping configuration.
-    // crbug.com/365810
-    EXPECT_FALSE(WebCore::greenChannel(color));
+    EXPECT_TRUE(WebCore::greenChannel(color));
 }
 
 TEST_F(WebViewTest, FocusIsInactive)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), "visible_iframe.html");
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "visible_iframe.html");
 
     webView->setFocus(true);
     webView->setIsActive(true);
     WebLocalFrameImpl* frame = toWebLocalFrameImpl(webView->mainFrame());
@@ skipping 1649 matching lines @@
 
     EXPECT_EQ(0, client.getUserGestureNotificationsCount());
 
     EXPECT_TRUE(tapElementById(webView, WebInputEvent::GestureTap, WebString::fromUTF8("target")));
 
     EXPECT_EQ(1, client.getUserGestureNotificationsCount());
     webView->setAutofillClient(0);
 }
 
 } // namespace