LayoutTests:
authorjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2006 19:20:33 +0000 (19:20 +0000)
committerjusting <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2006 19:20:33 +0000 (19:20 +0000)
        Reviewed by harrison

        * editing/selection/editable-links.html: Added.
        * editing/selection/editable-links.html-disabled: Removed.

WebCore:

        Reviewed by harrison

        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::adjustRenderStyle): Don't call
        HTMLElement::isContentEditable just to check the Frame's editability, since
        it calls updateRenderering, which can get us into infinite recursion.

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

LayoutTests/ChangeLog
LayoutTests/editing/selection/editable-links.html [moved from LayoutTests/editing/selection/editable-links.html-disabled with 100% similarity]
WebCore/ChangeLog
WebCore/css/cssstyleselector.cpp

index 446457a6c906df43f6c5e4ad8871c1ddfd80d0c3..a813b94720d5bd1b9002a2dae07753fa1e3b68bd 100644 (file)
@@ -1,3 +1,10 @@
+2006-09-20  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+
+        * editing/selection/editable-links.html: Added.
+        * editing/selection/editable-links.html-disabled: Removed.
+
 2006-09-20  Adam Roben  <aroben@apple.com>
 
         Reviewed by timothy.
index f72b56d39e8058f0dcaef144138c0c3f30e38187..efe645aed4578d76c65003bbd5a468660e2f3bb0 100644 (file)
@@ -1,4 +1,13 @@
-ope2006-09-20  Brady Eidson  <beidson@apple.com>
+2006-09-20  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by harrison
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::adjustRenderStyle): Don't call 
+        HTMLElement::isContentEditable just to check the Frame's editability, since
+        it calls updateRenderering, which can get us into infinite recursion.
+
+2006-09-20  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Darin
 
index 658764968f6f72eccbac9eef285c575dd55f5548..248573bde18efbdf8946d197bacaf6d9d0a7f214 100644 (file)
@@ -1096,7 +1096,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, Element *e)
     }
 
     // Links should be user selectable when content editable
-    if (e && e->isLink() && (style->userModify() == READ_WRITE || style->userModify() == READ_WRITE_PLAINTEXT_ONLY))
+    if (e && e->isLink() && (e->document()->frame()->isContentEditable() || style->userModify() == READ_WRITE || style->userModify() == READ_WRITE_PLAINTEXT_ONLY))
         style->setUserSelect(SELECT_AUTO);
 
     // Cull out any useless layers and also repeat patterns into additional layers.