Changeset 216002 in webkit


Ignore:
Timestamp:
Apr 30, 2017 5:44:06 PM (7 years ago)
Author:
Chris Dumez
Message:

Drop support for legacy ClientRect / ClientRectList
​https://bugs.webkit.org/show_bug.cgi?id=171418

Reviewed by Sam Weinig.

Source/WebCore:

Drop support for legacy ClientRect / ClientRectList types now we use
DOMRect everywhere.

  • CMakeLists.txt:
  • DerivedSources.cpp:
  • DerivedSources.make:
  • WebCore.xcodeproj/project.pbxproj:
  • dom/ClientRect.cpp: Removed.
  • dom/ClientRect.h: Removed.
  • dom/ClientRect.idl: Removed.
  • dom/ClientRectList.cpp: Removed.
  • dom/ClientRectList.h: Removed.
  • dom/ClientRectList.idl: Removed.
  • dom/DOMAllInOne.cpp:
  • dom/Element.cpp:
  • html/HTMLMediaElement.cpp:
  • html/track/VTTRegion.cpp:
  • page/DragController.cpp:

Source/WebInspectorUI:

Drop ClientRectList-related code.

  • UserInterface/Models/NativeFunctionParameters.js:

Source/WebKit2:

GTK build fix.

  • WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp:

(WebKit::kit):
(WebKit::core):
(WebKit::wrapClientRect):
(webkit_dom_client_rect_constructed):

  • WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp:

(ClientRectList::create):
(ClientRectList::items):
(ClientRectList::ClientRectList):

  • WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectListPrivate.h:
  • WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectPrivate.h:
  • WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp:

(webkit_dom_element_get_bounding_client_rect):
(webkit_dom_element_get_client_rects):

