Title: [104592] trunk/Source/WebCore
- Revision
- 104592
- Author
- [email protected]
- Date
- 2012-01-10 09:49:05 -0800 (Tue, 10 Jan 2012)
Log Message
Not reviewed: fixing the Mac build.
* inspector/DOMEditor.cpp:
(WebCore::DOMEditor::patchChildren):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (104591 => 104592)
--- trunk/Source/WebCore/ChangeLog 2012-01-10 17:44:21 UTC (rev 104591)
+++ trunk/Source/WebCore/ChangeLog 2012-01-10 17:49:05 UTC (rev 104592)
@@ -1,3 +1,10 @@
+2012-01-10 Pavel Feldman <[email protected]>
+
+ Not reviewed: fixing the Mac build.
+
+ * inspector/DOMEditor.cpp:
+ (WebCore::DOMEditor::patchChildren):
+
2012-01-09 Jer Noble <[email protected]>
Elements can appear over fullscreen video
Modified: trunk/Source/WebCore/inspector/DOMEditor.cpp (104591 => 104592)
--- trunk/Source/WebCore/inspector/DOMEditor.cpp 2012-01-10 17:44:21 UTC (rev 104591)
+++ trunk/Source/WebCore/inspector/DOMEditor.cpp 2012-01-10 17:49:05 UTC (rev 104592)
@@ -211,13 +211,13 @@
// Check if this change is between stable nodes. If it is, consider it as "modified".
if ((!i || oldMap[i - 1].first) && (i == oldMap.size() - 1 || oldMap[i + 1].first)) {
- size_t anchorBefore = i ? oldMap[i - 1].second : -1;
- size_t anchorAfter = i == oldMap.size() - 1 ? anchorBefore + 2 : oldMap[i + 1].second;
- if (anchorAfter - anchorBefore == 2 && anchorBefore + 1 < newList.size()) {
- if (!patchNode(oldList[i].get(), newList[anchorBefore + 1].get()))
+ size_t anchorCandidate = i ? oldMap[i - 1].second + 1 : 0;
+ size_t anchorAfter = i == oldMap.size() - 1 ? anchorCandidate + 1 : oldMap[i + 1].second;
+ if (anchorAfter - anchorCandidate == 1 && anchorCandidate < newList.size()) {
+ if (!patchNode(oldList[i].get(), newList[anchorCandidate].get()))
return false;
- merges.add(newList[anchorBefore + 1].get());
+ merges.add(newList[anchorCandidate].get());
} else
oldList[i]->m_node->parentNode()->removeChild(oldList[i]->m_node);
} else {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
