Changeset 191136 in webkit


Ignore:
Timestamp:
Oct 15, 2015, 2:16:03 PM (10 years ago)
Author:
andersca@apple.com
Message:

Add -[WKFrameInfo _handle]
​https://bugs.webkit.org/show_bug.cgi?id=150185
rdar://problem/23132371

Reviewed by Tim Horton.

  • UIProcess/API/APIFrameInfo.cpp:

(API::FrameInfo::FrameInfo):

  • UIProcess/API/APIFrameInfo.h:
  • UIProcess/API/Cocoa/WKFrameInfo.mm:

(-[WKFrameInfo _handle]):

  • UIProcess/API/Cocoa/WKFrameInfoInternal.h:
  • UIProcess/API/Cocoa/WKFrameInfoPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h.
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::showPopupMenu):
(WebKit::WebPageProxy::internalShowContextMenu):

  • UIProcess/WebPopupMenuProxy.h:

(WebKit::WebPopupMenuProxy::WebPopupMenuProxy):

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r191131 r191136  
     12015-10-15  Anders Carlsson  <andersca@apple.com>
     2
     3        Add -[WKFrameInfo _handle]
     4        https://bugs.webkit.org/show_bug.cgi?id=150185
     5        rdar://problem/23132371
     6
     7        Reviewed by Tim Horton.
     8
     9        * UIProcess/API/APIFrameInfo.cpp:
     10        (API::FrameInfo::FrameInfo):
     11        * UIProcess/API/APIFrameInfo.h:
     12        * UIProcess/API/Cocoa/WKFrameInfo.mm:
     13        (-[WKFrameInfo _handle]):
     14        * UIProcess/API/Cocoa/WKFrameInfoInternal.h:
     15        * UIProcess/API/Cocoa/WKFrameInfoPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h.
     16        * UIProcess/WebPageProxy.cpp:
     17        (WebKit::WebPageProxy::showPopupMenu):
     18        (WebKit::WebPageProxy::internalShowContextMenu):
     19        * UIProcess/WebPopupMenuProxy.h:
     20        (WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
     21        * WebKit2.xcodeproj/project.pbxproj:
     22
    1232015-10-15  Anders Carlsson  <andersca@apple.com>
    224

  • trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp

    r185877 r191136  
    2727#include "APIFrameInfo.h"
    2828
     29#include "APIFrameHandle.h"
    2930#include "WebFrameProxy.h"
    3031
    … …  
    3637    , m_request(WebCore::ResourceRequest(frame.url()))
    3738    , m_securityOrigin(adoptRef(*SecurityOrigin::create(securityOrigin).leakRef()))
     39    , m_handle(API::FrameHandle::create(frame.frameID()))
    3840{
    3941}

  • trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h

    r185877 r191136  
    3838namespace API {
    3939
     40class FrameHandle;
     41
    4042class FrameInfo final : public ObjectImpl<Object::Type::FrameInfo> {
    4143public:
    … …  
    5052    const WebCore::ResourceRequest& request() const { return m_request; }
    5153    SecurityOrigin& securityOrigin() { return m_securityOrigin.get(); }
     54    API::FrameHandle& handle() { return m_handle.get(); }
    5255
    5356private:
    … …  
    5558    WebCore::ResourceRequest m_request;
    5659    Ref<SecurityOrigin> m_securityOrigin;
     60    Ref<FrameHandle> m_handle;
    5761};
    5862

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm

    r185877 r191136  
    3030
    3131#import "WKSecurityOriginInternal.h"
     32#import "_WKFrameHandleInternal.h"
    3233
    3334@implementation WKFrameInfo
    … …  
    7475@end
    7576
     77@implementation WKFrameInfo (WKPrivate)
     78
     79- (_WKFrameHandle *)_handle
     80{
     81    return WebKit::wrapper(_frameInfo->handle());
     82}
     83
     84@end
    7685#endif
    7786

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h

    r179328 r191136  
    2424 */
    2525
    26 #import "WKFrameInfo.h"
     26#import "WKFrameInfoPrivate.h"
    2727
    2828#if WK_API_ENABLED

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoPrivate.h

    r191131 r191136  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import "WKFrameInfo.h"
     26#import <WebKit/WKFrameInfo.h>
    2727
    2828#if WK_API_ENABLED
    2929
    30 #import "APIFrameInfo.h"
    31 #import "WKObject.h"
     30@class _WKFrameHandle;
    3231
    33 namespace API {
     32@interface WKFrameInfo (WKPrivate)
    3433
    35 inline WKFrameInfo *wrapper(API::FrameInfo& frameInfo)
    36 {
    37     ASSERT([frameInfo.wrapper() isKindOfClass:[WKFrameInfo class]]);
     34@property (nonatomic, readonly, strong) _WKFrameHandle *_handle WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
    3835
    39     return (WKFrameInfo *)frameInfo.wrapper();
    40 }
    41 
    42 }
    43 
    44 @interface WKFrameInfo () <WKObject> {
    45 @package
    46     API::ObjectStorage<API::FrameInfo> _frameInfo;
    47 }
    4836@end
    4937

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

    r190830 r191136  
    293293                1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
    294294                1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */; };
     295                1A6FA21E1BD0435B00AAA650 /* WKFrameInfoPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    295296                1A6FB7AE11E64B6800DB1371 /* PluginView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */; };
    296297                1A6FB7AF11E64B6800DB1371 /* PluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FB7AD11E64B6800DB1371 /* PluginView.h */; };
    … …  
    24042405                1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
    24052406                1A6F9FB611E1408500DB1371 /* CommandLinePOSIX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CommandLinePOSIX.cpp; sourceTree = "<group>"; };
     2407                1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoPrivate.h; sourceTree = "<group>"; };
    24062408                1A6FB7AC11E64B6800DB1371 /* PluginView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginView.cpp; sourceTree = "<group>"; };
    24072409                1A6FB7AD11E64B6800DB1371 /* PluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginView.h; sourceTree = "<group>"; };
    … …  
    53515353                                1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
    53525354                                1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
     5355                                1A6FA21D1BD0435B00AAA650 /* WKFrameInfoPrivate.h */,
    53535356                                2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */,
    53545357                                1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */,
    … …  
    80258028                                93A88B331BC6E9CD00ABA5C2 /* WebHitTestResultData.h in Headers */,
    80268029                                8372DB291A67562800C697C5 /* WebPageDiagnosticLoggingClient.h in Headers */,
     8030                                1A6FA21E1BD0435B00AAA650 /* WKFrameInfoPrivate.h in Headers */,
    80278031                                BC7B6206129A0A6700D174A4 /* WebPageGroup.h in Headers */,
    80288032                                BC7B625212A43C9600D174A4 /* WebPageGroupData.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.