Changeset 109529 in webkit

Timestamp:

Mar 2, 2012 1:20:39 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Implement DefaultParagraphSeparator execCommand, to let authors choose the default block element
​https://bugs.webkit.org/show_bug.cgi?id=59961

Patch by Pablo Flouret <​pablof@motorola.com> on 2012-03-02
Reviewed by Ryosuke Niwa.

Source/WebCore:

​http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#the-defaultparagraphseparator-command

Test: editing/execCommand/default-paragraph-separator.html

• editing/Editor.cpp:

(WebCore::Editor::Editor):

• editing/Editor.h:

(WebCore::Editor::defaultParagraphSeparator):
(WebCore::Editor::setDefaultParagraphSeparator):
(Editor):

• editing/EditorCommand.cpp:

(WebCore::executeDefaultParagraphSeparator):
(WebCore):
(WebCore::valueDefaultParagraphSeparator):
(WebCore::createCommandMap):

• editing/htmlediting.cpp:

(WebCore::createDefaultParagraphElement):

• html/HTMLParagraphElement.cpp:

(WebCore::HTMLParagraphElement::create):
(WebCore):

• html/HTMLParagraphElement.h:

(HTMLParagraphElement):

Added create(Document*) method that defaults to pTag as the QualifiedName.

LayoutTests:

• editing/execCommand/default-paragraph-separator-expected.txt: Added.
• editing/execCommand/default-paragraph-separator.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/default-paragraph-separator-expected.txt (added)
• LayoutTests/editing/execCommand/default-paragraph-separator.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/Editor.cpp (modified) (1 diff)
• Source/WebCore/editing/Editor.h (modified) (3 diffs)
• Source/WebCore/editing/EditorCommand.cpp (modified) (3 diffs)
• Source/WebCore/editing/htmlediting.cpp (modified) (3 diffs)
• Source/WebCore/html/HTMLParagraphElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLParagraphElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-02  Pablo Flouret  <pablof@motorola.com>
+
+        Implement DefaultParagraphSeparator execCommand, to let authors choose the default block element
+        https://bugs.webkit.org/show_bug.cgi?id=59961
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/execCommand/default-paragraph-separator-expected.txt: Added.
+        * editing/execCommand/default-paragraph-separator.html: Added.
+
 2012-03-02  Mike Lawther  <mikelawther@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Pablo Flouret  <pablof@motorola.com>
+
+        Implement DefaultParagraphSeparator execCommand, to let authors choose the default block element
+        https://bugs.webkit.org/show_bug.cgi?id=59961
+
+        Reviewed by Ryosuke Niwa.
+
+        http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#the-defaultparagraphseparator-command
+
+        Test: editing/execCommand/default-paragraph-separator.html
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::Editor):
+        * editing/Editor.h:
+        (WebCore::Editor::defaultParagraphSeparator):
+        (WebCore::Editor::setDefaultParagraphSeparator):
+        (Editor):
+        * editing/EditorCommand.cpp:
+        (WebCore::executeDefaultParagraphSeparator):
+        (WebCore):
+        (WebCore::valueDefaultParagraphSeparator):
+        (WebCore::createCommandMap):
+        * editing/htmlediting.cpp:
+        (WebCore::createDefaultParagraphElement):
+
+        * html/HTMLParagraphElement.cpp:
+        (WebCore::HTMLParagraphElement::create):
+        (WebCore):
+        * html/HTMLParagraphElement.h:
+        (HTMLParagraphElement):
+            Added create(Document*) method that defaults to pTag as the QualifiedName.
+
 2012-03-02  Kenneth Russell  <kbr@google.com>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -847 +847 @@
     , m_spellingCorrector(adoptPtr(new SpellingCorrectionController(frame)))
     , m_areMarkedTextMatchesHighlighted(false)
+    , m_defaultParagraphSeparator(EditorParagraphSeparatorIsDiv)
 {
 }

trunk/Source/WebCore/editing/Editor.h

@@ -81 +81 @@
 
 enum EditorCommandSource { CommandFromMenuOrKeyBinding, CommandFromDOM, CommandFromDOMWithUserInterface };
+enum EditorParagraphSeparator { EditorParagraphSeparatorIsDiv, EditorParagraphSeparatorIsP };
 
 class Editor {
@@ -384 +385 @@
     void deviceScaleFactorChanged();
 
+    EditorParagraphSeparator defaultParagraphSeparator() const { return m_defaultParagraphSeparator; }
+    void setDefaultParagraphSeparator(EditorParagraphSeparator separator) { m_defaultParagraphSeparator = separator; }
+
 private:
     Frame* m_frame;
@@ -401 +405 @@
     VisibleSelection m_mark;
     bool m_areMarkedTextMatchesHighlighted;
+    EditorParagraphSeparator m_defaultParagraphSeparator;
 
     bool canDeleteRange(Range*) const;

trunk/Source/WebCore/editing/EditorCommand.cpp

@@ -308 +308 @@
 }
 
+static bool executeDefaultParagraphSeparator(Frame* frame, Event*, EditorCommandSource, const String& value)
+{
+    if (equalIgnoringCase(value, "div"))
+        frame->editor()->setDefaultParagraphSeparator(EditorParagraphSeparatorIsDiv);
+    else if (equalIgnoringCase(value, "p"))
+        frame->editor()->setDefaultParagraphSeparator(EditorParagraphSeparatorIsP);
+
+    return true;
+}
+
 static bool executeDelete(Frame* frame, Event*, EditorCommandSource source, const String&)
 {
@@ -1379 +1389 @@
 }
 
+static String valueDefaultParagraphSeparator(Frame* frame, Event*)
+{
+    switch (frame->editor()->defaultParagraphSeparator()) {
+    case EditorParagraphSeparatorIsDiv:
+        return divTag.localName();
+    case EditorParagraphSeparatorIsP:
+        return pTag.localName();
+    }
+
+    ASSERT_NOT_REACHED();
+    return String();
+}
+
 static String valueFontName(Frame* frame, Event*)
 {
@@ -1430 +1453 @@
         { "CreateLink", { executeCreateLink, supported, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "Cut", { executeCut, supportedCopyCut, enabledCut, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
+        { "DefaultParagraphSeparator", { executeDefaultParagraphSeparator, supported, enabled, stateNone, valueDefaultParagraphSeparator, notTextInsertion, doNotAllowExecutionWhenDisabled} },
         { "Delete", { executeDelete, supported, enabledDelete, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
         { "DeleteBackward", { executeDeleteBackward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -30 +30 @@
 #include "Document.h"
 #include "EditingText.h"
+#include "Editor.h"
+#include "Frame.h"
 #include "HTMLBRElement.h"
 #include "HTMLDivElement.h"
@@ -39 +41 @@
 #include "HTMLObjectElement.h"
 #include "HTMLOListElement.h"
+#include "HTMLParagraphElement.h"
 #include "HTMLUListElement.h"
 #include "PositionIterator.h"
@@ -845 +848 @@
 PassRefPtr<HTMLElement> createDefaultParagraphElement(Document* document)
 {
-    return HTMLDivElement::create(document);
+    switch (document->frame()->editor()->defaultParagraphSeparator()) {
+    case EditorParagraphSeparatorIsDiv:
+        return HTMLDivElement::create(document);
+    case EditorParagraphSeparatorIsP:
+        return HTMLParagraphElement::create(document);
+    }
+
+    ASSERT_NOT_REACHED();
+    return 0;
 }
 

trunk/Source/WebCore/html/HTMLParagraphElement.cpp

@@ -40 +40 @@
 }
 
+PassRefPtr<HTMLParagraphElement> HTMLParagraphElement::create(Document* document)
+{
+    return adoptRef(new HTMLParagraphElement(pTag, document));
+}
+
 PassRefPtr<HTMLParagraphElement> HTMLParagraphElement::create(const QualifiedName& tagName, Document* document)
 {

trunk/Source/WebCore/html/HTMLParagraphElement.h

@@ -30 +30 @@
 class HTMLParagraphElement : public HTMLElement {
 public:
+    static PassRefPtr<HTMLParagraphElement> create(Document*);
     static PassRefPtr<HTMLParagraphElement> create(const QualifiedName&, Document*);