Changeset 168641 in webkit

Timestamp:

May 12, 2014 1:31:29 PM (10 years ago)

Author:

jhoneycutt@apple.com

Message:

REGRESSION (r167818): editing/inserting/typing-space-to-trigger-smart-link.html fails on WebKit1 bots

<​https://bugs.webkit.org/show_bug.cgi?id=132207>
<rdar://problem/16730393>

Source/WebCore:
Reverts the previous workaround in favor of a more specific fix for the
null dereference.

Reviewed by Darin Adler.

• editing/ApplyStyleCommand.cpp:

(WebCore::ApplyStyleCommand::applyInlineStyleToNodeRange):
Check whether the run's start and end are still in the document, as
removeConflictingInlineStyleFromRun() may have removed them.

• editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::apply):
Reverted previous workaround.
(WebCore::ApplyEditCommand::ReentrancyGuard::isRecursiveCall): Deleted.
(WebCore::ApplyEditCommand::ReentrancyGuard::Scope::Scope): Deleted.
(WebCore::ApplyEditCommand::ReentrancyGuard::Scope::~Scope): Deleted.

LayoutTests:
Reviewed by Darin Adler.

• editing/apply-style-iframe-crash-expected.txt:

Rebased test result has one fewer new line.

• platform/mac-wk1/TestExpectations:

Remove test from list of expected failures.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/apply-style-iframe-crash-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/ApplyStyleCommand.cpp (modified) (1 diff)
• Source/WebCore/editing/CompositeEditCommand.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-05-09  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        REGRESSION (r167818): editing/inserting/typing-space-to-trigger-smart-link.html fails on WebKit1 bots
+
+        <https://bugs.webkit.org/show_bug.cgi?id=132207>
+        <rdar://problem/16730393>
+
+        Reviewed by Darin Adler.
+
+        * editing/apply-style-iframe-crash-expected.txt:
+        Rebased test result has one fewer new line.
+        * platform/mac-wk1/TestExpectations:
+        Remove test from list of expected failures.
+
 2014-05-12  Alex Christensen  <achristensen@webkit.org>
 

trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt

@@ -1 @@
-
 
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -15 +15 @@
 
 webkit.org/b/124318 fullscreen/anonymous-block-merge-crash.html [ Pass Failure ]
-
-webkit.org/b/132207 editing/inserting/typing-space-to-trigger-smart-link.html [ Failure ]
 
 ### END OF (1) Failures with bug reports

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-09  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        REGRESSION (r167818): editing/inserting/typing-space-to-trigger-smart-link.html fails on WebKit1 bots
+
+        <https://bugs.webkit.org/show_bug.cgi?id=132207>
+        <rdar://problem/16730393>
+
+        Reverts the previous workaround in favor of a more specific fix for the
+        null dereference.
+
+        Reviewed by Darin Adler.
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::applyInlineStyleToNodeRange):
+        Check whether the run's start and end are still in the document, as
+        removeConflictingInlineStyleFromRun() may have removed them.
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::apply):
+        Reverted previous workaround.
+        (WebCore::ApplyEditCommand::ReentrancyGuard::isRecursiveCall): Deleted.
+        (WebCore::ApplyEditCommand::ReentrancyGuard::Scope::Scope): Deleted.
+        (WebCore::ApplyEditCommand::ReentrancyGuard::Scope::~Scope): Deleted.
+
 2014-05-12  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/editing/ApplyStyleCommand.cpp

@@ -813 +813 @@
     }
 
-    for (size_t i = 0; i < runs.size(); i++) {
-        removeConflictingInlineStyleFromRun(style, runs[i].start, runs[i].end, runs[i].pastEndNode);
-        runs[i].positionForStyleComputation = positionToComputeInlineStyleChange(runs[i].start, runs[i].dummyElement);
+    for (auto& run : runs) {
+        removeConflictingInlineStyleFromRun(style, run.start, run.end, run.pastEndNode);
+        if (run.startAndEndAreStillInDocument())
+            run.positionForStyleComputation = positionToComputeInlineStyleChange(run.start, run.dummyElement);
     }
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -81 +81 @@
 using namespace HTMLNames;
 
-namespace ApplyEditCommand {
-    
-class ReentrancyGuard {
-public:
-    static bool isRecursiveCall() { return s_nestingCounter; }
-
-    class Scope {
-    public:
-        Scope() { ++s_nestingCounter; }
-        ~Scope() { --s_nestingCounter; }
-    };
-    friend class Scope;
-
-private:
-    static unsigned s_nestingCounter;
-};
-unsigned ApplyEditCommand::ReentrancyGuard::s_nestingCounter;
-    
-} // namespace ApplyEditCommand
-
 PassRefPtr<EditCommandComposition> EditCommandComposition::create(Document& document,
     const VisibleSelection& startingSelection, const VisibleSelection& endingSelection, EditAction editAction)
@@ -215 +195 @@
 void CompositeEditCommand::apply()
 {
-    // It's possible to enter this recursively, but legitimate cases of that are rare, and it can cause crashes. As a
-    // temporary fix, guard against recursive calls.
-    // FIXME: <rdar://16701803> Remove this workaround when <rdar://15797536> is fixed.
-    if (ApplyEditCommand::ReentrancyGuard::isRecursiveCall())
-        return;
-
     if (!endingSelection().isContentRichlyEditable()) {
         switch (editingAction()) {
@@ -248 +222 @@
     {
         EventQueueScope eventQueueScope;
-        ApplyEditCommand::ReentrancyGuard::Scope reentrancyGuardScope;
 #if ENABLE(DELETION_UI)
         DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(&frame());