Commit c98a54f5 authored by andersca's avatar andersca

Reviewed by Tim.

        * editing/markup.cpp:
        (WebCore::createMarkup):
        Add null-checks for the frame, it might not exist for all documents.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17817 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b2aa0fc0
2006-11-16 Anders Carlsson <acarlsson@apple.com>
Reviewed by Tim.
* editing/markup.cpp:
(WebCore::createMarkup):
Add null-checks for the frame, it might not exist for all documents.
2006-11-16 Don Gibson <dgibson77@gmail.com>
Reviewed and landed by ap.
......@@ -547,10 +547,12 @@ DeprecatedString createMarkup(const Node* node, EChildrenOnly includeChildren,
{
ASSERT(annotate == DoNotAnnotateForInterchange); // annotation not yet implemented for this code path
// disable the delete button so it's elements are not serialized into the markup
node->document()->frame()->editor()->deleteButtonController()->disable();
if (node->document()->frame())
node->document()->frame()->editor()->deleteButtonController()->disable();
node->document()->updateLayoutIgnorePendingStylesheets();
DeprecatedString result(markup(const_cast<Node*>(node), includeChildren, false, nodes));
node->document()->frame()->editor()->deleteButtonController()->enable();
if (node->document()->frame())
node->document()->frame()->editor()->deleteButtonController()->enable();
return result;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment