Changeset 193972 in webkit


Ignore:
Timestamp:
Dec 11, 2015 12:56:12 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

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

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-12-11
Reviewed by Dan Bernstein.

Source/JavaScriptCore:

  • llvm/InitializeLLVMMac.cpp:

Remove stale comment. The ObjC class this comment referenced
has already been removed.

Source/WebCore:

  • 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.

Source/WebKit2:

  • UIProcess/ios/WebVideoFullscreenManagerProxy.mm:

(WebKit::WebVideoFullscreenManagerProxy::setupFullscreenWithID):

  • UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h:
  • UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:

(WebKit::RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy):
Rename internal classes with "_WK" prefix.

Tools:

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.

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r193955 r193972  
     12015-12-11  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 Dan Bernstein.
     7
     8        * llvm/InitializeLLVMMac.cpp:
     9        Remove stale comment. The ObjC class this comment referenced
     10        has already been removed.
     11
    1122015-12-11  Benjamin Poulain  <benjamin@webkit.org>
    213
  • trunk/Source/JavaScriptCore/llvm/InitializeLLVMMac.cpp

    r182483 r193972  
    3333#include <wtf/StringPrintStream.h>
    3434
    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 
    3835namespace JSC {
    3936
  • trunk/Source/WebCore/ChangeLog

    r193970 r193972  
     12015-12-11  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 Dan Bernstein.
     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
    1162015-12-11  Brady Eidson  <beidson@apple.com>
    217
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h

    r193479 r193972  
    3535OBJC_CLASS AVContentKeyRequest;
    3636OBJC_CLASS AVContentKeySession;
    37 OBJC_CLASS CDMSessionAVContentKeySessionDelegate;
     37OBJC_CLASS WebCDMSessionAVContentKeySessionDelegate;
    3838
    3939namespace WebCore {
     
    6767
    6868    RetainPtr<AVContentKeySession> m_contentKeySession;
    69     RetainPtr<CDMSessionAVContentKeySessionDelegate> m_contentKeySessionDelegate;
     69    RetainPtr<WebCDMSessionAVContentKeySessionDelegate> m_contentKeySessionDelegate;
    7070    RetainPtr<AVContentKeyRequest> m_keyRequest;
    7171    RefPtr<Uint8Array> m_initData;
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm

    r193479 r193972  
    8181@end
    8282
    83 @interface CDMSessionAVContentKeySessionDelegate : NSObject {
     83@interface WebCDMSessionAVContentKeySessionDelegate : NSObject {
    8484    WebCore::CDMSessionAVContentKeySession *m_parent;
    8585}
     
    8787@end
    8888
    89 @implementation CDMSessionAVContentKeySessionDelegate
     89@implementation WebCDMSessionAVContentKeySessionDelegate
    9090- (id)initWithParent:(WebCore::CDMSessionAVContentKeySession *)parent
    9191{
     
    126126CDMSessionAVContentKeySession::CDMSessionAVContentKeySession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)
    127127    : CDMSessionMediaSourceAVFObjC(cdm, client)
    128     , m_contentKeySessionDelegate(adoptNS([[CDMSessionAVContentKeySessionDelegate alloc] initWithParent:this]))
     128    , m_contentKeySessionDelegate(adoptNS([[WebCDMSessionAVContentKeySessionDelegate alloc] initWithParent:this]))
    129129    , m_protocolVersions(protocolVersions)
    130130    , m_mode(Normal)
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h

    r193479 r193972  
    3535
    3636OBJC_CLASS AVStreamSession;
    37 OBJC_CLASS CDMSessionAVStreamSessionObserver;
     37OBJC_CLASS WebCDMSessionAVStreamSessionObserver;
    3838
    3939namespace WebCore {
     
    6666    RefPtr<Uint8Array> m_certificate;
    6767    RetainPtr<NSData> m_expiredSession;
    68     RetainPtr<CDMSessionAVStreamSessionObserver> m_dataParserObserver;
     68    RetainPtr<WebCDMSessionAVStreamSessionObserver> m_dataParserObserver;
    6969    Vector<int> m_protocolVersions;
    7070    enum { Normal, KeyRelease } m_mode;
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm

    r193479 r193972  
    6767@end
    6868
    69 @interface CDMSessionAVStreamSessionObserver : NSObject {
     69@interface WebCDMSessionAVStreamSessionObserver : NSObject {
    7070    WebCore::CDMSessionAVStreamSession *m_parent;
    7171}
    7272@end
    7373
    74 @implementation CDMSessionAVStreamSessionObserver
     74@implementation WebCDMSessionAVStreamSessionObserver
    7575- (id)initWithParent:(WebCore::CDMSessionAVStreamSession *)parent
    7676{
     
    9999    : CDMSessionMediaSourceAVFObjC(cdm, client)
    100100    , m_weakPtrFactory(this)
    101     , m_dataParserObserver(adoptNS([[CDMSessionAVStreamSessionObserver alloc] initWithParent:this]))
     101    , m_dataParserObserver(adoptNS([[WebCDMSessionAVStreamSessionObserver alloc] initWithParent:this]))
    102102    , m_protocolVersions(protocolVersions)
    103103    , m_mode(Normal)
  • trunk/Source/WebKit2/ChangeLog

    r193944 r193972  
     12015-12-11  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 Dan Bernstein.
     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
    1152015-12-10  Eric Carlson  <eric.carlson@apple.com>
    216
  • trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm

    r193370 r193972  
    4040#import <WebKitSystemInterface.h>
    4141
    42 @interface WebLayerHostView : UIView
     42@interface WKLayerHostView : UIView
    4343@property (nonatomic, assign) uint32_t contextID;
    4444@end
    4545
    46 @implementation WebLayerHostView
     46@implementation WKLayerHostView
    4747
    4848+ (Class)layerClass {
     
    340340    std::tie(model, interface) = ensureModelAndInterface(contextId);
    341341
    342     RetainPtr<WebLayerHostView> view = static_cast<WebLayerHostView*>(model->layerHostView());
     342    RetainPtr<WKLayerHostView> view = static_cast<WKLayerHostView*>(model->layerHostView());
    343343    if (!view) {
    344         view = adoptNS([[WebLayerHostView alloc] init]);
     344        view = adoptNS([[WKLayerHostView alloc] init]);
    345345        model->setLayerHostView(view);
    346346    }
  • trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h

    r185967 r193972  
    3333#include <WebCore/IntSize.h>
    3434
    35 OBJC_CLASS OneShotDisplayLinkHandler;
     35OBJC_CLASS WKOneShotDisplayLinkHandler;
    3636
    3737namespace WebKit {
     
    108108    CallbackMap m_callbacks;
    109109
    110     RetainPtr<OneShotDisplayLinkHandler> m_displayLinkHandler;
     110    RetainPtr<WKOneShotDisplayLinkHandler> m_displayLinkHandler;
    111111};
    112112
  • trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm

    r192712 r193972  
    4646// breaking WebKit1 behavior or WebKit2-WebKit1 coexistence.
    4747#if PLATFORM(IOS)
    48 @interface OneShotDisplayLinkHandler : NSObject {
     48@interface WKOneShotDisplayLinkHandler : NSObject {
    4949    WebKit::RemoteLayerTreeDrawingAreaProxy* _drawingAreaProxy;
    5050    CADisplayLink *_displayLink;
     
    5858@end
    5959
    60 @implementation OneShotDisplayLinkHandler
     60@implementation WKOneShotDisplayLinkHandler
    6161
    6262- (id)initWithDrawingAreaProxy:(WebKit::RemoteLayerTreeDrawingAreaProxy*)drawingAreaProxy
     
    105105    , m_remoteLayerTreeHost(*this)
    106106#if PLATFORM(IOS)
    107     , m_displayLinkHandler(adoptNS([[OneShotDisplayLinkHandler alloc] initWithDrawingAreaProxy:this]))
     107    , m_displayLinkHandler(adoptNS([[WKOneShotDisplayLinkHandler alloc] initWithDrawingAreaProxy:this]))
    108108#endif
    109109{
  • trunk/Tools/ChangeLog

    r193944 r193972  
     12015-12-11  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 Dan Bernstein.
     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
    1142015-12-10  Eric Carlson  <eric.carlson@apple.com>
    215
  • trunk/Tools/Scripts/check-for-inappropriate-objc-class-names

    r177949 r193972  
    6161
    6262if (!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 |") {
    6464        print "ERROR: Could not open $executablePath\n";
    6565        $sawError = 1;
Note: See TracChangeset for help on using the changeset viewer.