Commit c5d145e9 authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Remove using directives ("using namespace x") from renderer/core/editing/.

Bug: 82078
Change-Id: Id788fda5d89981544129fc9a9025c06378fcbd88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1870417
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707752}
parent 857972fb
...@@ -70,8 +70,6 @@ ...@@ -70,8 +70,6 @@
namespace blink { namespace blink {
using namespace cssvalue;
// Editing style properties must be preserved during editing operation. // Editing style properties must be preserved during editing operation.
// e.g. when a user inserts a new paragraph, all properties listed here must be // e.g. when a user inserts a new paragraph, all properties listed here must be
// copied to the new paragraph. // copied to the new paragraph.
...@@ -426,7 +424,7 @@ static Color CssValueToColor(const CSSValue* value) { ...@@ -426,7 +424,7 @@ static Color CssValueToColor(const CSSValue* value) {
if (!value) if (!value)
return Color::kTransparent; return Color::kTransparent;
auto* color_value = DynamicTo<CSSColorValue>(value); auto* color_value = DynamicTo<cssvalue::CSSColorValue>(value);
if (!color_value && !value->IsPrimitiveValue() && !value->IsIdentifierValue()) if (!color_value && !value->IsPrimitiveValue() && !value->IsIdentifierValue())
return Color::kTransparent; return Color::kTransparent;
......
...@@ -41,8 +41,6 @@ ...@@ -41,8 +41,6 @@
namespace blink { namespace blink {
using namespace cssvalue;
namespace { namespace {
Position AdjustedSelectionStartForStyleComputation(const Position& position) { Position AdjustedSelectionStartForStyleComputation(const Position& position) {
...@@ -204,7 +202,7 @@ EditingStyle* EditingStyleUtilities::CreateStyleAtSelectionStart( ...@@ -204,7 +202,7 @@ EditingStyle* EditingStyleUtilities::CreateStyleAtSelectionStart(
bool EditingStyleUtilities::IsTransparentColorValue(const CSSValue* css_value) { bool EditingStyleUtilities::IsTransparentColorValue(const CSSValue* css_value) {
if (!css_value) if (!css_value)
return true; return true;
if (auto* color_value = DynamicTo<CSSColorValue>(css_value)) if (auto* color_value = DynamicTo<cssvalue::CSSColorValue>(css_value))
return !color_value->Value().Alpha(); return !color_value->Value().Alpha();
if (auto* identifier_value = DynamicTo<CSSIdentifierValue>(css_value)) if (auto* identifier_value = DynamicTo<CSSIdentifierValue>(css_value))
return identifier_value->GetValueID() == CSSValueID::kTransparent; return identifier_value->GetValueID() == CSSValueID::kTransparent;
......
...@@ -82,8 +82,6 @@ ...@@ -82,8 +82,6 @@
namespace blink { namespace blink {
using namespace html_names;
namespace { namespace {
std::ostream& operator<<(std::ostream& os, PositionMoveType type) { std::ostream& operator<<(std::ostream& os, PositionMoveType type) {
...@@ -412,8 +410,10 @@ bool IsEditableElement(const Node& node) { ...@@ -412,8 +410,10 @@ bool IsEditableElement(const Node& node) {
return true; return true;
} }
if (auto* element = DynamicTo<Element>(&node)) if (auto* element = DynamicTo<Element>(&node)) {
return EqualIgnoringASCIICase(element->getAttribute(kRoleAttr), "textbox"); return EqualIgnoringASCIICase(element->getAttribute(html_names::kRoleAttr),
"textbox");
}
return false; return false;
} }
...@@ -1122,10 +1122,13 @@ bool IsPresentationalHTMLElement(const Node* node) { ...@@ -1122,10 +1122,13 @@ bool IsPresentationalHTMLElement(const Node* node) {
if (!element) if (!element)
return false; return false;
return element->HasTagName(kUTag) || element->HasTagName(kSTag) || return element->HasTagName(html_names::kUTag) ||
element->HasTagName(kStrikeTag) || element->HasTagName(kITag) || element->HasTagName(html_names::kSTag) ||
element->HasTagName(kEmTag) || element->HasTagName(kBTag) || element->HasTagName(html_names::kStrikeTag) ||
element->HasTagName(kStrongTag); element->HasTagName(html_names::kITag) ||
element->HasTagName(html_names::kEmTag) ||
element->HasTagName(html_names::kBTag) ||
element->HasTagName(html_names::kStrongTag);
} }
Element* AssociatedElementOf(const Position& position) { Element* AssociatedElementOf(const Position& position) {
...@@ -1289,7 +1292,7 @@ static HTMLSpanElement* CreateTabSpanElement(Document& document, ...@@ -1289,7 +1292,7 @@ static HTMLSpanElement* CreateTabSpanElement(Document& document,
Text* tab_text_node) { Text* tab_text_node) {
// Make the span to hold the tab. // Make the span to hold the tab.
auto* span_element = MakeGarbageCollected<HTMLSpanElement>(document); auto* span_element = MakeGarbageCollected<HTMLSpanElement>(document);
span_element->setAttribute(kStyleAttr, "white-space:pre"); span_element->setAttribute(html_names::kStyleAttr, "white-space:pre");
// Add tab text to that span. // Add tab text to that span.
if (!tab_text_node) if (!tab_text_node)
...@@ -1391,7 +1394,7 @@ bool IsMailHTMLBlockquoteElement(const Node* node) { ...@@ -1391,7 +1394,7 @@ bool IsMailHTMLBlockquoteElement(const Node* node) {
if (!element) if (!element)
return false; return false;
return element->HasTagName(kBlockquoteTag) && return element->HasTagName(html_names::kBlockquoteTag) &&
element->getAttribute("type") == "cite"; element->getAttribute("type") == "cite";
} }
...@@ -1516,12 +1519,17 @@ bool IsNonTableCellHTMLBlockElement(const Node* node) { ...@@ -1516,12 +1519,17 @@ bool IsNonTableCellHTMLBlockElement(const Node* node) {
if (!element) if (!element)
return false; return false;
return element->HasTagName(kListingTag) || element->HasTagName(kOlTag) || return element->HasTagName(html_names::kListingTag) ||
element->HasTagName(kPreTag) || element->HasTagName(kTableTag) || element->HasTagName(html_names::kOlTag) ||
element->HasTagName(kUlTag) || element->HasTagName(kXmpTag) || element->HasTagName(html_names::kPreTag) ||
element->HasTagName(kH1Tag) || element->HasTagName(kH2Tag) || element->HasTagName(html_names::kTableTag) ||
element->HasTagName(kH3Tag) || element->HasTagName(kH4Tag) || element->HasTagName(html_names::kUlTag) ||
element->HasTagName(kH5Tag); element->HasTagName(html_names::kXmpTag) ||
element->HasTagName(html_names::kH1Tag) ||
element->HasTagName(html_names::kH2Tag) ||
element->HasTagName(html_names::kH3Tag) ||
element->HasTagName(html_names::kH4Tag) ||
element->HasTagName(html_names::kH5Tag);
} }
bool IsBlockFlowElement(const Node& node) { bool IsBlockFlowElement(const Node& node) {
...@@ -1708,7 +1716,7 @@ AtomicString GetUrlStringFromNode(const Node& node) { ...@@ -1708,7 +1716,7 @@ AtomicString GetUrlStringFromNode(const Node& node) {
// TODO(editing-dev): This should probably be reconciled with // TODO(editing-dev): This should probably be reconciled with
// HitTestResult::absoluteImageURL. // HitTestResult::absoluteImageURL.
if (IsHTMLImageElement(node) || IsHTMLInputElement(node)) if (IsHTMLImageElement(node) || IsHTMLInputElement(node))
return To<HTMLElement>(node).getAttribute(kSrcAttr); return To<HTMLElement>(node).getAttribute(html_names::kSrcAttr);
if (IsSVGImageElement(node)) if (IsSVGImageElement(node))
return To<SVGElement>(node).ImageSourceURL(); return To<SVGElement>(node).ImageSourceURL();
if (IsHTMLEmbedElement(node) || IsHTMLObjectElement(node) || if (IsHTMLEmbedElement(node) || IsHTMLObjectElement(node) ||
......
...@@ -93,8 +93,6 @@ ...@@ -93,8 +93,6 @@
namespace blink { namespace blink {
using namespace html_names;
namespace { namespace {
bool IsInPasswordFieldWithUnrevealedPassword(const Position& position) { bool IsInPasswordFieldWithUnrevealedPassword(const Position& position) {
...@@ -639,7 +637,8 @@ void Editor::SetBaseWritingDirection(WritingDirection direction) { ...@@ -639,7 +637,8 @@ void Editor::SetBaseWritingDirection(WritingDirection direction) {
if (direction == WritingDirection::kNatural) if (direction == WritingDirection::kNatural)
return; return;
focused_element->setAttribute( focused_element->setAttribute(
kDirAttr, direction == WritingDirection::kLeftToRight ? "ltr" : "rtl"); html_names::kDirAttr,
direction == WritingDirection::kLeftToRight ? "ltr" : "rtl");
focused_element->DispatchInputEvent(); focused_element->DispatchInputEvent();
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment