| OLD | NEW | 
|    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 |    5  * modification, are permitted provided that the following conditions | 
|    6  * are met: |    6  * are met: | 
|    7  * |    7  * | 
|    8  * 1.  Redistributions of source code must retain the above copyright |    8  * 1.  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  * 2.  Redistributions in binary form must reproduce the above copyright |   10  * 2.  Redistributions in binary form must reproduce the above copyright | 
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   77         // We cannot reuse FrameTestHelpers::createWebViewAndLoad here because t
     he compositing |   77         // We cannot reuse FrameTestHelpers::createWebViewAndLoad here because t
     he compositing | 
|   78         // settings need to be set before the page is loaded. |   78         // settings need to be set before the page is loaded. | 
|   79         m_mainFrame = WebFrame::create(&m_mockWebFrameClient); |   79         m_mainFrame = WebFrame::create(&m_mockWebFrameClient); | 
|   80         m_webViewImpl = toWebViewImpl(WebView::create(&m_mockWebViewClient)); |   80         m_webViewImpl = toWebViewImpl(WebView::create(&m_mockWebViewClient)); | 
|   81         m_webViewImpl->settings()->setForceCompositingMode(true); |   81         m_webViewImpl->settings()->setForceCompositingMode(true); | 
|   82         m_webViewImpl->settings()->setAcceleratedCompositingEnabled(true); |   82         m_webViewImpl->settings()->setAcceleratedCompositingEnabled(true); | 
|   83         m_webViewImpl->settings()->setAcceleratedCompositingForFixedPositionEnab
     led(true); |   83         m_webViewImpl->settings()->setAcceleratedCompositingForFixedPositionEnab
     led(true); | 
|   84         m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEna
     bled(true); |   84         m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEna
     bled(true); | 
|   85         m_webViewImpl->settings()->setAcceleratedCompositingForScrollableFramesE
     nabled(true); |   85         m_webViewImpl->settings()->setAcceleratedCompositingForScrollableFramesE
     nabled(true); | 
|   86         m_webViewImpl->settings()->setCompositedScrollingForFramesEnabled(true); |   86         m_webViewImpl->settings()->setCompositedScrollingForFramesEnabled(true); | 
|   87         m_webViewImpl->settings()->setFixedPositionCreatesStackingContext(true); |  | 
|   88         m_webViewImpl->setMainFrame(m_mainFrame); |   87         m_webViewImpl->setMainFrame(m_mainFrame); | 
|   89         m_webViewImpl->resize(IntSize(320, 240)); |   88         m_webViewImpl->resize(IntSize(320, 240)); | 
|   90     } |   89     } | 
|   91  |   90  | 
|   92     virtual void TearDown() |   91     virtual void TearDown() | 
|   93     { |   92     { | 
|   94         Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); |   93         Platform::current()->unitTestSupport()->unregisterAllMockedURLs(); | 
|   95         m_webViewImpl->close(); |   94         m_webViewImpl->close(); | 
|   96         m_mainFrame->close(); |   95         m_mainFrame->close(); | 
|   97     } |   96     } | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  129  |  128  | 
|  130     layerElement = document->getElementById("layer-solid-color"); |  129     layerElement = document->getElementById("layer-solid-color"); | 
|  131     renderer = toRenderLayerModelObject(layerElement->renderer()); |  130     renderer = toRenderLayerModelObject(layerElement->renderer()); | 
|  132     // CompositedLayerMapping::graphicsLayer's background color is unset if Soli
     dColorLayer is created. |  131     // CompositedLayerMapping::graphicsLayer's background color is unset if Soli
     dColorLayer is created. | 
|  133     EXPECT_EQ(Color(), renderer->layer()->compositedLayerMapping()->mainGraphics
     Layer()->backgroundColor()); |  132     EXPECT_EQ(Color(), renderer->layer()->compositedLayerMapping()->mainGraphics
     Layer()->backgroundColor()); | 
|  134 } |  133 } | 
|  135  |  134  | 
|  136 } |  135 } | 
|  137  |  136  | 
|  138 } // namespace WebCore |  137 } // namespace WebCore | 
| OLD | NEW |