Title: [168436] branches/safari-537.76-branch
- Revision
- 168436
- Author
- lforsch...@apple.com
- Date
- 2014-05-07 12:59:16 -0700 (Wed, 07 May 2014)
Log Message
Rollout r168104.
Modified Paths
Removed Paths
Diff
Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168435 => 168436)
--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-05-07 18:57:35 UTC (rev 168435)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-05-07 19:59:16 UTC (rev 168436)
@@ -1,3 +1,7 @@
+2014-05-07 Lucas Forschler <lforsch...@apple.com>
+
+ Rollout r168104
+
2014-05-05 Matthew Hanson <matthew_han...@apple.com>
Skip fast/workers/worker-copy-shared-blob-url.html.
Deleted: branches/safari-537.76-branch/LayoutTests/fast/block/continuation-crash-expected.txt (168435 => 168436)
--- branches/safari-537.76-branch/LayoutTests/fast/block/continuation-crash-expected.txt 2014-05-07 18:57:35 UTC (rev 168435)
+++ branches/safari-537.76-branch/LayoutTests/fast/block/continuation-crash-expected.txt 2014-05-07 19:59:16 UTC (rev 168436)
@@ -1,2 +0,0 @@
-This test passes if it does not crash.
-
Deleted: branches/safari-537.76-branch/LayoutTests/fast/block/continuation-crash.html (168435 => 168436)
--- branches/safari-537.76-branch/LayoutTests/fast/block/continuation-crash.html 2014-05-07 18:57:35 UTC (rev 168435)
+++ branches/safari-537.76-branch/LayoutTests/fast/block/continuation-crash.html 2014-05-07 19:59:16 UTC (rev 168436)
@@ -1,23 +0,0 @@
-<style>
-#span2
-{ position: relative; }
-</style>
- <script>
-function run() {
- document.getElementById("span2").style.position = "static";
-}
-</script>
-<body>
-This test passes if it does not crash.
-<span id="span2">
-<div></div>
-<script>
-try {
-var x = window.getSelection();
-x.getRangeAt(document.body.appendChild(document.createElement("frame")).height);
-} catch (e) {}
-document.body.offsetWidth
-run()
-if (window.testRunner)
- testRunner.dumpAsText()
-</script>
\ No newline at end of file
Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168435 => 168436)
--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-05-07 18:57:35 UTC (rev 168435)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-05-07 19:59:16 UTC (rev 168436)
@@ -1,3 +1,7 @@
+2014-05-07 Lucas Forschler <lforsch...@apple.com>
+
+ Rollout r168104
+
2014-05-05 Andy Estes <aes...@apple.com>
Fix the Mountain Lion build.
Modified: branches/safari-537.76-branch/Source/WebCore/rendering/RenderInline.cpp (168435 => 168436)
--- branches/safari-537.76-branch/Source/WebCore/rendering/RenderInline.cpp 2014-05-07 18:57:35 UTC (rev 168435)
+++ branches/safari-537.76-branch/Source/WebCore/rendering/RenderInline.cpp 2014-05-07 19:59:16 UTC (rev 168436)
@@ -151,22 +151,14 @@
return 0;
}
-static void updateStyleOfAnonymousBlockContinuations(RenderObject* box, const RenderStyle* newStyle, const RenderStyle* oldStyle)
+static void updateStyleOfAnonymousBlockContinuations(RenderObject* block, const RenderStyle* newStyle, const RenderStyle* oldStyle)
{
- for (;box && box->isAnonymousBlock(); box = box->nextSibling()) {
- if (box->style()->position() == newStyle->position())
+ for (;block && block->isAnonymousBlock(); block = block->nextSibling()) {
+ if (!toRenderBlock(block)->isAnonymousBlockContinuation() || block->style()->position() == newStyle->position())
continue;
-
- if (!box->isRenderBlock())
- break; // We're done if we ever encounter something other than a RenderBlock.
-
- RenderBlock* block = toRenderBlock(box);
- if (!block->isAnonymousBlockContinuation())
- break; // We're done if we ever encounter something other than a continuation RenderBlock.
-
// If we are no longer in-flow positioned but our descendant block(s) still have an in-flow positioned ancestor then
// their containing anonymous block should keep its in-flow positioning.
- RenderInline* cont = toRenderBlock(box)->inlineElementContinuation();
+ RenderInline* cont = toRenderBlock(block)->inlineElementContinuation();
if (oldStyle->hasInFlowPosition() && inFlowPositionedInlineAncestor(cont))
continue;
RefPtr<RenderStyle> blockStyle = RenderStyle::createAnonymousStyleWithDisplay(block->style(), BLOCK);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
