Changeset 198759 in webkit


Ignore:
Timestamp:
Mar 28, 2016 3:34:36 PM (8 years ago)
Author:
BJ Burg
Message:

Web Automation: split protocol object BrowsingContext.windowFrame into two separate members
https://bugs.webkit.org/show_bug.cgi?id=155952
<rdar://problem/25393597>

Reviewed by Timothy Hatcher.

Using the name 'windowFrame' causes conflicts with some Objective-C code.

  • UIProcess/Automation/Automation.json:
  • UIProcess/Automation/WebAutomationSession.cpp:

(WebKit::WebAutomationSession::buildBrowsingContextForPage):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r198757 r198759  
     12016-03-28  Brian Burg  <bburg@apple.com>
     2
     3        Web Automation: split protocol object BrowsingContext.windowFrame into two separate members
     4        https://bugs.webkit.org/show_bug.cgi?id=155952
     5        <rdar://problem/25393597>
     6
     7        Reviewed by Timothy Hatcher.
     8
     9        Using the name 'windowFrame' causes conflicts with some Objective-C code.
     10
     11        * UIProcess/Automation/Automation.json:
     12        * UIProcess/Automation/WebAutomationSession.cpp:
     13        (WebKit::WebAutomationSession::buildBrowsingContextForPage):
     14
    1152016-03-28  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    216
  • trunk/Source/WebKit2/UIProcess/Automation/Automation.json

    r198754 r198759  
    6565                { "name": "active", "type": "boolean", "description": "Whether the browsing context has focus at the time the command is handled." },
    6666                { "name": "url", "type": "string", "description": "The URL loaded by the browsing context at the time the command is handled." },
    67                 { "name": "windowFrame", "$ref": "Rect", "description": "The current frame (position and size) of the browsing context's window." }
     67                { "name": "windowSize", "$ref": "Size", "description": "The current size of the browsing context's window." },
     68                { "name": "windowOrigin", "$ref": "Point", "description": "The current (x, y) position of the browsing context's window relative to the top-left of the screen." }
    6869            ]
    6970        }
  • trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp

    r198754 r198759  
    206206        .release();
    207207
    208     auto windowFrameObject = Inspector::Protocol::Automation::Rect::create()
    209         .setOrigin(WTFMove(originObject))
    210         .setSize(WTFMove(sizeObject))
    211         .release();
    212 
    213208    String handle = handleForWebPageProxy(page);
    214209
     
    217212        .setActive(m_activeBrowsingContextHandle == handle)
    218213        .setUrl(page.pageLoadState().activeURL())
    219         .setWindowFrame(WTFMove(windowFrameObject))
     214        .setWindowOrigin(WTFMove(originObject))
     215        .setWindowSize(WTFMove(sizeObject))
    220216        .release();
    221217}
Note: See TracChangeset for help on using the changeset viewer.