Changeset 142916 in webkit


Ignore:
Timestamp:
Feb 14, 2013, 2:01:41 PM (12 years ago)
Author:
Lucas Forschler
Message:

Merged r142900. <rdar://problem/13205468>

Location:
tags/Safari-537.31.1/Source/WebKit2
Files:
7 edited
3 copied

Legend:

Unmodified
Added
Removed

  • tags/Safari-537.31.1/Source/WebKit2/ChangeLog

    r142704 r142916  
     12013-02-14  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r142900
     4
     5    2013-02-14  Sam Weinig  <sam@webkit.org>
     6
     7            Add conversions between ObjC and C DOM wrappers
     8            <rdar://problem/13205468>
     9            https://bugs.webkit.org/show_bug.cgi?id=109851
     10
     11            Reviewed by Anders Carlsson.
     12
     13            * WebKit2.xcodeproj/project.pbxproj:
     14            * WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp:
     15            (WKBundleRangeHandleCreate):
     16            * WebProcess/InjectedBundle/API/c/WKBundleRangeHandlePrivate.h: Added.
     17            * WebProcess/InjectedBundle/API/mac/WKDOMNode.mm:
     18            (-[WKDOMNode _copyBundleNodeHandleRef]):
     19            * WebProcess/InjectedBundle/API/mac/WKDOMNodePrivate.h: Added.
     20            * WebProcess/InjectedBundle/API/mac/WKDOMRange.mm:
     21            (-[WKDOMRange _copyBundleRangeHandleRef]):
     22            * WebProcess/InjectedBundle/API/mac/WKDOMRangePrivate.h: Added.
     23            * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp:
     24            (WebKit::InjectedBundleRangeHandle::getOrCreate):
     25            * WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h:
     26            (InjectedBundleRangeHandle):
     27
    1282013-02-12  Adenilson Cavalcanti  <cavalcantii@gmail.com>
    229

  • tags/Safari-537.31.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r142690 r142916  
    775775                BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
    776776                BC5C75C814954DA600BC4775 /* WKConnectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */; };
     777                BC5D24C216CD706D007D5461 /* WKDOMNodePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5D24C116CD706D007D5461 /* WKDOMNodePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     778                BC5D24C516CD7088007D5461 /* WKDOMRangePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5D24C416CD7088007D5461 /* WKDOMRangePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     779                BC5D24C716CD73C5007D5461 /* WKBundleRangeHandlePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5D24C616CD73C5007D5461 /* WKBundleRangeHandlePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    777780                BC60C5791240A546008C5E29 /* WKBundleRangeHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60C5771240A546008C5E29 /* WKBundleRangeHandle.h */; settings = {ATTRIBUTES = (Private, ); }; };
    778781                BC60C57A1240A546008C5E29 /* WKBundleRangeHandle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60C5781240A546008C5E29 /* WKBundleRangeHandle.cpp */; };
    … …  
    21892192                BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
    21902193                BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKConnectionInternal.h; sourceTree = "<group>"; };
     2194                BC5D24C116CD706D007D5461 /* WKDOMNodePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMNodePrivate.h; sourceTree = "<group>"; };
     2195                BC5D24C416CD7088007D5461 /* WKDOMRangePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDOMRangePrivate.h; sourceTree = "<group>"; };
     2196                BC5D24C616CD73C5007D5461 /* WKBundleRangeHandlePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleRangeHandlePrivate.h; sourceTree = "<group>"; };
    21912197                BC60C5771240A546008C5E29 /* WKBundleRangeHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundleRangeHandle.h; sourceTree = "<group>"; };
    21922198                BC60C5781240A546008C5E29 /* WKBundleRangeHandle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundleRangeHandle.cpp; sourceTree = "<group>"; };
    … …  
    36433649                                BC017D0516260FF4007054F5 /* WKDOMNode.h */,
    36443650                                BC017D0616260FF4007054F5 /* WKDOMNode.mm */,
     3651                                BC5D24C116CD706D007D5461 /* WKDOMNodePrivate.h */,
    36453652                                BC39C4341626366F008BC689 /* WKDOMRange.h */,
    36463653                                BC39C4331626366F008BC689 /* WKDOMRange.mm */,
     3654                                BC5D24C416CD7088007D5461 /* WKDOMRangePrivate.h */,
    36473655                                293EBEA91627D9C9005F89F1 /* WKDOMText.h */,
    36483656                                293EBEAA1627D9C9005F89F1 /* WKDOMText.mm */,
    … …  
    42414249                                BC60C5781240A546008C5E29 /* WKBundleRangeHandle.cpp */,
    42424250                                BC60C5771240A546008C5E29 /* WKBundleRangeHandle.h */,
     4251                                BC5D24C616CD73C5007D5461 /* WKBundleRangeHandlePrivate.h */,
    42434252                                BC14DF9C120B635F00826C0C /* WKBundleScriptWorld.cpp */,
    42444253                                BC14DF9D120B635F00826C0C /* WKBundleScriptWorld.h */,
    … …  
    55545563                                BCAF35EA16CA253B00D4E9FC /* OfflineStorageProcessCreationParameters.h in Headers */,
    55555564                                514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */,
     5565                                BC5D24C216CD706D007D5461 /* WKDOMNodePrivate.h in Headers */,
     5566                                BC5D24C516CD7088007D5461 /* WKDOMRangePrivate.h in Headers */,
     5567                                BC5D24C716CD73C5007D5461 /* WKBundleRangeHandlePrivate.h in Headers */,
    55565568                        );
    55575569                        runOnlyForDeploymentPostprocessing = 0;

  • tags/Safari-537.31.1/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleRangeHandle.cpp

    r95901 r142916  
    2626#include "config.h"
    2727#include "WKBundleRangeHandle.h"
     28#include "WKBundleRangeHandlePrivate.h"
    2829
    2930#include "InjectedBundleRangeHandle.h"
    … …  
    3738    return toAPI(InjectedBundleRangeHandle::APIType);
    3839}
     40
     41WKBundleRangeHandleRef WKBundleRangeHandleCreate(JSContextRef contextRef, JSObjectRef objectRef)
     42{
     43    RefPtr<InjectedBundleRangeHandle> rangeHandle = InjectedBundleRangeHandle::getOrCreate(contextRef, objectRef);
     44    return toAPI(rangeHandle.release().leakRef());
     45}

  • tags/Safari-537.31.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMNode.mm

    r132282 r142916  
    3030#import "WKDOMNode.h"
    3131
     32#import "InjectedBundleNodeHandle.h"
     33#import "WKBundleAPICast.h"
    3234#import "WKDOMInternals.h"
    3335#import <WebCore/Document.h>
    … …  
    116118@end
    117119
     120@implementation WKDOMNode (WKPrivate)
     121
     122- (WKBundleNodeHandleRef)_copyBundleNodeHandleRef
     123{
     124    RefPtr<WebKit::InjectedBundleNodeHandle> nodeHandle = WebKit::InjectedBundleNodeHandle::getOrCreate(_impl.get());
     125    return toAPI(nodeHandle.release().leakRef());
     126}
     127
     128@end
     129
    118130#endif // defined(__LP64__) && defined(__clang__)

  • tags/Safari-537.31.1/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMRange.mm

    r132282 r142916  
    3030#import "WKDOMRange.h"
    3131
     32#import "InjectedBundleRangeHandle.h"
     33#import "WKBundleAPICast.h"
    3234#import "WKDOMInternals.h"
    3335#import <WebCore/Document.h>
    … …  
    148150@end
    149151
     152@implementation WKDOMRange (WKPrivate)
     153
     154- (WKBundleRangeHandleRef)_copyBundleRangeHandleRef
     155{
     156    RefPtr<WebKit::InjectedBundleRangeHandle> rangeHandle = WebKit::InjectedBundleRangeHandle::getOrCreate(_impl.get());
     157    return toAPI(rangeHandle.release().leakRef());
     158}
     159
     160@end
     161
    150162#endif // defined(__LP64__) && defined(__clang__)

  • tags/Safari-537.31.1/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp

    r130612 r142916  
    2727#include "InjectedBundleRangeHandle.h"
    2828
     29#include <JavaScriptCore/APICast.h>
     30#include <WebCore/JSRange.h>
    2931#include <WebCore/Range.h>
    3032#include <wtf/HashMap.h>
    … …  
    4042    DEFINE_STATIC_LOCAL(DOMHandleCache, cache, ());
    4143    return cache;
     44}
     45
     46PassRefPtr<InjectedBundleRangeHandle> InjectedBundleRangeHandle::getOrCreate(JSContextRef, JSObjectRef object)
     47{
     48    Range* range = toRange(toJS(object));
     49    return getOrCreate(range);
    4250}
    4351

  • tags/Safari-537.31.1/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.h

    r95901 r142916  
    2828
    2929#include "APIObject.h"
     30#include <JavaScriptCore/JSBase.h>
    3031#include <wtf/PassRefPtr.h>
    3132#include <wtf/RefPtr.h>
    … …  
    4344    static const Type APIType = TypeBundleRangeHandle;
    4445
     46    static PassRefPtr<InjectedBundleRangeHandle> getOrCreate(JSContextRef, JSObjectRef);
    4547    static PassRefPtr<InjectedBundleRangeHandle> getOrCreate(WebCore::Range*);
    4648
Note: See TracChangeset for help on using the changeset viewer.