Attachment #267154 for bug #152156

View Details Raw Unified Return to Bug 152156

| Differences between



2015-12-10  Joseph Pecoraro  <pecoraro@apple.com>

        check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
        https://bugs.webkit.org/show_bug.cgi?id=152156

        Reviewed by NOBODY (OOPS!).

        * llvm/InitializeLLVMMac.cpp:
        Remove stale comment. The ObjC class this comment referenced
        has already been removed.

2015-12-10  Joseph Pecoraro  <pecoraro@apple.com>

        Remote Inspector: Verify the identity of the other side of XPC connections
        https://bugs.webkit.org/show_bug.cgi?id=152153




#include "InitializeLLVMPOSIX.h"
#include <wtf/StringPrintStream.h>

// Use the "JS" prefix to make check-for-inappropriate-objc-class-names happy. I
// think this is better than hacking that script.

namespace JSC {

LLVMInitializerFunction getLLVMInitializerFunction(bool verbose)



2015-12-10  Joseph Pecoraro  <pecoraro@apple.com>

        check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
        https://bugs.webkit.org/show_bug.cgi?id=152156

        Reviewed by NOBODY (OOPS!).

        * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h:
        * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
        (WebCore::CDMSessionAVContentKeySession::CDMSessionAVContentKeySession):
        * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h:
        * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
        (WebCore::CDMSessionAVStreamSession::CDMSessionAVStreamSession):
        Rename classes with a "Web" prefix.

2015-12-10  Joseph Pecoraro  <pecoraro@apple.com>

        Remote Inspector: Verify the identity of the other side of XPC connections
        https://bugs.webkit.org/show_bug.cgi?id=152153





OBJC_CLASS AVContentKeyRequest;
OBJC_CLASS AVContentKeySession;
OBJC_CLASS WebCDMSessionAVContentKeySessionDelegate;

namespace WebCore {


    AVContentKeySession* contentKeySession();

