Commit c843bc45 authored by Rune Lillesveen's avatar Rune Lillesveen Committed by Commit Bot

Use GetComputedStyle in SmartClip.

EnsureComputedStyle will force a ComputedStyle in display:none, but the
bounding rect checked further down will be empty.

Change-Id: Id92ea806ca445879149117c2b3e8f916edeb0949
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1536177Reviewed-by: default avatarAnders Hartvoll Ruud <andruud@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#645326}
parent d9f17faf
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "third_party/blink/renderer/core/dom/container_node.h" #include "third_party/blink/renderer/core/dom/container_node.h"
#include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/document.h"
#include "third_party/blink/renderer/core/dom/node_computed_style.h"
#include "third_party/blink/renderer/core/dom/node_traversal.h" #include "third_party/blink/renderer/core/dom/node_traversal.h"
#include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h"
#include "third_party/blink/renderer/core/frame/local_frame_view.h" #include "third_party/blink/renderer/core/frame/local_frame_view.h"
...@@ -233,8 +234,8 @@ String SmartClip::ExtractTextFromNode(Node* node) { ...@@ -233,8 +234,8 @@ String SmartClip::ExtractTextFromNode(Node* node) {
StringBuilder result; StringBuilder result;
for (Node& current_node : NodeTraversal::InclusiveDescendantsOf(*node)) { for (Node& current_node : NodeTraversal::InclusiveDescendantsOf(*node)) {
const ComputedStyle* style = current_node.EnsureComputedStyle(); const ComputedStyle* style = current_node.GetComputedStyle();
if (style && style->UserSelect() == EUserSelect::kNone) if (!style || style->UserSelect() == EUserSelect::kNone)
continue; continue;
if (Node* node_from_frame = NodeInsideFrame(&current_node)) if (Node* node_from_frame = NodeInsideFrame(&current_node))
......
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