From: justing <justing@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 20 Sep 2006 01:57:03 +0000 (+0000)
Subject: LayoutTests:
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=4fd85a3af8d1fde86f153bba28bb7a8ce8ec5545

LayoutTests:

        Reviewed by eseidel

        Disabling this test temporarily.

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

WebCore:

        Reviewed by eseidel

        Backing out my recent change.

        * css/cssstyleselector.cpp:
        (WebCore::CSSStyleSelector::adjustRenderStyle):



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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f57a9217c427..3bb0e09dc28f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-19  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by eseidel
+        
+        Disabling this test temporarily.
+
+        * editing/selection/editable-links.html: Removed.
+        * editing/selection/editable-links.html-disabled: Added.
+
 2006-09-19  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by harrison
diff --git a/LayoutTests/editing/selection/editable-links.html b/LayoutTests/editing/selection/editable-links.html-disabled
similarity index 100%
rename from LayoutTests/editing/selection/editable-links.html
rename to LayoutTests/editing/selection/editable-links.html-disabled
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7fbb61fa362c..d6e48409e8fd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-19  Justin Garcia  <justin.garcia@apple.com>
+
+        Reviewed by eseidel
+
+        Backing out my recent change.
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::adjustRenderStyle): 
+
 2006-09-19  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Kevin McCullough
diff --git a/WebCore/css/cssstyleselector.cpp b/WebCore/css/cssstyleselector.cpp
index ba93c8207944..658764968f6f 100644
--- a/WebCore/css/cssstyleselector.cpp
+++ b/WebCore/css/cssstyleselector.cpp
@@ -1096,7 +1096,7 @@ void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, Element *e)
     }
 
     // Links should be user selectable when content editable
-    if (e && e->isLink() && (e->isContentEditable() || style->userModify() == READ_WRITE || style->userModify() == READ_WRITE_PLAINTEXT_ONLY))
+    if (e && e->isLink() && (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.