Diff
Modified: trunk/LayoutTests/ChangeLog (171600 => 171601)
--- trunk/LayoutTests/ChangeLog 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/LayoutTests/ChangeLog 2014-07-25 17:39:02 UTC (rev 171601)
@@ -1,3 +1,17 @@
+2014-07-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r171587.
+ https://bugs.webkit.org/show_bug.cgi?id=135294
+
+ Made fast/dom/HTMLObjectElement/beforeload-set-text-
+ crash.xhtml crash again (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r169105): Crash in selection"
+ https://bugs.webkit.org/show_bug.cgi?id=134303
+ http://trac.webkit.org/changeset/171587
+
2014-07-25 Zalan Bujtas <[email protected]>
Unreviewed media test gardening after r171593.
Deleted: trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt (171600 => 171601)
--- trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/LayoutTests/fast/regions/selection/crash-deselect-expected.txt 2014-07-25 17:39:02 UTC (rev 171601)
@@ -1,5 +0,0 @@
-CONSOLE MESSAGE: line 66: HierarchyRequestError: DOM Exception 3: A Node was inserted somewhere it doesn't belong.
-
-Errlog selectionTest: HierarchyRequestError: HierarchyRequestError: DOM Exception 3 : index 1
-Errlog webtest_fn_24:
-
Deleted: trunk/LayoutTests/fast/regions/selection/crash-deselect.html (171600 => 171601)
--- trunk/LayoutTests/fast/regions/selection/crash-deselect.html 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/LayoutTests/fast/regions/selection/crash-deselect.html 2014-07-25 17:39:02 UTC (rev 171601)
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html id="webtest0">
- <head id="webtest1">
- <style id="webtest2"></style>
- <style>
- :last-child { -webkit-flow-into: foo; }
- </style>
-
- </head>
- <body id="webtest3">
- <script id="example"></script>
-
- <script type="text/_javascript_">
- if (window.testRunner)
- testRunner.dumpAsText(false);
- </script>
-
- <script>
- var new_elem = document.createElement("canvas");
- new_elem.setAttribute("id", "webtest11");
- document.querySelector("#webtest0").appendChild(new_elem);
-
- document.write("<br><summary>");
- </script>
- <summary>
- <mathml id="webtest12">
- <femerge></femerge>
- </mathml>
-
- <script>
- function selectionTest() {
- try {
- wf_i = 0;
- for (; wf_i<40; wf_i++) {
- var range = document.createRange();
-
- range.setStartBefore(document.getElementById("webtest3"));
- range.setEndAfter(document.getElementById("webtest2"));
- range.deleteContents();
-
- var markElement = document.getElementById("webtest1").appendChild(document.createElementNS("", "mark"));
- range.setStartAfter(markElement);
-
- var appletElement = document.getElementById("example").appendChild(document.createElement("applet"));
- range.setEndAfter(appletElement);
-
- range.insertNode(document.getElementById("example"));
- }
- } catch(e) {
- document.write("Errlog selectionTest: " + e.name + ": " + e.message + " : index " + wf_i + " <br><table/>");
- }
- }
- selectionTest();
- </script>
- <sub>
-
- <script>
- document.designMode = "on";
- document.execCommand("SelectAll");
- document.write("Errlog webtest_fn_24: <br><nobr>");
-
- var femergeElement = document.getElementById("webtest12").appendChild(document.createElement("femerge"));
- var appletElement = document.getElementById("example").appendChild(document.createElement("applet"));
- var gradientElement = document.body.appendChild(document.createElement("gradient"));
-
- document.getElementById("webtest2").isEqualNode(femergeElement.insertBefore(document.documentElement, gradientElement));
- </script>
-
- <table></table>
- </summary>
- </body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (171600 => 171601)
--- trunk/Source/WebCore/ChangeLog 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 17:39:02 UTC (rev 171601)
@@ -1,3 +1,17 @@
+2014-07-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r171587.
+ https://bugs.webkit.org/show_bug.cgi?id=135294
+
+ Made fast/dom/HTMLObjectElement/beforeload-set-text-
+ crash.xhtml crash again (Requested by ap on #webkit).
+
+ Reverted changeset:
+
+ "REGRESSION (r169105): Crash in selection"
+ https://bugs.webkit.org/show_bug.cgi?id=134303
+ http://trac.webkit.org/changeset/171587
+
2014-07-25 Dan Bernstein <[email protected]>
ResourceErrorBase::compare doesn’t call the right platformCompare override
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (171600 => 171601)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-07-25 17:39:02 UTC (rev 171601)
@@ -466,7 +466,7 @@
0F09087F1444FDB200028917 /* ScrollbarTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */; };
0F099D0817B968A100FF84B9 /* WebCoreTypedArrayController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F099D0617B968A100FF84B9 /* WebCoreTypedArrayController.cpp */; };
0F099D0917B968A100FF84B9 /* WebCoreTypedArrayController.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 0F11A54F0F39233100C37884 /* RenderSelectionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F11A54E0F39233100C37884 /* RenderSelectionInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 0F11A54F0F39233100C37884 /* RenderSelectionInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F11A54E0F39233100C37884 /* RenderSelectionInfo.h */; };
0F13163E16ED0CC80035CC04 /* PlatformCAFilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F13163D16ED0CC80035CC04 /* PlatformCAFilters.h */; settings = {ATTRIBUTES = (Private, ); }; };
0F13164016ED0CDE0035CC04 /* PlatformCAFiltersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F13163F16ED0CDE0035CC04 /* PlatformCAFiltersMac.mm */; };
0F15DA8A0F3AAEE70000CE47 /* AnimationControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15DA890F3AAEE70000CE47 /* AnimationControllerPrivate.h */; };
Modified: trunk/Source/WebCore/rendering/RenderSelectionInfo.h (171600 => 171601)
--- trunk/Source/WebCore/rendering/RenderSelectionInfo.h 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/Source/WebCore/rendering/RenderSelectionInfo.h 2014-07-25 17:39:02 UTC (rev 171601)
@@ -25,9 +25,8 @@
#ifndef RenderSelectionInfo_h
#define RenderSelectionInfo_h
-#include "GapRects.h"
#include "IntRect.h"
-#include "RenderBlock.h"
+#include "RenderBox.h"
#include "RenderText.h"
namespace WebCore {
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (171600 => 171601)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-07-25 17:39:02 UTC (rev 171601)
@@ -854,9 +854,7 @@
// If there is no RenderNamedFlowThreads we follow the regular selection.
if (!hasRenderNamedFlowThreads()) {
- RenderSubtreesMap singleSubtreeMap;
- singleSubtreeMap.set(this, SelectionSubtreeRoot(start, startPos, end, endPos));
- updateSelectionForSubtrees(singleSubtreeMap, blockRepaintMode);
+ setSubtreeSelection(*this, start, startPos, end, endPos, blockRepaintMode);
return;
}
@@ -866,6 +864,7 @@
void RenderView::splitSelectionBetweenSubtrees(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode)
{
// Compute the visible selection end points for each of the subtrees.
+ typedef HashMap<SelectionSubtreeRoot*, SelectionSubtreeRoot> RenderSubtreesMap;
RenderSubtreesMap renderSubtreesMap;
SelectionSubtreeRoot initialSelection;
@@ -899,49 +898,33 @@
renderSubtreesMap.set(&root, selectionData);
}
}
-
- updateSelectionForSubtrees(renderSubtreesMap, blockRepaintMode);
-}
-void RenderView::updateSelectionForSubtrees(RenderSubtreesMap& renderSubtreesMap, SelectionRepaintMode blockRepaintMode)
-{
- SubtreeOldSelectionDataMap oldSelectionDataMap;
- for (auto it = renderSubtreesMap.begin(); it != renderSubtreesMap.end(); ++it) {
- std::unique_ptr<OldSelectionData> oldSelectionData = std::make_unique<OldSelectionData>();
- clearSubtreeSelection(*it->key, blockRepaintMode, *oldSelectionData);
- oldSelectionDataMap.set(it->key, WTF::move(oldSelectionData));
-
- SelectionSubtreeRoot& subtreeSelectionData = it->value;
+ for (RenderSubtreesMap::iterator i = renderSubtreesMap.begin(); i != renderSubtreesMap.end(); ++i) {
+ SelectionSubtreeRoot subtreeSelectionData = i->value;
subtreeSelectionData.adjustForVisibleSelection(document());
-
- SelectionSubtreeRoot& root = *it->key;
- root.setSelectionStart(subtreeSelectionData.selectionStart());
- root.setSelectionStartPos(subtreeSelectionData.selectionStartPos());
- root.setSelectionEnd(subtreeSelectionData.selectionEnd());
- root.setSelectionEndPos(subtreeSelectionData.selectionEndPos());
+ setSubtreeSelection(*i->key, subtreeSelectionData.selectionStart(), subtreeSelectionData.selectionStartPos(),
+ subtreeSelectionData.selectionEnd(), subtreeSelectionData.selectionEndPos(), blockRepaintMode);
}
-
- // Update selection status for the objects inside the selection subtrees.
- // This needs to be done after the previous loop updated the selectionStart/End
- // parameters of all subtrees because we're going to be climbing up the containing
- // block chain and we might end up in a different selection subtree.
- for (auto it = renderSubtreesMap.begin(); it != renderSubtreesMap.end(); ++it) {
- SelectionSubtreeRoot subtreeSelectionData = it->value;
- OldSelectionData& oldSelectionData = *oldSelectionDataMap.get(it->key);
- applySubtreeSelection(*it->key, subtreeSelectionData.selectionStart(), subtreeSelectionData.selectionEnd(), subtreeSelectionData.selectionEndPos(), blockRepaintMode, oldSelectionData);
- }
}
-void RenderView::clearSubtreeSelection(const SelectionSubtreeRoot& root, SelectionRepaintMode blockRepaintMode, OldSelectionData& oldSelectionData)
+void RenderView::setSubtreeSelection(SelectionSubtreeRoot& root, RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode)
{
// Record the old selected objects. These will be used later
// when we compare against the new selected objects.
- oldSelectionData.selectionStartPos = root.selectionStartPos();
- oldSelectionData.selectionEndPos = root.selectionEndPos();
-
+ int oldStartPos = root.selectionStartPos();
+ int oldEndPos = root.selectionEndPos();
+
+ // Objects each have a single selection rect to examine.
+ typedef HashMap<RenderObject*, std::unique_ptr<RenderSelectionInfo>> SelectedObjectMap;
+ SelectedObjectMap oldSelectedObjects;
+ SelectedObjectMap newSelectedObjects;
+
// Blocks contain selected objects and fill gaps between them, either on the left, right, or in between lines and blocks.
// In order to get the repaint rect right, we have to examine left, middle, and right rects individually, since otherwise
// the union of those rects might remain the same even when changes have occurred.
+ typedef HashMap<RenderBlock*, std::unique_ptr<RenderBlockSelectionInfo>> SelectedBlockMap;
+ SelectedBlockMap oldSelectedBlocks;
+ SelectedBlockMap newSelectedBlocks;
RenderObject* os = root.selectionStart();
RenderObject* stop = rendererAfterPosition(root.selectionEnd(), root.selectionEndPos());
@@ -950,11 +933,11 @@
if ((os->canBeSelectionLeaf() || os == root.selectionStart() || os == root.selectionEnd())
&& os->selectionState() != SelectionNone) {
// Blocks are responsible for painting line gaps and margin gaps. They must be examined as well.
- oldSelectionData.selectedObjects.set(os, std::make_unique<RenderSelectionInfo>(os, true));
+ oldSelectedObjects.set(os, std::make_unique<RenderSelectionInfo>(os, true));
if (blockRepaintMode == RepaintNewXOROld) {
RenderBlock* cb = os->containingBlock();
while (cb && !cb->isRenderView()) {
- std::unique_ptr<RenderBlockSelectionInfo>& blockInfo = oldSelectionData.selectedBlocks.add(cb, nullptr).iterator->value;
+ std::unique_ptr<RenderBlockSelectionInfo>& blockInfo = oldSelectedBlocks.add(cb, nullptr).iterator->value;
if (blockInfo)
break;
blockInfo = std::make_unique<RenderBlockSelectionInfo>(cb);
@@ -966,13 +949,17 @@
os = selectionIterator.next();
}
- auto oldObjectsEnd = oldSelectionData.selectedObjects.end();
- for (auto i = oldSelectionData.selectedObjects.begin(); i != oldObjectsEnd; ++i)
+ // Now clear the selection.
+ SelectedObjectMap::iterator oldObjectsEnd = oldSelectedObjects.end();
+ for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObjectsEnd; ++i)
i->key->setSelectionStateIfNeeded(SelectionNone);
-}
-void RenderView::applySubtreeSelection(SelectionSubtreeRoot& root, RenderObject* start, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode, const OldSelectionData& oldSelectionData)
-{
+ // set selection start and end
+ root.setSelectionStart(start);
+ root.setSelectionStartPos(startPos);
+ root.setSelectionEnd(end);
+ root.setSelectionEndPos(endPos);
+
// Update the selection status of all objects between selectionStart and selectionEnd
if (start && start == end)
start->setSelectionStateIfNeeded(SelectionBoth);
@@ -984,8 +971,8 @@
}
RenderObject* o = start;
- RenderObject* stop = rendererAfterPosition(end, endPos);
- SelectionIterator selectionIterator(o);
+ stop = rendererAfterPosition(end, endPos);
+ selectionIterator = SelectionIterator(o);
while (o && o != stop) {
if (o != start && o != end && o->canBeSelectionLeaf())
@@ -998,8 +985,6 @@
// Now that the selection state has been updated for the new objects, walk them again and
// put them in the new objects list.
- SelectedObjectMap newSelectedObjects;
- SelectedBlockMap newSelectedBlocks;
o = start;
selectionIterator = SelectionIterator(o);
while (o && o != stop) {
@@ -1034,14 +1019,13 @@
return;
// Have any of the old selected objects changed compared to the new selection?
- auto oldObjectsEnd = oldSelectionData.selectedObjects.end();
- for (auto it = oldSelectionData.selectedObjects.begin(); it != oldObjectsEnd; ++it) {
- RenderObject* obj = it->key;
+ for (SelectedObjectMap::iterator i = oldSelectedObjects.begin(); i != oldObjectsEnd; ++i) {
+ RenderObject* obj = i->key;
RenderSelectionInfo* newInfo = newSelectedObjects.get(obj);
- RenderSelectionInfo* oldInfo = it->value.get();
+ RenderSelectionInfo* oldInfo = i->value.get();
if (!newInfo || oldInfo->rect() != newInfo->rect() || oldInfo->state() != newInfo->state()
- || (root.selectionStart() == obj && oldSelectionData.selectionStartPos != root.selectionStartPos())
- || (root.selectionEnd() == obj && oldSelectionData.selectionEndPos != root.selectionEndPos())) {
+ || (root.selectionStart() == obj && oldStartPos != root.selectionStartPos())
+ || (root.selectionEnd() == obj && oldEndPos != root.selectionEndPos())) {
oldInfo->repaint();
if (newInfo) {
newInfo->repaint();
@@ -1051,16 +1035,16 @@
}
// Any new objects that remain were not found in the old objects dict, and so they need to be updated.
- auto newObjectsEnd = newSelectedObjects.end();
- for (auto it = newSelectedObjects.begin(); it != newObjectsEnd; ++it)
- it->value->repaint();
+ SelectedObjectMap::iterator newObjectsEnd = newSelectedObjects.end();
+ for (SelectedObjectMap::iterator i = newSelectedObjects.begin(); i != newObjectsEnd; ++i)
+ i->value->repaint();
// Have any of the old blocks changed?
- auto oldBlocksEnd = oldSelectionData.selectedBlocks.end();
- for (auto it = oldSelectionData.selectedBlocks.begin(); it != oldBlocksEnd; ++it) {
- RenderBlock* block = it->key;
+ SelectedBlockMap::iterator oldBlocksEnd = oldSelectedBlocks.end();
+ for (SelectedBlockMap::iterator i = oldSelectedBlocks.begin(); i != oldBlocksEnd; ++i) {
+ RenderBlock* block = i->key;
RenderBlockSelectionInfo* newInfo = newSelectedBlocks.get(block);
- RenderBlockSelectionInfo* oldInfo = it->value.get();
+ RenderBlockSelectionInfo* oldInfo = i->value.get();
if (!newInfo || oldInfo->rects() != newInfo->rects() || oldInfo->state() != newInfo->state()) {
oldInfo->repaint();
if (newInfo) {
@@ -1071,9 +1055,9 @@
}
// Any new blocks that remain were not found in the old blocks dict, and so they need to be updated.
- auto newBlocksEnd = newSelectedBlocks.end();
- for (auto it = newSelectedBlocks.begin(); it != newBlocksEnd; ++it)
- it->value->repaint();
+ SelectedBlockMap::iterator newBlocksEnd = newSelectedBlocks.end();
+ for (SelectedBlockMap::iterator i = newSelectedBlocks.begin(); i != newBlocksEnd; ++i)
+ i->value->repaint();
}
void RenderView::getSelection(RenderObject*& startRenderer, int& startOffset, RenderObject*& endRenderer, int& endOffset) const
Modified: trunk/Source/WebCore/rendering/RenderView.h (171600 => 171601)
--- trunk/Source/WebCore/rendering/RenderView.h 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/Source/WebCore/rendering/RenderView.h 2014-07-25 17:39:02 UTC (rev 171601)
@@ -304,9 +304,7 @@
friend class LayoutStateDisabler;
void splitSelectionBetweenSubtrees(RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode blockRepaintMode);
- void clearSubtreeSelection(const SelectionSubtreeRoot&, SelectionRepaintMode, OldSelectionData&);
- void updateSelectionForSubtrees(RenderSubtreesMap&, SelectionRepaintMode);
- void applySubtreeSelection(SelectionSubtreeRoot&, RenderObject* start, RenderObject* end, int endPos, SelectionRepaintMode, const OldSelectionData&);
+ void setSubtreeSelection(SelectionSubtreeRoot&, RenderObject* start, int startPos, RenderObject* end, int endPos, SelectionRepaintMode);
LayoutRect subtreeSelectionBounds(const SelectionSubtreeRoot&, bool clipToVisibleContent = true) const;
void repaintSubtreeSelection(const SelectionSubtreeRoot&) const;
Modified: trunk/Source/WebCore/rendering/SelectionSubtreeRoot.cpp (171600 => 171601)
--- trunk/Source/WebCore/rendering/SelectionSubtreeRoot.cpp 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/Source/WebCore/rendering/SelectionSubtreeRoot.cpp 2014-07-25 17:39:02 UTC (rev 171601)
@@ -45,14 +45,6 @@
{
}
-SelectionSubtreeRoot::SelectionSubtreeRoot(RenderObject* selectionStart, int selectionStartPos, RenderObject* selectionEnd, int selectionEndPos)
- : m_selectionStart(selectionStart)
- , m_selectionStartPos(selectionStartPos)
- , m_selectionEnd(selectionEnd)
- , m_selectionEndPos(selectionEndPos)
-{
-}
-
void SelectionSubtreeRoot::adjustForVisibleSelection(Document& document)
{
if (selectionClear())
Modified: trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h (171600 => 171601)
--- trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h 2014-07-25 16:41:21 UTC (rev 171600)
+++ trunk/Source/WebCore/rendering/SelectionSubtreeRoot.h 2014-07-25 17:39:02 UTC (rev 171601)
@@ -31,7 +31,6 @@
#define SelectionSubtreeRoot_h
#include "RenderObject.h"
-#include "RenderSelectionInfo.h"
namespace WebCore {
@@ -39,28 +38,8 @@
class SelectionSubtreeRoot {
public:
-
- typedef HashMap<RenderObject*, std::unique_ptr<RenderSelectionInfo>> SelectedObjectMap;
- typedef HashMap<RenderBlock*, std::unique_ptr<RenderBlockSelectionInfo>> SelectedBlockMap;
- typedef HashMap<SelectionSubtreeRoot*, SelectionSubtreeRoot> RenderSubtreesMap;
- struct OldSelectionData {
- OldSelectionData()
- : selectionStartPos(-1)
- , selectionEndPos(-1)
- {
- }
-
- int selectionStartPos;
- int selectionEndPos;
- SelectedObjectMap selectedObjects;
- SelectedBlockMap selectedBlocks;
- };
-
- typedef HashMap<SelectionSubtreeRoot*, std::unique_ptr<OldSelectionData>> SubtreeOldSelectionDataMap;
-
SelectionSubtreeRoot();
- SelectionSubtreeRoot(RenderObject* selectionStart, int selectionStartPos, RenderObject* selectionEnd, int selectionEndPos);
RenderObject* selectionStart() const { return m_selectionStart; }
int selectionStartPos() const { return m_selectionStartPos; }
