Skip to content

GitLab

T
tangled
Commit 5a885e40 authored by abarth@chromium.org's avatar abarth@chromium.org
Browse files
Options

Rip out Settings::fixedPositionCreatesStackingContext 

We always turn this setting on.

BUG=354688
R=ojan@chromium.org

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

git-svn-id: svn://svn.chromium.org/blink/trunk@169714 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent e5668b4c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 157 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 5a885e40
...@@ -863,6 +863,10 @@ crbug.com/349537 virtual/stable/http/tests/websocket/workers/worker-reload-repea ...@@ -863,6 +863,10 @@ crbug.com/349537 virtual/stable/http/tests/websocket/workers/worker-reload-repea
crbug.com/339778 [ Debug ] fast/dom/timer-throttling-hidden-page.html [ Failure Pass ] crbug.com/339778 [ Debug ] fast/dom/timer-throttling-hidden-page.html [ Failure Pass ]
crbug.com/354688 [ Mac ] fast/block/positioning/016.html [ NeedsRebaseline ]
crbug.com/354688 [ Mac ] fast/block/positioning/025.html [ NeedsRebaseline ]
crbug.com/354688 [ Mac ] fast/block/positioning/fixed-position-stacking-context.html [ NeedsRebaseline ]
# Heap buffer overflow failures on Linux ASAN # Heap buffer overflow failures on Linux ASAN
crbug.com/347365 [ Linux ] dom/xhtml/level3/core/canonicalform08.xhtml [ Crash Pass ] crbug.com/347365 [ Linux ] dom/xhtml/level3/core/canonicalform08.xhtml [ Crash Pass ]
crbug.com/347365 [ Linux ] dom/xhtml/level3/core/canonicalform09.xhtml [ Crash Pass ] crbug.com/347365 [ Linux ] dom/xhtml/level3/core/canonicalform09.xhtml [ Crash Pass ]
......
third_party/WebKit/LayoutTests/compositing/absolute-inside-out-of-view-fixed.html
View file @ 5a885e40
...@@ -29,10 +29,8 @@ ...@@ -29,10 +29,8 @@
if (window.testRunner) { if (window.testRunner) {
testRunner.waitUntilDone(); testRunner.waitUntilDone();
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.internals) { if (window.internals)
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
}
} }
function doScroll() function doScroll()
......
third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-page-scale-smaller-than-viewport.html
View file @ 5a885e40
...@@ -24,11 +24,9 @@ ...@@ -24,11 +24,9 @@
} }
</style> </style>
<script> <script>
if (window.internals && window.eventSender) { if (window.internals && window.eventSender)
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
window.eventSender.setPageScaleFactor(0.5, 0, 0); window.eventSender.setPageScaleFactor(0.5, 0, 0);
}
</script> </script>
</head> </head>
<body> <body>
......
third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch-expected.txt deleted 100644 → 0
View file @ e5668b4c
Before (should be empty):
After (should not be empty):
(GraphicsLayer
(bounds 785.00 4016.00)
(children 1
(GraphicsLayer
(bounds 785.00 4016.00)
(contentsOpaque 1)
(drawsContent 1)
(children 1
(GraphicsLayer
(position 480.00 30.00)
(bounds 300.00 100.00)
(contentsOpaque 1)
(drawsContent 1)
(backgroundColor #008000)
)
)
)
)
)
After (should be empty):
third_party/WebKit/LayoutTests/compositing/geometry/fixed-position-composited-switch.html deleted 100644 → 0
View file @ e5668b4c
<!DOCTYPE>
<html>
<head>
<title>Creating composited layers for fixed position elements</title>
<style type="text/css" media="screen">
#tall {
height: 100px;
}
#fixed {
width: 300px;
height: 100px;
position: fixed;
top: 30px;
right: 5px;
background-color: green;
}
</style>
<script type="text/javascript" charset="utf-8">
if (window.internals)
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
function doTest()
{
var layerTreeOutput = '';
// If the fixed position element doesn't have its own stacking context then
// it cannot get a composited layer.
if (window.testRunner)
layerTreeOutput += 'Before (should be empty): \n' + window.internals.layerTreeAsText(document) + '\n';
// Adding a z-index to the fixed position element will give it a stacking context
// and allow it to be composited.
document.getElementById('fixed').style.zIndex = '1';
if (window.testRunner) {
layerTreeOutput += 'After (should not be empty): \n' + window.internals.layerTreeAsText(document);
document.getElementById('layertree').innerText = layerTreeOutput;
testRunner.dumpAsText();
}
// Adding a transform to the container will turn off compositing.
document.getElementById('container').style.webkitTransform = 'translateX(0)';
if (window.testRunner) {
layerTreeOutput += 'After (should be empty): \n' + window.internals.layerTreeAsText(document);
document.getElementById('layertree').innerText = layerTreeOutput;
testRunner.dumpAsText();
}
}
window.addEventListener("load", doTest, false);
</script>
</head>
<!-- Fixed position elements may skip compositing without a scrollable
ancestor. To make sure this test covers the intended scenario, we force the
body element to be tall, so that the FrameView is scrolling. -->
<body style="height: 4000px;">
<!-- Fixed position element should get its own layer -->
<pre id="layertree"></pre>
<div id="tall"></div>
<div id="container">
<div id="fixed"></div>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-expected.txt
View file @ 5a885e40
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
(backgroundColor #FF0000) (backgroundColor #FF0000)
) )
(GraphicsLayer (GraphicsLayer
(position 100.00 3100.00) (position 0.00 3000.00)
(bounds 200.00 100.00) (bounds 300.00 200.00)
(contentsOpaque 1)
(drawsContent 1) (drawsContent 1)
(backgroundColor #008000) (backgroundColor #008000)
) )
......
third_party/WebKit/LayoutTests/compositing/iframes/fixed-position-element-in-iframe-enters-viewport.html
View file @ 5a885e40
...@@ -20,10 +20,8 @@ If this test passes, you should see a green square. ...@@ -20,10 +20,8 @@ If this test passes, you should see a green square.
if (window.testRunner) if (window.testRunner)
testRunner.waitUntilDone(); testRunner.waitUntilDone();
if (window.internals) { if (window.internals)
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
}
function runTest() function runTest()
{ {
......
third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-change-out-of-view-in-view.html
View file @ 5a885e40
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
if (window.testRunner && window.internals) { if (window.testRunner && window.internals) {
testRunner.dumpAsText(); testRunner.dumpAsText();
internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
internals.settings.setFixedPositionCreatesStackingContext(true);
addEventListener("load", function() { addEventListener("load", function() {
document.getElementById("layerTree1").innerText = internals.layerTreeAsText(document); document.getElementById("layerTree1").innerText = internals.layerTreeAsText(document);
......
third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-in-view-dynamic.html
View file @ 5a885e40
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
if (window.testRunner && window.internals) { if (window.testRunner && window.internals) {
testRunner.dumpAsText(); testRunner.dumpAsText();
internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
internals.settings.setFixedPositionCreatesStackingContext(true);
addEventListener("load", function() { addEventListener("load", function() {
var fixed = document.createElement("div"); var fixed = document.createElement("div");
......
third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-dynamic.html
View file @ 5a885e40
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
if (window.testRunner && window.internals) { if (window.testRunner && window.internals) {
testRunner.dumpAsText(); testRunner.dumpAsText();
internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
internals.settings.setFixedPositionCreatesStackingContext(true);
addEventListener("load", function() { addEventListener("load", function() {
var fixed = document.createElement("div"); var fixed = document.createElement("div");
......
third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-iframe-scroll.html
View file @ 5a885e40
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
} }
if (window.internals && window.eventSender) { if (window.internals && window.eventSender) {
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
addEventListener("load", function() { addEventListener("load", function() {
window.eventSender.setPageScaleFactor(0.5, 0, 0); window.eventSender.setPageScaleFactor(0.5, 0, 0);
......
third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-iframe.html
View file @ 5a885e40
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
} }
if (window.internals && window.eventSender) { if (window.internals && window.eventSender) {
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
addEventListener("load", function() { addEventListener("load", function() {
window.eventSender.setPageScaleFactor(0.5, 0, 0); window.eventSender.setPageScaleFactor(0.5, 0, 0);
......
third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll.html
View file @ 5a885e40
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
} }
if (window.internals && window.eventSender) { if (window.internals && window.eventSender) {
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
addEventListener("load", function() { addEventListener("load", function() {
window.scrollTo(100,100); window.scrollTo(100,100);
......
third_party/WebKit/LayoutTests/compositing/layer-creation/fixed-position-out-of-view-scaled.html
View file @ 5a885e40
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
} }
if (window.internals && window.eventSender) { if (window.internals && window.eventSender) {
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
addEventListener("load", function() { addEventListener("load", function() {
document.getElementById("layerTree").innerText = internals.layerTreeAsText(document); document.getElementById("layerTree").innerText = internals.layerTreeAsText(document);
......
third_party/WebKit/LayoutTests/compositing/layer-creation/no-compositing-for-fixed-position-under-transform.html
View file @ 5a885e40
...@@ -15,10 +15,8 @@ ...@@ -15,10 +15,8 @@
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
if (window.internals) { if (window.internals)
window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
window.internals.settings.setFixedPositionCreatesStackingContext(true);
}
if (window.testRunner) { if (window.testRunner) {
testRunner.dumpAsText(); testRunner.dumpAsText();
......
third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-inside-composited-intermediate-layer.html
View file @ 5a885e40
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
if (window.internals) { if (window.internals) {
/* Note carefully, compositing for fixed position is _disabled_ here */ /* Note carefully, compositing for fixed position is _disabled_ here */
internals.settings.setAcceleratedCompositingForFixedPositionEnabled(false); internals.settings.setAcceleratedCompositingForFixedPositionEnabled(false);
internals.settings.setFixedPositionCreatesStackingContext(true);
} }
function test() function test()
......
third_party/WebKit/LayoutTests/compositing/repaint/fixed-pos-with-composited-child.html
View file @ 5a885e40
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
if (window.internals) { if (window.internals) {
/* Note carefully, compositing for fixed position is _disabled_ here */ /* Note carefully, compositing for fixed position is _disabled_ here */
internals.settings.setAcceleratedCompositingForFixedPositionEnabled(false); internals.settings.setAcceleratedCompositingForFixedPositionEnabled(false);
internals.settings.setFixedPositionCreatesStackingContext(true);
} }
function test() function test()
......
third_party/WebKit/LayoutTests/compositing/repaint/scroll-fixed-layer-no-content.html
View file @ 5a885e40
...@@ -5,10 +5,8 @@ ...@@ -5,10 +5,8 @@
if (window.testRunner) if (window.testRunner)
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.internals) { if (window.internals)
internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
internals.settings.setFixedPositionCreatesStackingContext(true);
}
function test() function test()
{ {
......
third_party/WebKit/LayoutTests/compositing/repaint/scroll-fixed-layer-out-of-view.html
View file @ 5a885e40
...@@ -5,10 +5,8 @@ ...@@ -5,10 +5,8 @@
if (window.testRunner) if (window.testRunner)
testRunner.dumpAsText(); testRunner.dumpAsText();
if (window.internals) { if (window.internals)
internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true); internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
internals.settings.setFixedPositionCreatesStackingContext(true);
}
function test() function test()
{ {
......
third_party/WebKit/LayoutTests/fast/block/positioning/016-expected.txt
View file @ 5a885e40
...@@ -7,7 +7,7 @@ layer at (0,0) size 100x100 ...@@ -7,7 +7,7 @@ layer at (0,0) size 100x100
RenderBlock (positioned) {DIV} at (0,0) size 100x100 RenderBlock (positioned) {DIV} at (0,0) size 100x100
layer at (0,0) size 100x100 layer at (0,0) size 100x100
RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000] RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
layer at (0,0) size 100x100
RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
layer at (0,0) size 100x100 layer at (0,0) size 100x100
RenderBlock (positioned) zI: 2 {DIV} at (0,0) size 100x100 [bgcolor=#008000] RenderBlock (positioned) zI: 2 {DIV} at (0,0) size 100x100 [bgcolor=#008000]
layer at (0,0) size 100x100
RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
third_party/WebKit/LayoutTests/fast/block/positioning/025-expected.txt
View file @ 5a885e40
layer at (0,0) size 800x600 layer at (0,0) size 800x600
RenderView at (0,0) size 800x600 RenderView at (0,0) size 800x600
layer at (0,0) size 800x8 layerType: background only layer at (0,0) size 800x8
layer at (0,0) size 100x100
RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
layer at (0,0) size 800x8 layerType: foreground only
RenderBlock {HTML} at (0,0) size 800x8 RenderBlock {HTML} at (0,0) size 800x8
RenderBody {BODY} at (8,8) size 784x0 RenderBody {BODY} at (8,8) size 784x0
layer at (0,0) size 100x100 layerType: background only
layer at (0,0) size 100x100 layer at (0,0) size 100x100
RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
layer at (0,0) size 100x100 layerType: foreground only
RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000] RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
third_party/WebKit/LayoutTests/fast/block/positioning/fixed-position-stacking-context-expected.txt
View file @ 5a885e40
...@@ -7,7 +7,7 @@ layer at (0,0) size 100x100 ...@@ -7,7 +7,7 @@ layer at (0,0) size 100x100
RenderBlock (positioned) {DIV} at (0,0) size 100x100 RenderBlock (positioned) {DIV} at (0,0) size 100x100
layer at (0,0) size 100x100 layer at (0,0) size 100x100
RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000] RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
layer at (0,0) size 100x100
RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
layer at (0,0) size 100x100 layer at (0,0) size 100x100
RenderBlock (positioned) zI: 2 {DIV} at (0,0) size 100x100 [bgcolor=#008000] RenderBlock (positioned) zI: 2 {DIV} at (0,0) size 100x100 [bgcolor=#008000]
layer at (0,0) size 100x100
RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
third_party/WebKit/LayoutTests/fast/block/positioning/fixed-position-stacking-context2.html
View file @ 5a885e40
...@@ -23,13 +23,6 @@ div { ...@@ -23,13 +23,6 @@ div {
z-index: 2; z-index: 2;
} }
</style> </style>
<script>
if ("internals" in window) {
window.internals.settings.setFixedPositionCreatesStackingContext(true);
} else {
document.write("This test depends on the FixedPositionCreatesStackingContext setting being true, so run in DumpRenderTree or manually enable it");
}
</script>
<div class="green"></div> <div class="green"></div>
<div class="container"> <div class="container">
<div class="green"></div> <div class="green"></div>
......
third_party/WebKit/LayoutTests/fullscreen/full-screen-fixed-pos-parent.html
View file @ 5a885e40
...@@ -26,9 +26,6 @@ ...@@ -26,9 +26,6 @@
</head> </head>
<script src="full-screen-test.js"></script> <script src="full-screen-test.js"></script>
<script> <script>
if (window.internals)
window.internals.settings.setFixedPositionCreatesStackingContext(true);
function doTest() { function doTest() {
if (window.testRunner) { if (window.testRunner) {
testRunner.dumpAsTextWithPixelResults(); testRunner.dumpAsTextWithPixelResults();
......
third_party/WebKit/LayoutTests/virtual/softwarecompositing/geometry/limit-layer-bounds-fixed-expected.txt
View file @ 5a885e40
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
(backgroundColor #FF0000) (backgroundColor #FF0000)
) )
(GraphicsLayer (GraphicsLayer
(position 100.00 3100.00) (position 0.00 3000.00)
(bounds 200.00 100.00) (bounds 300.00 200.00)
(contentsOpaque 1)
(drawsContent 1) (drawsContent 1)
(backgroundColor #008000) (backgroundColor #008000)
) )
......
third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp
View file @ 5a885e40
...@@ -228,7 +228,7 @@ void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty ...@@ -228,7 +228,7 @@ void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentSty
|| style->hasBlendMode() || style->hasBlendMode()
|| style->hasIsolation() || style->hasIsolation()
|| style->position() == StickyPosition || style->position() == StickyPosition
|| (style->position() == FixedPosition && e && e->document().settings() && e->document().settings()->fixedPositionCreatesStackingContext()) || style->position() == FixedPosition
|| isInTopLayer(e, style) || isInTopLayer(e, style)
|| hasWillChangeThatCreatesStackingContext(style, e) || hasWillChangeThatCreatesStackingContext(style, e)
)) ))
......
third_party/WebKit/Source/core/frame/Settings.in
View file @ 5a885e40
...@@ -172,7 +172,6 @@ touchAdjustmentEnabled initial=true ...@@ -172,7 +172,6 @@ touchAdjustmentEnabled initial=true
# A mostly-stable performance optimization. crbug.com/304518 tracks removal. # A mostly-stable performance optimization. crbug.com/304518 tracks removal.
compositorTouchHitTesting initial=true compositorTouchHitTesting initial=true
fixedPositionCreatesStackingContext initial=false
syncXHRInDocumentsEnabled initial=true syncXHRInDocumentsEnabled initial=true
cookieEnabled initial=true cookieEnabled initial=true
navigateOnDragDrop initial=true navigateOnDragDrop initial=true
......
third_party/WebKit/Source/core/rendering/compositing/CompositingReasonFinder.cpp
View file @ 5a885e40
...@@ -194,6 +194,7 @@ bool CompositingReasonFinder::requiresCompositingForPosition(RenderObject* rende ...@@ -194,6 +194,7 @@ bool CompositingReasonFinder::requiresCompositingForPosition(RenderObject* rende
EPosition position = renderer->style()->position(); EPosition position = renderer->style()->position();
bool isFixed = renderer->isOutOfFlowPositioned() && position == FixedPosition; bool isFixed = renderer->isOutOfFlowPositioned() && position == FixedPosition;
// FIXME: The isStackingContainer check here is redundant. Fixed position elements are always stacking contexts.
if (isFixed && !layer->stackingNode()->isStackingContainer()) if (isFixed && !layer->stackingNode()->isStackingContainer())
return false; return false;
......
third_party/WebKit/Source/web/WebSettingsImpl.cpp
View file @ 5a885e40
...@@ -668,11 +668,6 @@ void WebSettingsImpl::setMediaFullscreenRequiresUserGesture(bool required) ...@@ -668,11 +668,6 @@ void WebSettingsImpl::setMediaFullscreenRequiresUserGesture(bool required)
m_settings->setMediaFullscreenRequiresUserGesture(required); m_settings->setMediaFullscreenRequiresUserGesture(required);
} }
void WebSettingsImpl::setFixedPositionCreatesStackingContext(bool creates)
{
m_settings->setFixedPositionCreatesStackingContext(creates);
}
void WebSettingsImpl::setViewportEnabled(bool enabled) void WebSettingsImpl::setViewportEnabled(bool enabled)
{ {
m_settings->setViewportEnabled(enabled); m_settings->setViewportEnabled(enabled);
......
third_party/WebKit/Source/web/WebSettingsImpl.h
View file @ 5a885e40
...@@ -103,7 +103,6 @@ public: ...@@ -103,7 +103,6 @@ public:
virtual void setExperimentalWebSocketEnabled(bool) OVERRIDE; virtual void setExperimentalWebSocketEnabled(bool) OVERRIDE;
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE; virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE; virtual void setFixedFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) OVERRIDE;
virtual void setFixedPositionCreatesStackingContext(bool) OVERRIDE;
virtual void setForceCompositingMode(bool) OVERRIDE; virtual void setForceCompositingMode(bool) OVERRIDE;
virtual void setFullScreenEnabled(bool) OVERRIDE; virtual void setFullScreenEnabled(bool) OVERRIDE;
virtual void setGestureTapHighlightEnabled(bool) OVERRIDE; virtual void setGestureTapHighlightEnabled(bool) OVERRIDE;
......
third_party/WebKit/Source/web/tests/CompositedLayerMappingTest.cpp
View file @ 5a885e40
...@@ -84,7 +84,6 @@ public: ...@@ -84,7 +84,6 @@ public:
m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEnabled(true); m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEnabled(true);
m_webViewImpl->settings()->setAcceleratedCompositingForScrollableFramesEnabled(true); m_webViewImpl->settings()->setAcceleratedCompositingForScrollableFramesEnabled(true);
m_webViewImpl->settings()->setCompositedScrollingForFramesEnabled(true); m_webViewImpl->settings()->setCompositedScrollingForFramesEnabled(true);
m_webViewImpl->settings()->setFixedPositionCreatesStackingContext(true);
m_webViewImpl->setMainFrame(m_mainFrame); m_webViewImpl->setMainFrame(m_mainFrame);
m_webViewImpl->resize(IntSize(320, 240)); m_webViewImpl->resize(IntSize(320, 240));
} }
......
third_party/WebKit/Source/web/tests/ScrollingCoordinatorChromiumTest.cpp
View file @ 5a885e40
...@@ -124,7 +124,6 @@ private: ...@@ -124,7 +124,6 @@ private:
settings->setAcceleratedCompositingForOverflowScrollEnabled(true); settings->setAcceleratedCompositingForOverflowScrollEnabled(true);
settings->setAcceleratedCompositingForScrollableFramesEnabled(true); settings->setAcceleratedCompositingForScrollableFramesEnabled(true);
settings->setCompositedScrollingForFramesEnabled(true); settings->setCompositedScrollingForFramesEnabled(true);
settings->setFixedPositionCreatesStackingContext(true);
} }
FrameTestHelpers::WebViewHelper m_helper; FrameTestHelpers::WebViewHelper m_helper;
......
third_party/WebKit/Source/web/tests/WebFrameTest.cpp
View file @ 5a885e40
...@@ -165,7 +165,6 @@ protected: ...@@ -165,7 +165,6 @@ protected:
settings->setAcceleratedCompositingForOverflowScrollEnabled(true); settings->setAcceleratedCompositingForOverflowScrollEnabled(true);
settings->setAcceleratedCompositingForScrollableFramesEnabled(true); settings->setAcceleratedCompositingForScrollableFramesEnabled(true);
settings->setCompositedScrollingForFramesEnabled(true); settings->setCompositedScrollingForFramesEnabled(true);
settings->setFixedPositionCreatesStackingContext(true);
} }
void initializeTextSelectionWebView(const std::string& url, FrameTestHelpers::WebViewHelper* webViewHelper) void initializeTextSelectionWebView(const std::string& url, FrameTestHelpers::WebViewHelper* webViewHelper)
......
third_party/WebKit/Source/web/tests/WebViewTest.cpp
View file @ 5a885e40
...@@ -1098,7 +1098,6 @@ static void configueCompositingWebView(WebSettings* settings) ...@@ -1098,7 +1098,6 @@ static void configueCompositingWebView(WebSettings* settings)
settings->setAcceleratedCompositingForOverflowScrollEnabled(true); settings->setAcceleratedCompositingForOverflowScrollEnabled(true);
settings->setAcceleratedCompositingForScrollableFramesEnabled(true); settings->setAcceleratedCompositingForScrollableFramesEnabled(true);
settings->setCompositedScrollingForFramesEnabled(true); settings->setCompositedScrollingForFramesEnabled(true);
settings->setFixedPositionCreatesStackingContext(true);
} }
TEST_F(WebViewTest, ShowPressOnTransformedLink) TEST_F(WebViewTest, ShowPressOnTransformedLink)
......
third_party/WebKit/public/web/WebSettings.h
View file @ 5a885e40
...@@ -113,7 +113,6 @@ public: ...@@ -113,7 +113,6 @@ public:
virtual void setExperimentalWebSocketEnabled(bool) = 0; virtual void setExperimentalWebSocketEnabled(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;
virtual void setFixedPositionCreatesStackingContext(bool) = 0;
virtual void setForceCompositingMode(bool) = 0; virtual void setForceCompositingMode(bool) = 0;
virtual void setFullScreenEnabled(bool) = 0; virtual void setFullScreenEnabled(bool) = 0;
virtual void setGestureTapHighlightEnabled(bool) = 0; virtual void setGestureTapHighlightEnabled(bool) = 0;
...@@ -200,6 +199,9 @@ public: ...@@ -200,6 +199,9 @@ public:
virtual void setWideViewportQuirkEnabled(bool) = 0; virtual void setWideViewportQuirkEnabled(bool) = 0;
virtual void setXSSAuditorEnabled(bool) = 0; virtual void setXSSAuditorEnabled(bool) = 0;
// FIXME: Remove these unused settings.
virtual void setFixedPositionCreatesStackingContext(bool) { }
protected: protected:
~WebSettings() { } ~WebSettings() { }
}; };
......
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