Title: [186417] releases/WebKitGTK/webkit-2.8
- Revision
- 186417
- Author
- [email protected]
- Date
- 2015-07-07 01:42:48 -0700 (Tue, 07 Jul 2015)
Log Message
Merge r185666 - REGRESSION (r173283-r173296): Amazon.com front page has no caret in the search field
https://bugs.webkit.org/show_bug.cgi?id=146073
rdar://problem/21022203
Reviewed by Tim Horton.
Source/WebCore:
Text controls (text inputs and textareas) need backing store even when empty, because
they need to be able to paint a caret.
Test: compositing/backing/form-controls-backing.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
LayoutTests:
Dump layers for composited text inputs and textareas.
* compositing/backing/form-controls-backing-expected.txt: Added.
* compositing/backing/form-controls-backing.html: Added.
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (186416 => 186417)
--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-07 08:39:14 UTC (rev 186416)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-07 08:42:48 UTC (rev 186417)
@@ -1,3 +1,16 @@
+2015-06-17 Simon Fraser <[email protected]>
+
+ REGRESSION (r173283-r173296): Amazon.com front page has no caret in the search field
+ https://bugs.webkit.org/show_bug.cgi?id=146073
+ rdar://problem/21022203
+
+ Reviewed by Tim Horton.
+
+ Dump layers for composited text inputs and textareas.
+
+ * compositing/backing/form-controls-backing-expected.txt: Added.
+ * compositing/backing/form-controls-backing.html: Added.
+
2015-06-15 Zalan Bujtas <[email protected]>
RootInlineBox::m_lineBreakObj becomes invalid when a child renderer is removed and the line does not get marked dirty.
Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/backing/form-controls-backing-expected.txt (0 => 186417)
--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/backing/form-controls-backing-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/backing/form-controls-backing-expected.txt 2015-07-07 08:42:48 UTC (rev 186417)
@@ -0,0 +1,31 @@
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 3
+ (GraphicsLayer
+ (position 19.00 19.00)
+ (bounds 20.00 420.00)
+ (contentsOpaque 1)
+ )
+ (GraphicsLayer
+ (position 19.00 19.00)
+ (bounds 202.00 22.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 19.00 59.00)
+ (bounds 204.00 24.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/backing/form-controls-backing.html (0 => 186417)
--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/backing/form-controls-backing.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/backing/form-controls-backing.html 2015-07-07 08:42:48 UTC (rev 186417)
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ position: relative;
+ z-index: 1;
+ padding: 10px;
+ width: 400px;
+ height: 400px;
+ border: 1px solid black;
+ }
+
+ input, textarea {
+ position: absolute;
+ border-style: none;
+ outline: 0;
+ height: 20px;
+ width: 200px;
+ background: silver;
+ }
+
+ .composited {
+ position: absolute;
+ left: 10px;
+ width: 20px;
+ height: 100%;
+ -webkit-transform: translateZ(0);
+ background-color: #eee;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function dumpLayers()
+ {
+ var layersResult = document.getElementById('layers');
+ if (window.testRunner)
+ layersResult.innerText = window.internals.layerTreeAsText(document);
+ }
+
+ window.addEventListener('load', dumpLayers, false)
+ </script>
+</head>
+<body>
+
+<div class="container">
+ <div class="composited"></div>
+
+ <input type="text" style="top: 10px"></input>
+ <textarea style="top: 50px"></textarea>
+</div>
+
+<pre id="layers">Layer tree goes here in DRT</pre>
+
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186416 => 186417)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 08:39:14 UTC (rev 186416)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 08:42:48 UTC (rev 186417)
@@ -1,3 +1,19 @@
+2015-06-17 Simon Fraser <[email protected]>
+
+ REGRESSION (r173283-r173296): Amazon.com front page has no caret in the search field
+ https://bugs.webkit.org/show_bug.cgi?id=146073
+ rdar://problem/21022203
+
+ Reviewed by Tim Horton.
+
+ Text controls (text inputs and textareas) need backing store even when empty, because
+ they need to be able to paint a caret.
+
+ Test: compositing/backing/form-controls-backing.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::isSimpleContainerCompositingLayer):
+
2015-06-16 Carlos Garcia Campos <[email protected]>
WebProcess crashes after too many redirect error when there's an active NPAPI plugin
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderLayerBacking.cpp (186416 => 186417)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-07-07 08:39:14 UTC (rev 186416)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-07-07 08:42:48 UTC (rev 186417)
@@ -1772,6 +1772,9 @@
if (renderer().isRenderReplaced() && (!isCompositedPlugin(renderer()) || isRestartedPlugin(renderer())))
return false;
+ if (renderer().isTextControl())
+ return false;
+
if (paintsBoxDecorations() || paintsChildren())
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