    RetainPtr<AVContentKeySession> m_contentKeySession;
    RetainPtr<WebCDMSessionAVContentKeySessionDelegate> m_contentKeySessionDelegate;
    RetainPtr<AVContentKeyRequest> m_keyRequest;
    RefPtr<Uint8Array> m_initData;
    RetainPtr<NSData> m_expiredSession;



- (void)renewExpiringContentKeyResponseData;
@end

@interface WebCDMSessionAVContentKeySessionDelegate : NSObject {
    WebCore::CDMSessionAVContentKeySession *m_parent;
}
- (void)invalidate;
@end

@implementation WebCDMSessionAVContentKeySessionDelegate
- (id)initWithParent:(WebCore::CDMSessionAVContentKeySession *)parent
{
    if ((self = [super init]))


CDMSessionAVContentKeySession::CDMSessionAVContentKeySession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)
    : CDMSessionMediaSourceAVFObjC(cdm, client)
    , m_contentKeySessionDelegate(adoptNS([[WebCDMSessionAVContentKeySessionDelegate alloc] initWithParent:this]))
    , m_protocolVersions(protocolVersions)
    , m_mode(Normal)
{



#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)

OBJC_CLASS AVStreamSession;
OBJC_CLASS WebCDMSessionAVStreamSessionObserver;

namespace WebCore {


    RefPtr<Uint8Array> m_initData;
    RefPtr<Uint8Array> m_certificate;
    RetainPtr<NSData> m_expiredSession;
    RetainPtr<WebCDMSessionAVStreamSessionObserver> m_dataParserObserver;
    Vector<int> m_protocolVersions;
    enum { Normal, KeyRelease } m_mode;
};



+ (void)removePendingExpiredSessionReports:(NSArray *)expiredSessionReports withAppIdentifier:(NSData *)appIdentifier storageDirectoryAtURL:(NSURL *)storageURL;
@end

@interface WebCDMSessionAVStreamSessionObserver : NSObject {
    WebCore::CDMSessionAVStreamSession *m_parent;
}
@end

@implementation WebCDMSessionAVStreamSessionObserver
- (id)initWithParent:(WebCore::CDMSessionAVStreamSession *)parent
{
    if ((self = [super init]))

CDMSessionAVStreamSession::CDMSessionAVStreamSession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)
    : CDMSessionMediaSourceAVFObjC(cdm, client)
    , m_weakPtrFactory(this)
    , m_dataParserObserver(adoptNS([[WebCDMSessionAVStreamSessionObserver alloc] initWithParent:this]))
    , m_protocolVersions(protocolVersions)
    , m_mode(Normal)
{



2015-12-10  Joseph Pecoraro  <pecoraro@apple.com>

        check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
        https://bugs.webkit.org/show_bug.cgi?id=152156

        Reviewed by NOBODY (OOPS!).

        * UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
        (WebKit::WebVideoFullscreenManagerProxy::setupFullscreenWithID):
        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
        (WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
        Rename internal classes with "_WK" prefix.

2015-12-10  Joseph Pecoraro  <pecoraro@apple.com>

        Remote Inspector: Verify the identity of the other side of XPC connections
        https://bugs.webkit.org/show_bug.cgi?id=152153




#import <WebCore/TimeRanges.h>
#import <WebKitSystemInterface.h>

@interface WKLayerHostView : UIView
@property (nonatomic, assign) uint32_t contextID;
@end

@implementation WKLayerHostView

+ (Class)layerClass {
    return [CALayerHost class];


    std::tie(model, interface) = ensureModelAndInterface(contextId);

    RetainPtr<WKLayerHostView> view = static_cast<WKLayerHostView*>(model->layerHostView());
    if (!view) {
        view = adoptNS([[WKLayerHostView alloc] init]);
        model->setLayerHostView(view);
    }
    [view setContextID:videoLayerID];



#include <WebCore/IntPoint.h>
#include <WebCore/IntSize.h>

OBJC_CLASS WKOneShotDisplayLinkHandler;

namespace WebKit {



    CallbackMap m_callbacks;

    RetainPtr<WKOneShotDisplayLinkHandler> m_displayLinkHandler;
};

} // namespace WebKit



// FIXME: Mac will need something similar; we should figure out how to share this with DisplayRefreshMonitor without
// breaking WebKit1 behavior or WebKit2-WebKit1 coexistence.
#if PLATFORM(IOS)
@interface WKOneShotDisplayLinkHandler : NSObject {
    WebKit::RemoteLayerTreeDrawingAreaProxy* _drawingAreaProxy;
    CADisplayLink *_displayLink;
}


@end

@implementation WKOneShotDisplayLinkHandler

- (id)initWithDrawingAreaProxy:(WebKit::RemoteLayerTreeDrawingAreaProxy*)drawingAreaProxy
{

    : DrawingAreaProxy(DrawingAreaTypeRemoteLayerTree, webPageProxy)
    , m_remoteLayerTreeHost(*this)
#if PLATFORM(IOS)
    , m_displayLinkHandler(adoptNS([[WKOneShotDisplayLinkHandler alloc] initWithDrawingAreaProxy:this]))
#endif
{
#if USE(IOSURFACE)



2015-12-10  Joseph Pecoraro  <pecoraro@apple.com>

        check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
        https://bugs.webkit.org/show_bug.cgi?id=152156

        Reviewed by NOBODY (OOPS!).

        Our frameworks should appropriately prefix all ObjC classes,
        not just external symbols.

        * Scripts/check-for-inappropriate-objc-class-names:
        Remove the -g switch to check all ObjC class names.

2015-12-10  Alex Christensen  <achristensen@webkit.org>

        REGRESSION (r192796) WKBundlePageResourceLoadClient should be able to setHTTPBody in willSendRequestForFrame

Lines 60-66 my $pattern = "^(" . join('\|', @allowedPrefixes) . ")"; a/Tools/Scripts/check-for-inappropriate-objc-class-names_sec1
- a/Tools/Scripts/check-for-inappropriate-objc-class-names -1 / +1 lines
60	my $sawError = 0;	60	my $sawError = 0;
61		61
62	if (!defined $executablePathAge \|\| !defined $buildTimestampAge \|\| $executablePathAge < $buildTimestampAge \|\| $scriptAge < $buildTimestampAge) {	62	if (!defined $executablePathAge \|\| !defined $buildTimestampAge \|\| $executablePathAge < $buildTimestampAge \|\| $scriptAge < $buildTimestampAge) {
63	if (!open NM, "(nm -Ugjp '$executablePath' \| sed 's/^/STDOUT:/') 2>&1 \|") {	63	if (!open NM, "(nm -Ujp '$executablePath' \| sed 's/^/STDOUT:/') 2>&1 \|") {
64	print "ERROR: Could not open $executablePath\n";	64	print "ERROR: Could not open $executablePath\n";
65	$sawError = 1;	65	$sawError = 1;
66	next;	66	next;

Return to Bug 152156

Lines 32-40 a/Source/JavaScriptCore/llvm/InitializeLLVMMac.cpp_sec1
- a/Source/JavaScriptCore/llvm/InitializeLLVMMac.cpp -3 lines
32	#include "InitializeLLVMPOSIX.h"	32	#include "InitializeLLVMPOSIX.h"
33	#include <wtf/StringPrintStream.h>	33	#include <wtf/StringPrintStream.h>
34		34
35	// Use the "JS" prefix to make check-for-inappropriate-objc-class-names happy. I
36	// think this is better than hacking that script.
37
38	namespace JSC {	35	namespace JSC {
39		36
40	LLVMInitializerFunction getLLVMInitializerFunction(bool verbose)	37	LLVMInitializerFunction getLLVMInitializerFunction(bool verbose)

Lines 34-40 a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h_sec1
- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h -2 / +2 lines
34		34
35	OBJC_CLASS AVContentKeyRequest;	35	OBJC_CLASS AVContentKeyRequest;
36	OBJC_CLASS AVContentKeySession;	36	OBJC_CLASS AVContentKeySession;
37	OBJC_CLASS CDMSessionAVContentKeySessionDelegate;	37	OBJC_CLASS WebCDMSessionAVContentKeySessionDelegate;
38		38
39	namespace WebCore {	39	namespace WebCore {
40		40
Lines 66-72 protected: a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h_sec2
66	AVContentKeySession* contentKeySession();	66	AVContentKeySession* contentKeySession();
67		67
68	RetainPtr<AVContentKeySession> m_contentKeySession;	68	RetainPtr<AVContentKeySession> m_contentKeySession;
69	RetainPtr<CDMSessionAVContentKeySessionDelegate> m_contentKeySessionDelegate;	69	RetainPtr<WebCDMSessionAVContentKeySessionDelegate> m_contentKeySessionDelegate;
70	RetainPtr<AVContentKeyRequest> m_keyRequest;	70	RetainPtr<AVContentKeyRequest> m_keyRequest;
71	RefPtr<Uint8Array> m_initData;	71	RefPtr<Uint8Array> m_initData;
72	RetainPtr<NSData> m_expiredSession;	72	RetainPtr<NSData> m_expiredSession;

Lines 80-92 - (void)processContentKeyResponseError:(NSError *)error; a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm_sec1
- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm -3 / +3 lines
80	- (void)renewExpiringContentKeyResponseData;	80	- (void)renewExpiringContentKeyResponseData;
81	@end	81	@end
82		82
83	@interface CDMSessionAVContentKeySessionDelegate : NSObject {	83	@interface WebCDMSessionAVContentKeySessionDelegate : NSObject {
84	WebCore::CDMSessionAVContentKeySession *m_parent;	84	WebCore::CDMSessionAVContentKeySession *m_parent;
85	}	85	}
86	- (void)invalidate;	86	- (void)invalidate;
87	@end	87	@end
88		88
89	@implementation CDMSessionAVContentKeySessionDelegate	89	@implementation WebCDMSessionAVContentKeySessionDelegate
90	- (id)initWithParent:(WebCore::CDMSessionAVContentKeySession *)parent	90	- (id)initWithParent:(WebCore::CDMSessionAVContentKeySession *)parent
91	{	91	{
92	if ((self = [super init]))	92	if ((self = [super init]))
Lines 125-131 namespace WebCore { a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm_sec2
125		125
126	CDMSessionAVContentKeySession::CDMSessionAVContentKeySession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)	126	CDMSessionAVContentKeySession::CDMSessionAVContentKeySession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)
127	: CDMSessionMediaSourceAVFObjC(cdm, client)	127	: CDMSessionMediaSourceAVFObjC(cdm, client)
128	, m_contentKeySessionDelegate(adoptNS([[CDMSessionAVContentKeySessionDelegate alloc] initWithParent:this]))	128	, m_contentKeySessionDelegate(adoptNS([[WebCDMSessionAVContentKeySessionDelegate alloc] initWithParent:this]))
129	, m_protocolVersions(protocolVersions)	129	, m_protocolVersions(protocolVersions)
130	, m_mode(Normal)	130	, m_mode(Normal)
131	{	131	{

Lines 66-77 + (NSArray )pendingExpiredSessionReportsWithAppIdentifier:(NSData )appIdentifi a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm_sec1
- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm -3 / +3 lines
66	+ (void)removePendingExpiredSessionReports:(NSArray )expiredSessionReports withAppIdentifier:(NSData )appIdentifier storageDirectoryAtURL:(NSURL *)storageURL;	66	+ (void)removePendingExpiredSessionReports:(NSArray )expiredSessionReports withAppIdentifier:(NSData )appIdentifier storageDirectoryAtURL:(NSURL *)storageURL;
67	@end	67	@end
68		68
69	@interface CDMSessionAVStreamSessionObserver : NSObject {	69	@interface WebCDMSessionAVStreamSessionObserver : NSObject {
70	WebCore::CDMSessionAVStreamSession *m_parent;	70	WebCore::CDMSessionAVStreamSession *m_parent;
71	}	71	}
72	@end	72	@end
73		73
74	@implementation CDMSessionAVStreamSessionObserver	74	@implementation WebCDMSessionAVStreamSessionObserver
75	- (id)initWithParent:(WebCore::CDMSessionAVStreamSession *)parent	75	- (id)initWithParent:(WebCore::CDMSessionAVStreamSession *)parent
76	{	76	{
77	if ((self = [super init]))	77	if ((self = [super init]))
Lines 98-104 namespace WebCore { a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm_sec2
98	CDMSessionAVStreamSession::CDMSessionAVStreamSession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)	98	CDMSessionAVStreamSession::CDMSessionAVStreamSession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)
99	: CDMSessionMediaSourceAVFObjC(cdm, client)	99	: CDMSessionMediaSourceAVFObjC(cdm, client)
100	, m_weakPtrFactory(this)	100	, m_weakPtrFactory(this)
101	, m_dataParserObserver(adoptNS([[CDMSessionAVStreamSessionObserver alloc] initWithParent:this]))	101	, m_dataParserObserver(adoptNS([[WebCDMSessionAVStreamSessionObserver alloc] initWithParent:this]))
102	, m_protocolVersions(protocolVersions)	102	, m_protocolVersions(protocolVersions)
103	, m_mode(Normal)	103	, m_mode(Normal)
104	{	104	{

Lines 39-49 a/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm_sec1
- a/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm -4 / +4 lines
39	#import <WebCore/TimeRanges.h>	39	#import <WebCore/TimeRanges.h>
40	#import <WebKitSystemInterface.h>	40	#import <WebKitSystemInterface.h>
41		41
42	@interface WebLayerHostView : UIView	42	@interface WKLayerHostView : UIView
43	@property (nonatomic, assign) uint32_t contextID;	43	@property (nonatomic, assign) uint32_t contextID;
44	@end	44	@end
45		45
46	@implementation WebLayerHostView	46	@implementation WKLayerHostView
47		47
48	+ (Class)layerClass {	48	+ (Class)layerClass {
49	return [CALayerHost class];	49	return [CALayerHost class];
Lines 339-347 void WebVideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, u a/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm_sec2
339		339
340	std::tie(model, interface) = ensureModelAndInterface(contextId);	340	std::tie(model, interface) = ensureModelAndInterface(contextId);
341		341
342	RetainPtr<WebLayerHostView> view = static_cast<WebLayerHostView*>(model->layerHostView());	342	RetainPtr<WKLayerHostView> view = static_cast<WKLayerHostView*>(model->layerHostView());
343	if (!view) {	343	if (!view) {
344	view = adoptNS([[WebLayerHostView alloc] init]);	344	view = adoptNS([[WKLayerHostView alloc] init]);
345	model->setLayerHostView(view);	345	model->setLayerHostView(view);
346	}	346	}
347	[view setContextID:videoLayerID];	347	[view setContextID:videoLayerID];

Lines 1-5 a/Source/JavaScriptCore/ChangeLog_sec1
- a/Source/JavaScriptCore/ChangeLog +11 lines
1	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>	1	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>
2		2
		3	check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
		4	https://bugs.webkit.org/show_bug.cgi?id=152156
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* llvm/InitializeLLVMMac.cpp:
		9	Remove stale comment. The ObjC class this comment referenced
		10	has already been removed.
		11
		12	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>
		13
3	Remote Inspector: Verify the identity of the other side of XPC connections	14	Remote Inspector: Verify the identity of the other side of XPC connections
4	https://bugs.webkit.org/show_bug.cgi?id=152153	15	https://bugs.webkit.org/show_bug.cgi?id=152153
5		16

Lines 1-5 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +15 lines
1	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>	1	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>
2		2
		3	check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
		4	https://bugs.webkit.org/show_bug.cgi?id=152156
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h:
		9	* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
		10	(WebCore::CDMSessionAVContentKeySession::CDMSessionAVContentKeySession):
		11	* platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h:
		12	* platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
		13	(WebCore::CDMSessionAVStreamSession::CDMSessionAVStreamSession):
		14	Rename classes with a "Web" prefix.
		15
		16	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>
		17
3	Remote Inspector: Verify the identity of the other side of XPC connections	18	Remote Inspector: Verify the identity of the other side of XPC connections
4	https://bugs.webkit.org/show_bug.cgi?id=152153	19	https://bugs.webkit.org/show_bug.cgi?id=152153
5		20

Lines 34-40 a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h_sec1
- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h -2 / +2 lines
34	#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)	34	#if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
35		35
36	OBJC_CLASS AVStreamSession;	36	OBJC_CLASS AVStreamSession;
37	OBJC_CLASS CDMSessionAVStreamSessionObserver;	37	OBJC_CLASS WebCDMSessionAVStreamSessionObserver;
38		38
39	namespace WebCore {	39	namespace WebCore {
40		40
Lines 65-71 protected: a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h_sec2
65	RefPtr<Uint8Array> m_initData;	65	RefPtr<Uint8Array> m_initData;
66	RefPtr<Uint8Array> m_certificate;	66	RefPtr<Uint8Array> m_certificate;
67	RetainPtr<NSData> m_expiredSession;	67	RetainPtr<NSData> m_expiredSession;
68	RetainPtr<CDMSessionAVStreamSessionObserver> m_dataParserObserver;	68	RetainPtr<WebCDMSessionAVStreamSessionObserver> m_dataParserObserver;
69	Vector<int> m_protocolVersions;	69	Vector<int> m_protocolVersions;
70	enum { Normal, KeyRelease } m_mode;	70	enum { Normal, KeyRelease } m_mode;
71	};	71	};

Lines 1-5 a/Source/WebKit2/ChangeLog_sec1
- a/Source/WebKit2/ChangeLog +14 lines
1	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>	1	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>
2		2
		3	check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
		4	https://bugs.webkit.org/show_bug.cgi?id=152156
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* UIProcess/ios/WebVideoFullscreenManagerProxy.mm:
		9	(WebKit::WebVideoFullscreenManagerProxy::setupFullscreenWithID):
		10	* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
		11	* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
		12	(WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
		13	Rename internal classes with "_WK" prefix.
		14
		15	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>
		16
3	Remote Inspector: Verify the identity of the other side of XPC connections	17	Remote Inspector: Verify the identity of the other side of XPC connections
4	https://bugs.webkit.org/show_bug.cgi?id=152153	18	https://bugs.webkit.org/show_bug.cgi?id=152153
5		19

Lines 32-38 a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h_sec1
- a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h -2 / +2 lines
32	#include <WebCore/IntPoint.h>	32	#include <WebCore/IntPoint.h>
33	#include <WebCore/IntSize.h>	33	#include <WebCore/IntSize.h>
34		34
35	OBJC_CLASS OneShotDisplayLinkHandler;	35	OBJC_CLASS WKOneShotDisplayLinkHandler;
36		36
37	namespace WebKit {	37	namespace WebKit {
38		38
Lines 107-113 private: a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h_sec2
107		107
108	CallbackMap m_callbacks;	108	CallbackMap m_callbacks;
109		109
110	RetainPtr<OneShotDisplayLinkHandler> m_displayLinkHandler;	110	RetainPtr<WKOneShotDisplayLinkHandler> m_displayLinkHandler;
111	};	111	};
112		112
113	} // namespace WebKit	113	} // namespace WebKit

Lines 45-51 using namespace WebCore; a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm_sec1
- a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm -3 / +3 lines
45	// FIXME: Mac will need something similar; we should figure out how to share this with DisplayRefreshMonitor without	45	// FIXME: Mac will need something similar; we should figure out how to share this with DisplayRefreshMonitor without
46	// breaking WebKit1 behavior or WebKit2-WebKit1 coexistence.	46	// breaking WebKit1 behavior or WebKit2-WebKit1 coexistence.
47	#if PLATFORM(IOS)	47	#if PLATFORM(IOS)
48	@interface OneShotDisplayLinkHandler : NSObject {	48	@interface WKOneShotDisplayLinkHandler : NSObject {
49	WebKit::RemoteLayerTreeDrawingAreaProxy* _drawingAreaProxy;	49	WebKit::RemoteLayerTreeDrawingAreaProxy* _drawingAreaProxy;
50	CADisplayLink *_displayLink;	50	CADisplayLink *_displayLink;
51	}	51	}
Lines 57-63 - (void)schedule; a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm_sec2
57		57
58	@end	58	@end
59		59
60	@implementation OneShotDisplayLinkHandler	60	@implementation WKOneShotDisplayLinkHandler
61		61
62	- (id)initWithDrawingAreaProxy:(WebKit::RemoteLayerTreeDrawingAreaProxy*)drawingAreaProxy	62	- (id)initWithDrawingAreaProxy:(WebKit::RemoteLayerTreeDrawingAreaProxy*)drawingAreaProxy
63	{	63	{
Lines 104-110 RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy(WebPageProxy& w a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm_sec3
104	: DrawingAreaProxy(DrawingAreaTypeRemoteLayerTree, webPageProxy)	104	: DrawingAreaProxy(DrawingAreaTypeRemoteLayerTree, webPageProxy)
105	, m_remoteLayerTreeHost(*this)	105	, m_remoteLayerTreeHost(*this)
106	#if PLATFORM(IOS)	106	#if PLATFORM(IOS)
107	, m_displayLinkHandler(adoptNS([[OneShotDisplayLinkHandler alloc] initWithDrawingAreaProxy:this]))	107	, m_displayLinkHandler(adoptNS([[WKOneShotDisplayLinkHandler alloc] initWithDrawingAreaProxy:this]))
108	#endif	108	#endif
109	{	109	{
110	#if USE(IOSURFACE)	110	#if USE(IOSURFACE)

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +13 lines
		1	2015-12-10 Joseph Pecoraro <pecoraro@apple.com>
		2
		3	check-for-inappropriate-objc-class-names should check all class names, not just externally visible ones
		4	https://bugs.webkit.org/show_bug.cgi?id=152156
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Our frameworks should appropriately prefix all ObjC classes,
		9	not just external symbols.
		10
		11	* Scripts/check-for-inappropriate-objc-class-names:
		12	Remove the -g switch to check all ObjC class names.
		13
1	2015-12-10 Alex Christensen <achristensen@webkit.org>	14	2015-12-10 Alex Christensen <achristensen@webkit.org>
2		15
3	REGRESSION (r192796) WKBundlePageResourceLoadClient should be able to setHTTPBody in willSendRequestForFrame	16	REGRESSION (r192796) WKBundlePageResourceLoadClient should be able to setHTTPBody in willSendRequestForFrame