Bug 103060 - Merge EditingText into Text
Summary: Merge EditingText into Text
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: HTML Editing (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-11-22 05:38 PST by Antti Koivisto
Modified: 2012-11-22 09:35 PST (History)
11 users (show)

See Also:


Attachments
patch (28.59 KB, patch)
2012-11-22 06:26 PST, Antti Koivisto
no flags Details | Formatted Diff | Diff
patch 2 (22.81 KB, patch)
2012-11-22 06:48 PST, Antti Koivisto
rniwa: review+
buildbot: commit-queue-
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Antti Koivisto 2012-11-22 05:38:06 PST
EditingText is a Text that always creates a renderer. It can be replaced by a bit.
Comment 1 Antti Koivisto 2012-11-22 06:26:01 PST
Created attachment 175661 [details]
patch
Comment 2 Antti Koivisto 2012-11-22 06:48:31 PST
Created attachment 175666 [details]
patch 2
Comment 3 WebKit Review Bot 2012-11-22 06:50:39 PST
Attachment 175666 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/CMakeLists.txt', u'Source/W..." exit_code: 1
Source/WebCore/editing/ReplaceSelectionCommand.cpp:55:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 13 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 4 Build Bot 2012-11-22 07:35:02 PST
Comment on attachment 175666 [details]
patch 2

Attachment 175666 [details] did not pass win-ews (win):
Output: http://queues.webkit.org/results/14960372
Comment 5 Ryosuke Niwa 2012-11-22 08:40:58 PST
Comment on attachment 175666 [details]
patch 2

View in context: https://bugs.webkit.org/attachment.cgi?id=175666&action=review

> Source/WebCore/dom/Node.h:320
> +    bool hasName() const { ASSERT(!isTextNode()); return getFlag(HasNameOrIsEditingTextFlag); }

These two statements should probably be put in separate lines.

> Source/WebCore/dom/Node.h:334
> +    bool isEditingText() const { ASSERT(isTextNode()); return getFlag(HasNameOrIsEditingTextFlag); }

Ditto.

> Source/WebCore/dom/Node.h:336
> +    void setHasName(bool f) { ASSERT(!isTextNode()); setFlag(f, HasNameOrIsEditingTextFlag); }

Ditto.
Comment 6 Antti Koivisto 2012-11-22 09:35:36 PST
http://trac.webkit.org/changeset/135529