Location:
trunk/Source
Files:
6 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeLists.txt

    r215973 r216002  
    407407    dom/CharacterData.idl
    408408    dom/ChildNode.idl
    409     dom/ClientRect.idl
    410     dom/ClientRectList.idl
    411409    dom/ClipboardEvent.idl
    412410    dom/Comment.idl
    … …  
    14481446    dom/ChildNodeList.cpp
    14491447    dom/ClassCollection.cpp
    1450     dom/ClientRect.cpp
    1451     dom/ClientRectList.cpp
    14521448    dom/ClipboardEvent.cpp
    14531449    dom/CollectionIndexCache.cpp

  • trunk/Source/WebCore/ChangeLog

    r216001 r216002  
     12017-04-30  Chris Dumez  <cdumez@apple.com>
     2
     3        Drop support for legacy ClientRect / ClientRectList
     4        https://bugs.webkit.org/show_bug.cgi?id=171418
     5
     6        Reviewed by Sam Weinig.
     7
     8        Drop support for legacy ClientRect / ClientRectList types now we use
     9        DOMRect everywhere.
     10
     11        * CMakeLists.txt:
     12        * DerivedSources.cpp:
     13        * DerivedSources.make:
     14        * WebCore.xcodeproj/project.pbxproj:
     15        * dom/ClientRect.cpp: Removed.
     16        * dom/ClientRect.h: Removed.
     17        * dom/ClientRect.idl: Removed.
     18        * dom/ClientRectList.cpp: Removed.
     19        * dom/ClientRectList.h: Removed.
     20        * dom/ClientRectList.idl: Removed.
     21        * dom/DOMAllInOne.cpp:
     22        * dom/Element.cpp:
     23        * html/HTMLMediaElement.cpp:
     24        * html/track/VTTRegion.cpp:
     25        * page/DragController.cpp:
     26
    1272017-04-30  Zalan Bujtas  <zalan@apple.com>
    228

  • trunk/Source/WebCore/DerivedSources.cpp

    r215916 r216002  
    108108#include "JSCDATASection.cpp"
    109109#include "JSCharacterData.cpp"
    110 #include "JSClientRect.cpp"
    111 #include "JSClientRectList.cpp"
    112110#include "JSCloseEvent.cpp"
    113111#include "JSCommandLineAPIHost.cpp"

  • trunk/Source/WebCore/DerivedSources.make

    r215916 r216002  
    343343    $(WebCore)/dom/CharacterData.idl \
    344344    $(WebCore)/dom/ChildNode.idl \
    345     $(WebCore)/dom/ClientRect.idl \
    346     $(WebCore)/dom/ClientRectList.idl \
    347345    $(WebCore)/dom/ClipboardEvent.idl \
    348346    $(WebCore)/dom/Comment.idl \

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r215973 r216002  
    57955795                BCBFB53C0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */; };
    57965796                BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */ = {isa = PBXBuildFile; fileRef = BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5797                 BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC065770F3CE1B700CD2D87 /* ClientRect.cpp */; };
    5798                 BCC0657E0F3CE1B700CD2D87 /* ClientRect.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC065780F3CE1B700CD2D87 /* ClientRect.h */; };
    5799                 BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC0657A0F3CE1B700CD2D87 /* ClientRectList.cpp */; };
    5800                 BCC065810F3CE1B700CD2D87 /* ClientRectList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC0657B0F3CE1B700CD2D87 /* ClientRectList.h */; };
    5801                 BCC065870F3CE2A700CD2D87 /* JSClientRect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC065830F3CE2A700CD2D87 /* JSClientRect.cpp */; };
    5802                 BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC065840F3CE2A700CD2D87 /* JSClientRect.h */; };
    5803                 BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC065850F3CE2A700CD2D87 /* JSClientRectList.cpp */; };
    5804                 BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC065860F3CE2A700CD2D87 /* JSClientRectList.h */; };
    58055797                BCC0E8751BFE70E9008F7F50 /* HTMLPictureElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC0E8731BFE70E9008F7F50 /* HTMLPictureElement.cpp */; };
    58065798                BCC0E8761BFE70E9008F7F50 /* HTMLPictureElement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCC0E8741BFE70E9008F7F50 /* HTMLPictureElement.h */; };
    … …  
    1423414226                BCBFB53A0DCD29CF0019B3E5 /* JSDOMWindowShell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowShell.cpp; sourceTree = "<group>"; };
    1423514227                BCBFB53B0DCD29CF0019B3E5 /* JSDOMWindowShell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowShell.h; sourceTree = "<group>"; };
    14236                 BCC065770F3CE1B700CD2D87 /* ClientRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClientRect.cpp; sourceTree = "<group>"; };
    14237                 BCC065780F3CE1B700CD2D87 /* ClientRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientRect.h; sourceTree = "<group>"; };
    14238                 BCC065790F3CE1B700CD2D87 /* ClientRect.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ClientRect.idl; sourceTree = "<group>"; };
    14239                 BCC0657A0F3CE1B700CD2D87 /* ClientRectList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ClientRectList.cpp; sourceTree = "<group>"; };
    14240                 BCC0657B0F3CE1B700CD2D87 /* ClientRectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ClientRectList.h; sourceTree = "<group>"; };
    14241                 BCC0657C0F3CE1B700CD2D87 /* ClientRectList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ClientRectList.idl; sourceTree = "<group>"; };
    14242                 BCC065830F3CE2A700CD2D87 /* JSClientRect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClientRect.cpp; sourceTree = "<group>"; };
    14243                 BCC065840F3CE2A700CD2D87 /* JSClientRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSClientRect.h; sourceTree = "<group>"; };
    14244                 BCC065850F3CE2A700CD2D87 /* JSClientRectList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClientRectList.cpp; sourceTree = "<group>"; };
    14245                 BCC065860F3CE2A700CD2D87 /* JSClientRectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSClientRectList.h; sourceTree = "<group>"; };
    1424614228                BCC0E8731BFE70E9008F7F50 /* HTMLPictureElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLPictureElement.cpp; sourceTree = "<group>"; };
    1424714229                BCC0E8741BFE70E9008F7F50 /* HTMLPictureElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLPictureElement.h; sourceTree = "<group>"; };
    … …  
    2184021822                        isa = PBXGroup;
    2184121823                        children = (
    21842                                 BCC065830F3CE2A700CD2D87 /* JSClientRect.cpp */,
    21843                                 BCC065840F3CE2A700CD2D87 /* JSClientRect.h */,
    21844                                 BCC065850F3CE2A700CD2D87 /* JSClientRectList.cpp */,
    21845                                 BCC065860F3CE2A700CD2D87 /* JSClientRectList.h */,
    2184621824                                BC46C1F20C0DDC8F0020CFC3 /* JSCSSFontFaceRule.cpp */,
    2184721825                                BC46C1F30C0DDC8F0020CFC3 /* JSCSSFontFaceRule.h */,
    … …  
    2544025418                                8348BFA91B85729500912F36 /* ClassCollection.cpp */,
    2544125419                                8348BFAA1B85729500912F36 /* ClassCollection.h */,
    25442                                 BCC065770F3CE1B700CD2D87 /* ClientRect.cpp */,
    25443                                 BCC065780F3CE1B700CD2D87 /* ClientRect.h */,
    25444                                 BCC065790F3CE1B700CD2D87 /* ClientRect.idl */,
    25445                                 BCC0657A0F3CE1B700CD2D87 /* ClientRectList.cpp */,
    25446                                 BCC0657B0F3CE1B700CD2D87 /* ClientRectList.h */,
    25447                                 BCC0657C0F3CE1B700CD2D87 /* ClientRectList.idl */,
    2544825420                                85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */,
    2544925421                                85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */,
    … …  
    2659026562                                E4A814D41C6DEC4000BF85AC /* ClassChangeInvalidation.h in Headers */,
    2659126563                                8348BFAC1B85729800912F36 /* ClassCollection.h in Headers */,
    26592                                 BCC0657E0F3CE1B700CD2D87 /* ClientRect.h in Headers */,
    26593                                 BCC065810F3CE1B700CD2D87 /* ClientRectList.h in Headers */,
    2659426564                                7C3A91E61C963B8800D1A7E3 /* ClipboardAccessPolicy.h in Headers */,
    2659526565                                85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
    … …  
    2764527615                                FDA15EA412B03EE1003A583A /* JSChannelSplitterNode.h in Headers */,
    2764627616                                65DF31F409D1CC60000BE325 /* JSCharacterData.h in Headers */,
    27647                                 BCC065880F3CE2A700CD2D87 /* JSClientRect.h in Headers */,
    27648                                 BCC0658A0F3CE2A700CD2D87 /* JSClientRectList.h in Headers */,
    2764927617                                836D03321DA8A14200FFD96B /* JSClipboardEvent.h in Headers */,
    2765027618                                51FB5504113E3E9100821176 /* JSCloseEvent.h in Headers */,
    … …  
    3066130629                                E4A814D61C6DEE8D00BF85AC /* ClassChangeInvalidation.cpp in Sources */,
    3066230630                                8348BFAB1B85729800912F36 /* ClassCollection.cpp in Sources */,
    30663                                 BCC0657D0F3CE1B700CD2D87 /* ClientRect.cpp in Sources */,
    30664                                 BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */,
    3066530631                                85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
    3066630632                                580371611A66F00A00BAF519 /* ClipRect.cpp in Sources */,
    … …  
    3160931575                                FDA15EA312B03EE1003A583A /* JSChannelSplitterNode.cpp in Sources */,
    3161031576                                65DF31F309D1CC60000BE325 /* JSCharacterData.cpp in Sources */,
    31611                                 BCC065870F3CE2A700CD2D87 /* JSClientRect.cpp in Sources */,
    31612                                 BCC065890F3CE2A700CD2D87 /* JSClientRectList.cpp in Sources */,
    3161331577                                836D03311DA8A13F00FFD96B /* JSClipboardEvent.cpp in Sources */,
    3161431578                                51FB5505113E3E9100821176 /* JSCloseEvent.cpp in Sources */,

  • trunk/Source/WebCore/dom/DOMAllInOne.cpp

    r215916 r216002  
    3838#include "ChildNodeList.cpp"
    3939#include "ClassCollection.cpp"
    40 #include "ClientRect.cpp"
    41 #include "ClientRectList.cpp"
    4240#include "ClipboardEvent.cpp"
    4341#include "CollectionIndexCache.cpp"

  • trunk/Source/WebCore/dom/Element.cpp

    r215946 r216002  
    3434#include "ChromeClient.h"
    3535#include "ClassChangeInvalidation.h"
    36 #include "ClientRect.h"
    37 #include "ClientRectList.h"
    3836#include "ComposedTreeAncestorIterator.h"
    3937#include "ContainerNodeAlgorithms.h"

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r215952 r216002  
    3636#include "CSSValueKeywords.h"
    3737#include "ChromeClient.h"
    38 #include "ClientRect.h"
    39 #include "ClientRectList.h"
    4038#include "CommonVM.h"
    4139#include "ContentSecurityPolicy.h"

  • trunk/Source/WebCore/html/track/VTTRegion.cpp

    r215892 r216002  
    3535#if ENABLE(VIDEO_TRACK)
    3636
    37 #include "ClientRect.h"
    3837#include "DOMRect.h"
    3938#include "DOMTokenList.h"

  • trunk/Source/WebCore/page/DragController.cpp

    r215917 r216002  
    3333#include "CachedImage.h"
    3434#include "CachedResourceLoader.h"
    35 #include "ClientRect.h"
    3635#include "DataTransfer.h"
    3736#include "Document.h"

  • trunk/Source/WebInspectorUI/ChangeLog

    r215920 r216002  
     12017-04-30  Chris Dumez  <cdumez@apple.com>
     2
     3        Drop support for legacy ClientRect / ClientRectList
     4        https://bugs.webkit.org/show_bug.cgi?id=171418
     5
     6        Reviewed by Sam Weinig.
     7
     8        Drop ClientRectList-related code.
     9
     10        * UserInterface/Models/NativeFunctionParameters.js:
     11
    1122017-04-27  Fujii Hironori  <Hironori.Fujii@sony.com>
    213

  • trunk/Source/WebInspectorUI/UserInterface/Models/NativeFunctionParameters.js

    r213543 r216002  
    694694        replaceData: "[offset], [length], [data]",
    695695        substringData: "[offset], [length]",
    696         __proto__: null,
    697     },
    698 
    699     ClientRectList: {
    700         item: "[index]",
    701696        __proto__: null,
    702697    },

  • trunk/Source/WebKit2/ChangeLog

    r215997 r216002  
     12017-04-30  Chris Dumez  <cdumez@apple.com>
     2
     3        Drop support for legacy ClientRect / ClientRectList
     4        https://bugs.webkit.org/show_bug.cgi?id=171418
     5
     6        Reviewed by Sam Weinig.
     7
     8        GTK build fix.
     9
     10        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp:
     11        (WebKit::kit):
     12        (WebKit::core):
     13        (WebKit::wrapClientRect):
     14        (webkit_dom_client_rect_constructed):
     15        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp:
     16        (ClientRectList::create):
     17        (ClientRectList::items):
     18        (ClientRectList::ClientRectList):
     19        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectListPrivate.h:
     20        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectPrivate.h:
     21        * WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp:
     22        (webkit_dom_element_get_bounding_client_rect):
     23        (webkit_dom_element_get_client_rects):
     24
    1252017-04-30  Brady Eidson  <beidson@apple.com>
    226

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRect.cpp

    r214215 r216002  
    3636
    3737typedef struct _WebKitDOMClientRectPrivate {
    38     RefPtr<WebCore::ClientRect> coreObject;
     38    RefPtr<WebCore::DOMRect> coreObject;
    3939} WebKitDOMClientRectPrivate;
    4040
    4141namespace WebKit {
    4242
    43 WebKitDOMClientRect* kit(WebCore::ClientRect* obj)
     43WebKitDOMClientRect* kit(WebCore::DOMRect* obj)
    4444{
    4545    if (!obj)
    … …  
    5252}
    5353
    54 WebCore::ClientRect* core(WebKitDOMClientRect* request)
    55 {
    56     return request ? static_cast<WebCore::ClientRect*>(WEBKIT_DOM_OBJECT(request)->coreObject) : nullptr;
    57 }
    58 
    59 WebKitDOMClientRect* wrapClientRect(WebCore::ClientRect* coreObject)
     54WebCore::DOMRect* core(WebKitDOMClientRect* request)
     55{
     56    return request ? static_cast<WebCore::DOMRect*>(WEBKIT_DOM_OBJECT(request)->coreObject) : nullptr;
     57}
     58
     59WebKitDOMClientRect* wrapClientRect(WebCore::DOMRect* coreObject)
    6060{
    6161    ASSERT(coreObject);
    … …  
    121121
    122122    WebKitDOMClientRectPrivate* priv = WEBKIT_DOM_CLIENT_RECT_GET_PRIVATE(object);
    123     priv->coreObject = static_cast<WebCore::ClientRect*>(WEBKIT_DOM_OBJECT(object)->coreObject);
     123    priv->coreObject = static_cast<WebCore::DOMRect*>(WEBKIT_DOM_OBJECT(object)->coreObject);
    124124    WebKit::DOMObjectCache::put(priv->coreObject.get(), object);
    125125}

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectList.cpp

    r214215 r216002  
    3636#define WEBKIT_DOM_CLIENT_RECT_LIST_GET_PRIVATE(obj) G_TYPE_INSTANCE_GET_PRIVATE(obj, WEBKIT_DOM_TYPE_CLIENT_RECT_LIST, WebKitDOMClientRectListPrivate)
    3737
     38class ClientRectList : public RefCounted<ClientRectList> {
     39public:
     40    static Ref<ClientRectList> create(WTF::Vector<Ref<WebCore::DOMRect>>&& items)
     41    {
     42        return adoptRef(*new ClientRectList(WTFMove(items)));
     43    }
     44
     45    const WTF::Vector<Ref<WebCore::DOMRect>>& items() const { return m_items; }
     46
     47private:
     48    ClientRectList(WTF::Vector<Ref<WebCore::DOMRect>>&& items)
     49        : m_items(WTFMove(items))
     50    { }
     51
     52    WTF::Vector<Ref<WebCore::DOMRect>> m_items;
     53};
     54
    3855typedef struct _WebKitDOMClientRectListPrivate {
    39     RefPtr<WebCore::ClientRectList> coreObject;
     56    RefPtr<ClientRectList> coreObject;
    4057} WebKitDOMClientRectListPrivate;
    4158
    4259namespace WebKit {
    4360
    44 WebKitDOMClientRectList* kit(WebCore::ClientRectList* obj)
     61WebKitDOMClientRectList* kit(WTF::Vector<Ref<WebCore::DOMRect>>&& obj)
    4562{
    46     if (!obj)
    47         return nullptr;
    48 
    49     if (gpointer ret = DOMObjectCache::get(obj))
    50         return WEBKIT_DOM_CLIENT_RECT_LIST(ret);
    51 
    52     return wrapClientRectList(obj);
     63    return wrapClientRectList(WTFMove(obj));
    5364}
    5465
    55 WebCore::ClientRectList* core(WebKitDOMClientRectList* request)
     66static ClientRectList* core(WebKitDOMClientRectList* request)
    5667{
    57     return request ? static_cast<WebCore::ClientRectList*>(WEBKIT_DOM_OBJECT(request)->coreObject) : nullptr;
     68    return request ? static_cast<ClientRectList*>(WEBKIT_DOM_OBJECT(request)->coreObject) : nullptr;
    5869}
    5970
    60 WebKitDOMClientRectList* wrapClientRectList(WebCore::ClientRectList* coreObject)
     71WebKitDOMClientRectList* wrapClientRectList(WTF::Vector<Ref<WebCore::DOMRect>>&& coreObject)
    6172{
    6273    ASSERT(coreObject);
    63     return WEBKIT_DOM_CLIENT_RECT_LIST(g_object_new(WEBKIT_DOM_TYPE_CLIENT_RECT_LIST, "core-object", coreObject, nullptr));
     74    auto list = ClientRectList::create(WTFMove(coreObject));
     75    return WEBKIT_DOM_CLIENT_RECT_LIST(g_object_new(WEBKIT_DOM_TYPE_CLIENT_RECT_LIST, "core-object", list.ptr(), nullptr));
    6476}
    6577
    … …  
    102114
    103115    WebKitDOMClientRectListPrivate* priv = WEBKIT_DOM_CLIENT_RECT_LIST_GET_PRIVATE(object);
    104     priv->coreObject = static_cast<WebCore::ClientRectList*>(WEBKIT_DOM_OBJECT(object)->coreObject);
    105     WebKit::DOMObjectCache::put(priv->coreObject.get(), object);
     116    priv->coreObject = static_cast<ClientRectList*>(WEBKIT_DOM_OBJECT(object)->coreObject);
    106117}
    107118
    … …  
    136147    WebCore::JSMainThreadNullState state;
    137148    g_return_val_if_fail(WEBKIT_DOM_IS_CLIENT_RECT_LIST(self), nullptr);
    138     WebCore::ClientRectList* item = WebKit::core(self);
    139     RefPtr<WebCore::ClientRect> gobjectResult = WTF::getPtr(item->item(index));
     149    auto& list = WebKit::core(self)->items();
     150    RefPtr<WebCore::DOMRect> gobjectResult = index >= list.size() ? nullptr : list[index].ptr();
    140151    return WebKit::kit(gobjectResult.get());
    141152}
    … …  
    145156    WebCore::JSMainThreadNullState state;
    146157    g_return_val_if_fail(WEBKIT_DOM_IS_CLIENT_RECT_LIST(self), 0);
    147     return WebKit::core(self)->length();
     158    return WebKit::core(self)->items().size();
    148159}

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectListPrivate.h

    r214215 r216002  
    2020#pragma once
    2121
    22 #include <WebCore/ClientRectList.h>
     22#include <WebCore/DOMRect.h>
    2323#include <webkitdom/WebKitDOMClientRectList.h>
     24#include <wtf/Vector.h>
    2425
    2526namespace WebKit {
    26 WebKitDOMClientRectList* wrapClientRectList(WebCore::ClientRectList*);
    27 WebKitDOMClientRectList* kit(WebCore::ClientRectList*);
    28 WebCore::ClientRectList* core(WebKitDOMClientRectList*);
     27WebKitDOMClientRectList* wrapClientRectList(WTF::Vector<Ref<WebCore::DOMRect>>&&);
     28WebKitDOMClientRectList* kit(WTF::Vector<Ref<WebCore::DOMRect>>&&);
    2929} // namespace WebKit

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMClientRectPrivate.h

    r214215 r216002  
    2020#pragma once
    2121
    22 #include <WebCore/ClientRect.h>
     22#include <WebCore/DOMRect.h>
    2323#include <webkitdom/WebKitDOMClientRect.h>
    2424
    2525namespace WebKit {
    26 WebKitDOMClientRect* wrapClientRect(WebCore::ClientRect*);
    27 WebKitDOMClientRect* kit(WebCore::ClientRect*);
    28 WebCore::ClientRect* core(WebKitDOMClientRect*);
     26WebKitDOMClientRect* wrapClientRect(WebCore::DOMRect*);
     27WebKitDOMClientRect* kit(WebCore::DOMRect*);
     28WebCore::DOMRect* core(WebKitDOMClientRect*);
    2929} // namespace WebKit

  • trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMElement.cpp

    r215892 r216002  
    2323#include <WebCore/CSSImportRule.h>
    2424#include "DOMObjectCache.h"
    25 #include <WebCore/ClientRect.h>
    26 #include <WebCore/ClientRectList.h>
    2725#include <WebCore/DOMRect.h>
    2826#include <WebCore/Document.h>
    … …  
    12271225}
    12281226
    1229 static Ref<WebCore::ClientRect> toClientRect(WebCore::DOMRect& rect)
    1230 {
    1231     return WebCore::ClientRect::create(WebCore::FloatRect(rect.x(), rect.y(), rect.width(), rect.height()));
    1232 }
    1233 
    12341227WebKitDOMClientRect* webkit_dom_element_get_bounding_client_rect(WebKitDOMElement* self)
    12351228{
    … …  
    12371230    g_return_val_if_fail(WEBKIT_DOM_IS_ELEMENT(self), nullptr);
    12381231    WebCore::Element* item = WebKit::core(self);
    1239     auto clientRect = toClientRect(item->getBoundingClientRect());
    1240     return WebKit::kit(clientRect.ptr());
    1241 }
    1242 
    1243 static Vector<Ref<WebCore::ClientRect>> toClientRectVector(Vector<Ref<WebCore::DOMRect>>&& rects)
    1244 {
    1245     Vector<Ref<WebCore::ClientRect>> clientRects;
    1246     clientRects.reserveInitialCapacity(rects.size());
    1247     for (auto& rect : rects)
    1248         clientRects.uncheckedAppend(toClientRect(rect));
    1249     return clientRects;
     1232    return WebKit::kit(item->getBoundingClientRect().ptr());
    12501233}
    12511234
    … …  
    12551238    g_return_val_if_fail(WEBKIT_DOM_IS_ELEMENT(self), nullptr);
    12561239    WebCore::Element* item = WebKit::core(self);
    1257     auto clientRects = WebCore::ClientRectList::create(toClientRectVector(item->getClientRects()));
    1258     return WebKit::kit(clientRects.ptr());
     1240    return WebKit::kit(item->getClientRects());
    12591241}
    12601242
Note: See TracChangeset for help on using the changeset viewer.