Changeset 90290 in webkit

Timestamp:

Jul 1, 2011, 4:02:41 PM (14 years ago)

Author:

adele@apple.com

Message:

../WebCore: WebCore part of fix for ​https://bugs.webkit.org/show_bug.cgi?id=63851
<rdar://problem/8981062> Crash when loading a document in an editable WebView that has a subframe with an unstyled body

Reviewed by Darin Adler.

No new tests. I tried to make a test in DumpRenderTree with an editable WebView,
but was unsuccessful in getting the crash to happen in that instance.

• editing/Editor.cpp: (WebCore::Editor::applyEditingStyleToElement): Add a nil check that exits early, in addition to the ASSERT.

../WebKit/mac: WebKit part of fix for ​https://bugs.webkit.org/show_bug.cgi?id=63851
<rdar://problem/8981062> Crash when loading a document in an editable WebView that has a subframe with an unstyled body

Reviewed by Darin Adler.

• WebView/WebHTMLRepresentation.mm: (-[WebHTMLRepresentation finishedLoadingWithDataSource:]):

Only call applyEditingStyleToBodyElement for the main frame. There's no need to apply break-word,
space, and after-white-space properties to subframes in the editable document.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/Editor.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLRepresentation.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-01  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebCore part of fix for https://bugs.webkit.org/show_bug.cgi?id=63851
+        <rdar://problem/8981062> Crash when loading a document in an editable WebView that has a subframe with an unstyled body
+
+        No new tests.  I tried to make a test in DumpRenderTree with an editable WebView, 
+        but was unsuccessful in getting the crash to happen in that instance.
+
+        * editing/Editor.cpp: (WebCore::Editor::applyEditingStyleToElement): Add a nil check that exits early, in addition to the ASSERT.
+
 2011-07-01  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2884 +2884 @@
     CSSStyleDeclaration* style = element->style();
     ASSERT(style);
+    if (!style)
+        return;
 
     ExceptionCode ec = 0;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2011-07-01  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin Adler.
+
+        WebKit part of fix for https://bugs.webkit.org/show_bug.cgi?id=63851
+        <rdar://problem/8981062> Crash when loading a document in an editable WebView that has a subframe with an unstyled body
+
+        * WebView/WebHTMLRepresentation.mm: (-[WebHTMLRepresentation finishedLoadingWithDataSource:]):
+        Only call applyEditingStyleToBodyElement for the main frame.  There's no need to apply break-word, 
+        space, and after-white-space properties to subframes in the editable document.
+
 2011-07-01  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebHTMLRepresentation.mm

@@ -221 +221 @@
 
     WebView *webView = [webFrame webView];
-    if ([webView isEditable])
+    if ([webView mainFrame] == webFrame && [webView isEditable])
         core(webFrame)->editor()->applyEditingStyleToBodyElement();
 }