| Index: third_party/WebKit/Source/core/testing/Internals.cpp
|
| diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
|
| index a05e0b21a67da0b0c71151b3db4d1ce9085a0935..6c9e391b201925946356388f9ba5aa63486ca406 100644
|
| --- a/third_party/WebKit/Source/core/testing/Internals.cpp
|
| +++ b/third_party/WebKit/Source/core/testing/Internals.cpp
|
| @@ -38,7 +38,6 @@
|
| #include "core/HTMLNames.h"
|
| #include "core/SVGNames.h"
|
| #include "core/animation/DocumentTimeline.h"
|
| -#include "core/dom/ClientRect.h"
|
| #include "core/dom/ClientRectList.h"
|
| #include "core/dom/DOMArrayBuffer.h"
|
| #include "core/dom/DOMNodeIds.h"
|
| @@ -79,6 +78,7 @@
|
| #include "core/frame/Settings.h"
|
| #include "core/frame/VisualViewport.h"
|
| #include "core/geometry/DOMPoint.h"
|
| +#include "core/geometry/DOMRect.h"
|
| #include "core/html/HTMLContentElement.h"
|
| #include "core/html/HTMLIFrameElement.h"
|
| #include "core/html/HTMLImageElement.h"
|
| @@ -869,15 +869,15 @@ DOMWindow* Internals::pagePopupWindow() const {
|
| return nullptr;
|
| }
|
|
|
| -ClientRect* Internals::absoluteCaretBounds(ExceptionState& exception_state) {
|
| +DOMRect* Internals::absoluteCaretBounds(ExceptionState& exception_state) {
|
| if (!GetFrame()) {
|
| exception_state.ThrowDOMException(
|
| kInvalidAccessError, "The document's frame cannot be retrieved.");
|
| - return ClientRect::Create();
|
| + return DOMRect::Create();
|
| }
|
|
|
| document_->UpdateStyleAndLayoutIgnorePendingStylesheets();
|
| - return ClientRect::Create(GetFrame()->Selection().AbsoluteCaretBounds());
|
| + return DOMRect::Create(GetFrame()->Selection().AbsoluteCaretBounds());
|
| }
|
|
|
| String Internals::textAffinity() {
|
| @@ -893,14 +893,14 @@ String Internals::textAffinity() {
|
| return "Downstream";
|
| }
|
|
|
| -ClientRect* Internals::boundingBox(Element* element) {
|
| +DOMRect* Internals::boundingBox(Element* element) {
|
| DCHECK(element);
|
|
|
| element->GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
|
| LayoutObject* layout_object = element->GetLayoutObject();
|
| if (!layout_object)
|
| - return ClientRect::Create();
|
| - return ClientRect::Create(
|
| + return DOMRect::Create();
|
| + return DOMRect::Create(
|
| layout_object->AbsoluteBoundingBoxRectIgnoringTransforms());
|
| }
|
|
|
| @@ -1500,7 +1500,7 @@ Node* Internals::touchNodeAdjustedToBestContextMenuNode(
|
| return target_node;
|
| }
|
|
|
| -ClientRect* Internals::bestZoomableAreaForTouchPoint(
|
| +DOMRect* Internals::bestZoomableAreaForTouchPoint(
|
| long x,
|
| long y,
|
| long width,
|
| @@ -1525,7 +1525,7 @@ ClientRect* Internals::bestZoomableAreaForTouchPoint(
|
| document->GetFrame()->GetEventHandler().BestZoomableAreaForTouchPoint(
|
| point, radius, zoomable_area, target_node);
|
| if (found_node)
|
| - return ClientRect::Create(zoomable_area);
|
| + return DOMRect::Create(zoomable_area);
|
|
|
| return nullptr;
|
| }
|
| @@ -1849,8 +1849,7 @@ static void AccumulateLayerRectList(PaintLayerCompositor* compositor,
|
| for (size_t i = 0; i < layer_rects.size(); ++i) {
|
| if (!layer_rects[i].IsEmpty()) {
|
| rects->Append(node, layer_type, layer_offset.Width(),
|
| - layer_offset.Height(),
|
| - ClientRect::Create(layer_rects[i]));
|
| + layer_offset.Height(), DOMRect::Create(layer_rects[i]));
|
| }
|
| }
|
| }
|
| @@ -2845,14 +2844,14 @@ unsigned Internals::visibleSelectionFocusOffset() {
|
| return position.IsNull() ? 0 : position.ComputeOffsetInContainerNode();
|
| }
|
|
|
| -ClientRect* Internals::selectionBounds(ExceptionState& exception_state) {
|
| +DOMRect* Internals::selectionBounds(ExceptionState& exception_state) {
|
| if (!GetFrame()) {
|
| exception_state.ThrowDOMException(
|
| kInvalidAccessError, "The document's frame cannot be retrieved.");
|
| return nullptr;
|
| }
|
|
|
| - return ClientRect::Create(FloatRect(GetFrame()->Selection().Bounds()));
|
| + return DOMRect::Create(FloatRect(GetFrame()->Selection().Bounds()));
|
| }
|
|
|
| String Internals::markerTextForListItem(Element* element) {
|
| @@ -3382,11 +3381,11 @@ String Internals::getProgrammaticScrollAnimationState(Node* node) const {
|
| return String();
|
| }
|
|
|
| -ClientRect* Internals::visualRect(Node* node) {
|
| +DOMRect* Internals::visualRect(Node* node) {
|
| if (!node || !node->GetLayoutObject())
|
| - return ClientRect::Create();
|
| + return DOMRect::Create();
|
|
|
| - return ClientRect::Create(FloatRect(node->GetLayoutObject()->VisualRect()));
|
| + return DOMRect::Create(FloatRect(node->GetLayoutObject()->VisualRect()));
|
| }
|
|
|
| void Internals::crash() {
|
|
|