2006-03-01 Eric Seidel <eseidel@apple.com>

        Reviewed by justing.

       Update ESelectionGranulartiy enum to use newer CamelCase styling.

        * bridge/mac/WebCoreFrameBridge.mm:
        (-[WebCoreFrameBridge alterCurrentSelection:direction:granularity:]):
        * editing/Selection.cpp:
        (WebCore::Selection::Selection):
        (WebCore::Selection::validate):
        * editing/SelectionController.cpp:
        (WebCore::SelectionController::modifyExtendingRightForward):
        (WebCore::SelectionController::modifyMovingRightForward):
        (WebCore::SelectionController::modifyExtendingLeftBackward):
        (WebCore::SelectionController::modifyMovingLeftBackward):
        (WebCore::SelectionController::modify):
        * editing/TypingCommand.cpp:
        (WebCore::TypingCommand::deleteKeyPressed):
        (WebCore::TypingCommand::forwardDeleteKeyPressed):
        * editing/jsediting.cpp:
        * editing/text_granularity.h:
        (WebCore::):
        * page/Frame.cpp:
        (WebCore::Frame::selectClosestWordFromMouseEvent):
        (WebCore::Frame::handleMousePressEventTripleClick):
        (WebCore::Frame::handleMousePressEventSingleClick):
        (WebCore::Frame::handleMouseMoveEventSelection):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c02c748dac86b0540b3f1c11e048cfed545f3e65..c5563e6abe1d79b663b6931f9416750d65ea87c1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,32 @@
+2006-03-01  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by justing.
+
+       Update ESelectionGranulartiy enum to use newer CamelCase styling.
+
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (-[WebCoreFrameBridge alterCurrentSelection:direction:granularity:]):
+        * editing/Selection.cpp:
+        (WebCore::Selection::Selection):
+        (WebCore::Selection::validate):
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::modifyExtendingRightForward):
+        (WebCore::SelectionController::modifyMovingRightForward):
+        (WebCore::SelectionController::modifyExtendingLeftBackward):
+        (WebCore::SelectionController::modifyMovingLeftBackward):
+        (WebCore::SelectionController::modify):
+        * editing/TypingCommand.cpp:
+        (WebCore::TypingCommand::deleteKeyPressed):
+        (WebCore::TypingCommand::forwardDeleteKeyPressed):
+        * editing/jsediting.cpp:
+        * editing/text_granularity.h:
+        (WebCore::):
+        * page/Frame.cpp:
+        (WebCore::Frame::selectClosestWordFromMouseEvent):
+        (WebCore::Frame::handleMousePressEventTripleClick):
+        (WebCore::Frame::handleMousePressEventSingleClick):
+        (WebCore::Frame::handleMouseMoveEventSelection):
+
 2006-03-01  Alexander Kellett  <lypanov@kde.org>
 
         Reviewed by Maciej.

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.mm b/WebCore/bridge/mac/WebCoreFrameBridge.mm
index ebff35dc807ad2a679814c973ff986bf4a7b3a39..8ab4127cd8bc1934ca67fa9fd3829a44d1f61c64 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.mm
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.mm
@@ -1767,7 +1767,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
     // to preserve smart delete behavior when extending by word.  e.g. double-click,
     // then shift-option-rightarrow, then delete needs to smart delete, per TextEdit.
     if (!((alteration == WebSelectByExtending) &&
-          (granularity == WebBridgeSelectByWord) && (m_frame->selectionGranularity() == WORD)))
+          (granularity == WebBridgeSelectByWord) && (m_frame->selectionGranularity() == WordGranularity)))
         m_frame->setSelectionGranularity(static_cast<ETextGranularity>(WebBridgeSelectByCharacter));
     
     // restore vertical navigation x position if necessary

diff --git a/WebCore/editing/Selection.cpp b/WebCore/editing/Selection.cpp
index aaf15344ad54ee944124d9cf8fd2945a1bbe6932..058113c1a0f6f64b145159aca9a1aafd4cd6d0fa 100644 (file)
--- a/WebCore/editing/Selection.cpp
+++ b/WebCore/editing/Selection.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
 
 Selection::Selection()
     : m_affinity(DOWNSTREAM)
-    , m_granularity(CHARACTER)
+    , m_granularity(CharacterGranularity)
     , m_state(NONE)
     , m_baseIsFirst(true)
 {
@@ -46,7 +46,7 @@ Selection::Selection()
 Selection::Selection(const Position &pos, EAffinity affinity)
     : m_base(pos), m_extent(pos)
     , m_affinity(affinity)
-    , m_granularity(CHARACTER)
+    , m_granularity(CharacterGranularity)
     , m_state(NONE)
     , m_baseIsFirst(true)
 {
@@ -56,7 +56,7 @@ Selection::Selection(const Position &pos, EAffinity affinity)
 Selection::Selection(const Position &base, const Position &extent, EAffinity affinity)
     : m_base(base), m_extent(extent)
     , m_affinity(affinity)
-    , m_granularity(CHARACTER)
+    , m_granularity(CharacterGranularity)
     , m_state(NONE)
     , m_baseIsFirst(true)
 {
@@ -184,10 +184,10 @@ void Selection::validate()
     
     // Expand the selection if requested.
     switch (m_granularity) {
-        case CHARACTER:
+        case CharacterGranularity:
             // Don't do any expansion.
             break;
-        case WORD: {
+        case WordGranularity: {
             // General case: Select the word the caret is positioned inside of, or at the start of (RightWordIfOnBoundary).
             // Edge case: If the caret is after the last word in a soft-wrapped line or the last word in
             // the document, select that last word (LeftWordIfOnBoundary).
@@ -206,7 +206,7 @@ void Selection::validate()
             
             break;
             }
-        case LINE: {
+        case LineGranularity: {
             m_start = startOfLine(VisiblePosition(m_start, m_affinity)).deepEquivalent();
             VisiblePosition end = endOfLine(VisiblePosition(m_end, m_affinity));
             // If the end of this line is at the end of a paragraph, include the space 
@@ -224,7 +224,7 @@ void Selection::validate()
             m_end = endOfLine(VisiblePosition(m_end, m_affinity)).deepEquivalent();
             break;
         }
-        case PARAGRAPH: {
+        case ParagraphGranularity: {
             VisiblePosition pos(m_start, m_affinity);
             if (isStartOfLine(pos) && isEndOfDocument(pos))
                 pos = pos.previous();

diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp
index ecf5107ea9d1f6b6d708bb9d1dec64dc6d0c1f41..0a463c447f354d59f5e552d484dc243f1f58fa87 100644 (file)
--- a/WebCore/editing/SelectionController.cpp
+++ b/WebCore/editing/SelectionController.cpp
@@ -281,22 +281,22 @@ VisiblePosition SelectionController::modifyExtendingRightForward(ETextGranularit
 {
     VisiblePosition pos(m_sel.extent(), m_sel.affinity());
     switch (granularity) {
-        case CHARACTER:
+        case CharacterGranularity:
             if (isLastVisiblePositionBeforeTableElement(pos.deepEquivalent()))
                 pos = VisiblePosition(positionAfterFollowingTableElement(pos.deepEquivalent()), VP_DEFAULT_AFFINITY);
             else
                 pos = pos.next();
             break;
-        case WORD:
+        case WordGranularity:
             if (isLastVisiblePositionBeforeTableElement(pos.deepEquivalent()))
                 pos = VisiblePosition(positionAfterFollowingTableElement(pos.deepEquivalent()), VP_DEFAULT_AFFINITY);
             else
                 pos = nextWordPosition(pos);
             break;
-        case PARAGRAPH:
+        case ParagraphGranularity:
             pos = nextParagraphPosition(pos, xPosForVerticalArrowNavigation(EXTENT));
             break;
-        case LINE:
+        case LineGranularity:
             pos = nextLinePosition(pos, xPosForVerticalArrowNavigation(EXTENT));
             break;
         case LINE_BOUNDARY:
@@ -317,19 +317,19 @@ VisiblePosition SelectionController::modifyMovingRightForward(ETextGranularity g
 {
     VisiblePosition pos;
     switch (granularity) {
-        case CHARACTER:
+        case CharacterGranularity:
             if (isRange()) 
                 pos = VisiblePosition(m_sel.end(), m_sel.affinity());
             else
                 pos = VisiblePosition(m_sel.extent(), m_sel.affinity()).next();
             break;
-        case WORD:
+        case WordGranularity:
             pos = nextWordPosition(VisiblePosition(m_sel.extent(), m_sel.affinity()));
             break;
-        case PARAGRAPH:
+        case ParagraphGranularity:
             pos = nextParagraphPosition(VisiblePosition(m_sel.end(), m_sel.affinity()), xPosForVerticalArrowNavigation(END, isRange()));
             break;
-        case LINE: {
+        case LineGranularity: {
             // down-arrowing from a range selection that ends at the start of a line needs
             // to leave the selection at that line start (no need to call nextLinePosition!)
             pos = VisiblePosition(m_sel.end(), m_sel.affinity());
@@ -359,22 +359,22 @@ VisiblePosition SelectionController::modifyExtendingLeftBackward(ETextGranularit
     // It was done here instead of in VisiblePosition because we want VPs to iterate
     // over everything.
     switch (granularity) {
-        case CHARACTER:
+        case CharacterGranularity:
             if (isFirstVisiblePositionAfterTableElement(pos.deepEquivalent()))
                 pos = VisiblePosition(positionBeforePrecedingTableElement(pos.deepEquivalent()), VP_DEFAULT_AFFINITY);
             else
                 pos = pos.previous();
             break;
-        case WORD:
+        case WordGranularity:
             if (isFirstVisiblePositionAfterTableElement(pos.deepEquivalent()))
                 pos = VisiblePosition(positionBeforePrecedingTableElement(pos.deepEquivalent()), VP_DEFAULT_AFFINITY);
             else
                 pos = previousWordPosition(pos);
             break;
-        case PARAGRAPH:
+        case ParagraphGranularity:
             pos = previousParagraphPosition(pos, xPosForVerticalArrowNavigation(EXTENT));
             break;
-        case LINE:
+        case LineGranularity:
             pos = previousLinePosition(pos, xPosForVerticalArrowNavigation(EXTENT));
             break;
         case LINE_BOUNDARY:
@@ -394,19 +394,19 @@ VisiblePosition SelectionController::modifyMovingLeftBackward(ETextGranularity g
 {
     VisiblePosition pos;
     switch (granularity) {
-        case CHARACTER:
+        case CharacterGranularity:
             if (isRange()) 
                 pos = VisiblePosition(m_sel.start(), m_sel.affinity());
             else
                 pos = VisiblePosition(m_sel.extent(), m_sel.affinity()).previous();
             break;
-        case WORD:
+        case WordGranularity:
             pos = previousWordPosition(VisiblePosition(m_sel.extent(), m_sel.affinity()));
             break;
-        case PARAGRAPH:
+        case ParagraphGranularity:
             pos = previousParagraphPosition(VisiblePosition(m_sel.start(), m_sel.affinity()), xPosForVerticalArrowNavigation(START, isRange()));
             break;
-        case LINE:
+        case LineGranularity:
             pos = previousLinePosition(VisiblePosition(m_sel.start(), m_sel.affinity()), xPosForVerticalArrowNavigation(START, isRange()));
             break;
         case LINE_BOUNDARY:
@@ -449,13 +449,13 @@ bool SelectionController::modify(const DOMString &alterString, const DOMString &
     DOMString granularityStringLower = granularityString.lower();
     ETextGranularity granularity;
     if (granularityStringLower == "character")
-        granularity = CHARACTER;
+        granularity = CharacterGranularity;
     else if (granularityStringLower == "word")
-        granularity = WORD;
+        granularity = WordGranularity;
     else if (granularityStringLower == "line")
-        granularity = LINE;
+        granularity = LineGranularity;
     else if (granularityStringLower == "paragraph")
-        granularity = PARAGRAPH;
+        granularity = ParagraphGranularity;
     else
         return false;
                 

diff --git a/WebCore/editing/TypingCommand.cpp b/WebCore/editing/TypingCommand.cpp
index 33a38a38bcee55631446687f1c8deef0bb6471bd..85aa7fde0e1f5951a8e7efcb8b4b6d824ba46aed 100644 (file)
--- a/WebCore/editing/TypingCommand.cpp
+++ b/WebCore/editing/TypingCommand.cpp
@@ -316,7 +316,7 @@ void TypingCommand::deleteKeyPressed()
             // Do nothing in the case that the caret is at the start of a
             // root editable element or at the start of a document.
             SelectionController sc = SelectionController(endingSelection().start(), endingSelection().end(), SEL_DEFAULT_AFFINITY);
-            sc.modify(SelectionController::EXTEND, SelectionController::BACKWARD, CHARACTER);
+            sc.modify(SelectionController::EXTEND, SelectionController::BACKWARD, CharacterGranularity);
             selectionToDelete = sc.selection();
             break;
         }
@@ -345,7 +345,7 @@ void TypingCommand::forwardDeleteKeyPressed()
             // Do nothing in the case that the caret is at the start of a
             // root editable element or at the start of a document.
             SelectionController sc = SelectionController(endingSelection().start(), endingSelection().end(), SEL_DEFAULT_AFFINITY);
-            sc.modify(SelectionController::EXTEND, SelectionController::FORWARD, CHARACTER);
+            sc.modify(SelectionController::EXTEND, SelectionController::FORWARD, CharacterGranularity);
             selectionToDelete = sc.selection();
             break;
         }

diff --git a/WebCore/editing/jsediting.cpp b/WebCore/editing/jsediting.cpp
index 6aa83713d67b41842c9e8a33b4bfa14271be9f82..e6aaad391250a390e59f9ba9a8ee01b61d59280f 100644 (file)
--- a/WebCore/editing/jsediting.cpp
+++ b/WebCore/editing/jsediting.cpp
@@ -204,7 +204,7 @@ bool execCut(Frame *frame, bool userInterface, const DOMString &value)
 
 bool execDelete(Frame *frame, bool userInterface, const DOMString &value)
 {
-    TypingCommand::deleteKeyPressed(frame->document(), frame->selectionGranularity() == khtml::WORD);
+    TypingCommand::deleteKeyPressed(frame->document(), frame->selectionGranularity() == WordGranularity);
     return true;
 }
 

diff --git a/WebCore/editing/text_granularity.h b/WebCore/editing/text_granularity.h
index 5f051cc14a7eb2bace3aa3f5b4c5ec5101034f69..1e3a34a67c8428fc52f9d7b0937e49d2178bc0b5 100644 (file)
--- a/WebCore/editing/text_granularity.h
+++ b/WebCore/editing/text_granularity.h
@@ -23,14 +23,22 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef KHTML_EDITING_TEXT_GRANULARITY_H
-#define KHTML_EDITING_TEXT_GRANULARITY_H
+#ifndef EDITING_TEXT_GRANULARITY_H
+#define EDITING_TEXT_GRANULARITY_H
 
-namespace khtml {
+namespace WebCore {
 
 // FIXME: This really should be broken up into more than one concept.
 // Frame doesn't neeed the 3 boundaries in this enum.
-enum ETextGranularity { CHARACTER, WORD, LINE, PARAGRAPH, LINE_BOUNDARY, PARAGRAPH_BOUNDARY, DOCUMENT_BOUNDARY };
+enum ETextGranularity {
+    CharacterGranularity,
+    WordGranularity,
+    LineGranularity,
+    ParagraphGranularity,
+    LINE_BOUNDARY,
+    PARAGRAPH_BOUNDARY,
+    DOCUMENT_BOUNDARY
+};
 
 }
 

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 5580f3c3b0d4fd9756fe52c7e8cfec4c0cdf98a8..c1f768e8218f7244d93312c69d67de0e4654041f 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -1741,12 +1741,12 @@ void Frame::selectClosestWordFromMouseEvent(MouseEvent *mouse, NodeImpl *innerNo
         VisiblePosition pos(innerNode->renderer()->positionForCoordinates(x, y));
         if (pos.isNotNull()) {
             selection.moveTo(pos);
-            selection.expandUsingGranularity(WORD);
+            selection.expandUsingGranularity(WordGranularity);
         }
     }
     
     if (selection.isRange()) {
-        d->m_selectionGranularity = WORD;
+        d->m_selectionGranularity = WordGranularity;
         d->m_beganSelectingText = true;
     }
     
@@ -1785,10 +1785,10 @@ void Frame::handleMousePressEventTripleClick(MouseEventWithHitTestResults* event
         VisiblePosition pos(innerNode->renderer()->positionForCoordinates(x, y));
         if (pos.isNotNull()) {
             selection.moveTo(pos);
-            selection.expandUsingGranularity(PARAGRAPH);
+            selection.expandUsingGranularity(ParagraphGranularity);
         }
         if (selection.isRange()) {
-            d->m_selectionGranularity = PARAGRAPH;
+            d->m_selectionGranularity = ParagraphGranularity;
             d->m_beganSelectingText = true;
         }
         
@@ -1836,13 +1836,13 @@ void Frame::handleMousePressEventSingleClick(MouseEventWithHitTestResults* event
                     sel.setBaseAndExtent(start.node(), start.offset(), pos.node(), pos.offset());
                 }
 
-                if (d->m_selectionGranularity != CHARACTER) {
+                if (d->m_selectionGranularity != CharacterGranularity) {
                     sel.expandUsingGranularity(d->m_selectionGranularity);
                 }
                 d->m_beganSelectingText = true;
             } else {
                 sel = SelectionController(visiblePos);
-                d->m_selectionGranularity = CHARACTER;
+                d->m_selectionGranularity = CharacterGranularity;
             }
             
             if (shouldChangeSelection(sel))
@@ -1915,7 +1915,7 @@ void Frame::handleMouseMoveEventSelection(MouseEventWithHitTestResults* event)
     }
 
     sel.setExtent(pos);
-    if (d->m_selectionGranularity != CHARACTER)
+    if (d->m_selectionGranularity != CharacterGranularity)
         sel.expandUsingGranularity(d->m_selectionGranularity);
 
     if (shouldChangeSelection(sel))