Get rid of Position::computedStyle

https://bugs.webkit.org/show_bug.cgi?id=117024

Reviewed by Andreas Kling.

Removed the function.

* dom/Position.cpp:
* dom/Position.h:
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::positionToComputeInlineStyleChange): We need a position
inside the dummy element since we'll get the containing element's style instead
if we had the position before the dummy element.
* editing/EditingStyle.cpp:
(WebCore::StyleChange::StyleChange):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 808d458ff9f361daf7aedceb044197be3881a778..5ec545d488359fbd53651b061293a57048264247 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2013-05-30  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Get rid of Position::computedStyle
+        https://bugs.webkit.org/show_bug.cgi?id=117024
+
+        Reviewed by Andreas Kling.
+
+        Removed the function.
+
+        * dom/Position.cpp:
+        * dom/Position.h:
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::positionToComputeInlineStyleChange): We need a position
+        inside the dummy element since we'll get the containing element's style instead
+        if we had the position before the dummy element.
+        * editing/EditingStyle.cpp:
+        (WebCore::StyleChange::StyleChange):
+
 2013-05-30  Seokju Kwon  <seokju.kwon@gmail.com>
 
         Remove obsolete forward declaration from InspectorFrontendHost.h

diff --git a/Source/WebCore/dom/Position.cpp b/Source/WebCore/dom/Position.cpp
index 91326404a9c49b41257eb7e2330cfa0951f99c45..84bf042540afcbe8de210398d6ce8426fe7e795d 100644 (file)
--- a/Source/WebCore/dom/Position.cpp
+++ b/Source/WebCore/dom/Position.cpp
@@ -303,14 +303,6 @@ Element* Position::element() const
     return toElement(n);
 }
 
-PassRefPtr<CSSComputedStyleDeclaration> Position::computedStyle() const
-{
-    Element* elem = element();
-    if (!elem)
-        return 0;
-    return CSSComputedStyleDeclaration::create(elem);
-}
-
 Position Position::previous(PositionMoveType moveType) const
 {
     Node* n = deprecatedNode();

diff --git a/Source/WebCore/dom/Position.h b/Source/WebCore/dom/Position.h
index fa2aba721e6db28ca3a80221213893af20703b8b..d8ecd985699a952c59a61ee08ba629597fa2e3da 100644 (file)
--- a/Source/WebCore/dom/Position.h
+++ b/Source/WebCore/dom/Position.h
@@ -144,7 +144,6 @@ public:
     bool isOrphan() const { return m_anchorNode && !m_anchorNode->inDocument(); }
 
     Element* element() const;
-    PassRefPtr<CSSComputedStyleDeclaration> computedStyle() const;
 
     // Move up or down the DOM by one position.
     // Offsets are computed using render text for nodes that have renderers - but note that even when

diff --git a/Source/WebCore/editing/ApplyStyleCommand.cpp b/Source/WebCore/editing/ApplyStyleCommand.cpp
index 75b7cd57f3290e88354af411a664b492f156fce8..5cec38a7fd511978a1a3bddffab0617d890ea8b0 100644 (file)
--- a/Source/WebCore/editing/ApplyStyleCommand.cpp
+++ b/Source/WebCore/editing/ApplyStyleCommand.cpp
@@ -1409,11 +1409,10 @@ void ApplyStyleCommand::addInlineStyleIfNeeded(EditingStyle* style, PassRefPtr<N
 Position ApplyStyleCommand::positionToComputeInlineStyleChange(PassRefPtr<Node> startNode, RefPtr<Node>& dummyElement)
 {
     // It's okay to obtain the style at the startNode because we've removed all relevant styles from the current run.
-    Position positionForStyleComparison;
     if (!startNode->isElementNode()) {
         dummyElement = createStyleSpanElement(document());
         insertNodeAt(dummyElement, positionBeforeNode(startNode.get()));
-        return positionBeforeNode(dummyElement.get());
+        return firstPositionInOrBeforeNode(dummyElement.get());
     }
 
     return firstPositionInOrBeforeNode(startNode.get());

diff --git a/Source/WebCore/editing/EditingStyle.cpp b/Source/WebCore/editing/EditingStyle.cpp
index 3ffdd812f4d6ab5600acb6543b6da457d4f5ce3a..9747446e09a534fb06fc5f573d944f201d1ed29d 100644 (file)
--- a/Source/WebCore/editing/EditingStyle.cpp
+++ b/Source/WebCore/editing/EditingStyle.cpp
@@ -1338,7 +1338,12 @@ StyleChange::StyleChange(EditingStyle* style, const Position& position)
     if (!style || !style->style() || !document || !document->frame())
         return;
 
-    RefPtr<CSSComputedStyleDeclaration> computedStyle = position.computedStyle();
+    Node* node = position.containerNode();
+    if (!node)
+        return;
+
+    RefPtr<CSSComputedStyleDeclaration> computedStyle = CSSComputedStyleDeclaration::create(node);
+
     // FIXME: take care of background-color in effect
     RefPtr<MutableStylePropertySet> mutableStyle = getPropertiesNotIn(style->style(), computedStyle.get());