Attachment 113014 Details for Bug 71203 – fixes the bug

[patch] fixes the bug

bug-71203-20111030232337.patch (text/plain), 4.65 KB, created by Ryosuke Niwa on 2011-10-30 23:23:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2011-10-30 23:23:38 PDT

Size: 4.65 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 98835)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2011-10-30  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        REGRESSION(r96870): WebKit generates background: transparent on blogger.com
>+        https://bugs.webkit.org/show_bug.cgi?id=71203
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Don't include transparent background color when generating wrapping style for serialization.
>+        Also remove transparent background color from inline style declarations in the pasted content.
>+
>+        Test: editing/pasteboard/merge-paragraphs-with-transparent-background.html
>+
>+        * editing/EditingStyle.cpp:
>+        (WebCore::EditingStyle::wrappingStyleForSerialization):
>+        (WebCore::EditingStyle::removeStyleFromRulesAndContext):
>+
> 2011-10-29  Martin Robinson  <mrobinson@igalia.com>
> 
>         [GTK] Switch to a backing store approach for painting WebKitWebView
>Index: Source/WebCore/editing/EditingStyle.cpp
>===================================================================
>--- Source/WebCore/editing/EditingStyle.cpp	(revision 98832)
>+++ Source/WebCore/editing/EditingStyle.cpp	(working copy)
>@@ -962,6 +962,9 @@ PassRefPtr<EditingStyle> EditingStyle::w
>         }
>     }
> 
>+    if (wrappingStyle->m_mutableStyle && hasTransparentBackgroundColor(wrappingStyle->m_mutableStyle.get()))
>+        wrappingStyle->m_mutableStyle->removeProperty(CSSPropertyBackgroundColor);
>+
>     return wrappingStyle.release();
> }
> 
>@@ -1085,6 +1088,10 @@ void EditingStyle::removeStyleFromRulesA
>         if (!styleFromMatchedRules->getPropertyCSSValue(CSSPropertyFloat) && getIdentifierValue(m_mutableStyle.get(), CSSPropertyFloat) == CSSValueNone)
>             m_mutableStyle->removeProperty(CSSPropertyFloat);
>     }
>+
>+    // 4. Remove transparent background color
>+    if (m_mutableStyle && hasTransparentBackgroundColor(m_mutableStyle.get()))
>+        m_mutableStyle->removeProperty(CSSPropertyBackgroundColor);
> }
> 
> void EditingStyle::removePropertiesInElementDefaultStyle(Element* element)
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 98835)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2011-10-30  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        REGRESSION(r96870): WebKit generates background: transparent on blogger.com
>+        https://bugs.webkit.org/show_bug.cgi?id=71203
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * editing/pasteboard/merge-paragraphs-with-transparent-background-expected.txt: Added.
>+        * editing/pasteboard/merge-paragraphs-with-transparent-background.html: Added.
>+
> 2011-10-30  Yuta Kitamura  <yutak@chromium.org>
> 
>         WebSocket: iframe in reload-crash.html reloads forever
>Index: LayoutTests/editing/pasteboard/merge-paragraphs-with-transparent-background-expected.txt
>===================================================================
>--- LayoutTests/editing/pasteboard/merge-paragraphs-with-transparent-background-expected.txt	(revision 0)
>+++ LayoutTests/editing/pasteboard/merge-paragraphs-with-transparent-background-expected.txt	(revision 0)
>@@ -0,0 +1,10 @@
>+This tests merging paragraphs inside a document with background: transparent in html element's inline style declaration.
>+WebKit should not generate a span with background-color property in such cases.
>+| "
>+"
>+| <p>
>+|   id="destination"
>+|   "hello<#selection-caret>"
>+|   "world"
>+| "
>+"
>Index: LayoutTests/editing/pasteboard/merge-paragraphs-with-transparent-background.html
>===================================================================
>--- LayoutTests/editing/pasteboard/merge-paragraphs-with-transparent-background.html	(revision 0)
>+++ LayoutTests/editing/pasteboard/merge-paragraphs-with-transparent-background.html	(revision 0)
>@@ -0,0 +1,24 @@
>+<!DOCTYPE html>
>+<html style="background: transparent; text-decoration: none">
>+<body>
>+<p id="description">This tests merging paragraphs inside a document with background: transparent in html element's inline style declaration.
>+WebKit should not generate a span with background-color property in such cases.</p>
>+<div id="container" contenteditable>
>+<p id="destination">hello</p>
>+<p id="target">world</p>
>+</div>
>+<script src="../../resources/dump-as-markup.js"></script>
>+<script>
>+
>+Markup.description(document.getElementById('description').textContent);
>+
>+document.getElementById('container').focus();
>+var target = document.getElementById('target');
>+getSelection().collapse(target, 0);
>+document.execCommand('Delete', false, null);
>+
>+Markup.dump(document.getElementById('container'));
>+
>+</script>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 71203: 113011 | 113014 | 113089