Skip to content

GitLab

T
tangled
Commit 03eb1644 authored by ojan@chromium.org's avatar ojan@chromium.org
Browse files
Options

Remove straggling references to forceCompositingMode. 

Cleaned up style of translatez-removed.html while updating it.

Review URL: https://codereview.chromium.org/324363003

git-svn-id: svn://svn.chromium.org/blink/trunk@176136 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent adccc473
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 60 deletions
third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-removed-expected.txt
View file @ 03eb1644
...@@ -5,15 +5,6 @@ ...@@ -5,15 +5,6 @@
(bounds 800.00 600.00) (bounds 800.00 600.00)
(contentsOpaque 1) (contentsOpaque 1)
(drawsContent 1) (drawsContent 1)
(children 1
(GraphicsLayer
(position 8.00 230.00)
(bounds 20.00 20.00)
(contentsOpaque 1)
(drawsContent 1)
(backgroundColor #C0C0C0)
)
)
) )
) )
) )
......
third_party/WebKit/LayoutTests/compositing/layer-creation/translatez-removed.html
View file @ 03eb1644
<!DOCTYPE html> <!DOCTYPE html>
<style>
<html> .box {
<head>
<style type="text/css" media="screen">
.box {
height: 200px; height: 200px;
width: 200px; width: 200px;
margin: 10px; margin: 10px;
padding: 5px; padding: 5px;
background-color: blue; background-color: blue;
} }
.composited { .composited {
-webkit-transform: translateZ(0); -webkit-transform: translateZ(0);
} }
#trigger { #trigger {
width: 20px; width: 20px;
height: 20px; height: 20px;
background-color: silver; background-color: silver;
} }
</style>
</style> <script>
<script type="text/javascript" charset="utf-8"> if (window.testRunner)
if (window.testRunner) {
window.testRunner.dumpAsText(); window.testRunner.dumpAsText();
}
function doTest() function doTest()
{ {
document.getElementById('test').className = 'box'; document.getElementById('test').classList.remove('composited');
if (window.testRunner) { if (window.testRunner)
document.getElementById('layers').innerText = window.internals.layerTreeAsText(document); document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
} }
} window.addEventListener('load', doTest, false);
window.addEventListener('load', doTest, false); </script>
</script> <!-- This test div starts out with a 3d transform, but should be
</head>
<body>
<!-- This test div starts out with a 3d transform, but should be
de-promoted from a composited layer before the test completes. --> de-promoted from a composited layer before the test completes. -->
<div id="test" class="composited box"> <div id="test" class="composited box"></div>
</div> <pre id="layers">Layer tree appears here in DRT.</pre>
<!-- This div exists to keep blink in compositing mode until
ForceCompositingMode is always on. -->
<div id="trigger" class="composited">
</div>
<pre id="layers">Layer tree appears here in DRT.</pre>
</body>
</html>
third_party/WebKit/Source/web/tests/PinchViewportTest.cpp
View file @ 03eb1644
...@@ -195,7 +195,7 @@ TEST_F(PinchViewportTest, TestResize) ...@@ -195,7 +195,7 @@ TEST_F(PinchViewportTest, TestResize)
EXPECT_SIZE_EQ(newViewportSize, pinchViewport.size()); EXPECT_SIZE_EQ(newViewportSize, pinchViewport.size());
} }
static void turnOffForceCompositingMode(WebSettings* settings) static void disableAcceleratedCompositing(WebSettings* settings)
{ {
PinchViewportTest::configureSettings(settings); PinchViewportTest::configureSettings(settings);
// FIXME: This setting is being removed, so this test needs to be rewritten to // FIXME: This setting is being removed, so this test needs to be rewritten to
...@@ -207,7 +207,7 @@ static void turnOffForceCompositingMode(WebSettings* settings) ...@@ -207,7 +207,7 @@ static void turnOffForceCompositingMode(WebSettings* settings)
// prior to the PinchViewport being attached to the layer tree. // prior to the PinchViewport being attached to the layer tree.
TEST_F(PinchViewportTest, TestWebViewResizedBeforeAttachment) TEST_F(PinchViewportTest, TestWebViewResizedBeforeAttachment)
{ {
initializeWithDesktopSettings(turnOffForceCompositingMode); initializeWithDesktopSettings(disableAcceleratedCompositing);
webViewImpl()->resize(IntSize(320, 240)); webViewImpl()->resize(IntSize(320, 240));
navigateTo("about:blank"); navigateTo("about:blank");
......
third_party/WebKit/public/web/WebSettings.h
View file @ 03eb1644
...@@ -122,8 +122,6 @@ public: ...@@ -122,8 +122,6 @@ public:
virtual void setExperimentalWebGLEnabled(bool) = 0; virtual void setExperimentalWebGLEnabled(bool) = 0;
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0; virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0; virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
// FIXME: Remove this once DevToolsAgent::enableDeviceEmulation stops calling it.
virtual void setForceCompositingMode(bool) { };
virtual void setGestureTapHighlightEnabled(bool) = 0; virtual void setGestureTapHighlightEnabled(bool) = 0;
virtual void setHyperlinkAuditingEnabled(bool) = 0; virtual void setHyperlinkAuditingEnabled(bool) = 0;
virtual void setIgnoreMainFrameOverflowHiddenQuirk(bool) = 0; virtual void setIgnoreMainFrameOverflowHiddenQuirk(bool) = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment