Attachment 267154 Details for Bug 152156 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

v4.patch (text/plain), 13.33 KB, created by Joseph Pecoraro on 2015-12-10 19:52:35 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2015-12-10 19:52:35 PST

Size: 13.33 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index a87d0c7..64e4d2b 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,5 +1,16 @@
> 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
> 
>diff --git a/Source/JavaScriptCore/llvm/InitializeLLVMMac.cpp b/Source/JavaScriptCore/llvm/InitializeLLVMMac.cpp
>index ade7ff4..4183fe5 100644
>--- a/Source/JavaScriptCore/llvm/InitializeLLVMMac.cpp
>+++ b/Source/JavaScriptCore/llvm/InitializeLLVMMac.cpp
>@@ -32,9 +32,6 @@
> #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)
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e52cd6d..6bfd454 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,5 +1,20 @@
> 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
> 
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h
>index 7b2791e..9186fcc 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h
>@@ -34,7 +34,7 @@
> 
> OBJC_CLASS AVContentKeyRequest;
> OBJC_CLASS AVContentKeySession;
>-OBJC_CLASS CDMSessionAVContentKeySessionDelegate;
>+OBJC_CLASS WebCDMSessionAVContentKeySessionDelegate;
> 
> namespace WebCore {
> 
>@@ -66,7 +66,7 @@ protected:
>     AVContentKeySession* contentKeySession();
> 
>     RetainPtr<AVContentKeySession> m_contentKeySession;
>-    RetainPtr<CDMSessionAVContentKeySessionDelegate> m_contentKeySessionDelegate;
>+    RetainPtr<WebCDMSessionAVContentKeySessionDelegate> m_contentKeySessionDelegate;
>     RetainPtr<AVContentKeyRequest> m_keyRequest;
>     RefPtr<Uint8Array> m_initData;
>     RetainPtr<NSData> m_expiredSession;
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
>index d36be54..0db165f 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
>@@ -80,13 +80,13 @@ - (void)processContentKeyResponseError:(NSError *)error;
> - (void)renewExpiringContentKeyResponseData;
> @end
> 
>-@interface CDMSessionAVContentKeySessionDelegate : NSObject {
>+@interface WebCDMSessionAVContentKeySessionDelegate : NSObject {
>     WebCore::CDMSessionAVContentKeySession *m_parent;
> }
> - (void)invalidate;
> @end
> 
>-@implementation CDMSessionAVContentKeySessionDelegate
>+@implementation WebCDMSessionAVContentKeySessionDelegate
> - (id)initWithParent:(WebCore::CDMSessionAVContentKeySession *)parent
> {
>     if ((self = [super init]))
>@@ -125,7 +125,7 @@ namespace WebCore {
> 
> CDMSessionAVContentKeySession::CDMSessionAVContentKeySession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)
>     : CDMSessionMediaSourceAVFObjC(cdm, client)
>-    , m_contentKeySessionDelegate(adoptNS([[CDMSessionAVContentKeySessionDelegate alloc] initWithParent:this]))
>+    , m_contentKeySessionDelegate(adoptNS([[WebCDMSessionAVContentKeySessionDelegate alloc] initWithParent:this]))
>     , m_protocolVersions(protocolVersions)
>     , m_mode(Normal)
> {
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h
>index 5576ac6..da57c47 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h
>@@ -34,7 +34,7 @@
> #if ENABLE(ENCRYPTED_MEDIA_V2) && ENABLE(MEDIA_SOURCE)
> 
> OBJC_CLASS AVStreamSession;
>-OBJC_CLASS CDMSessionAVStreamSessionObserver;
>+OBJC_CLASS WebCDMSessionAVStreamSessionObserver;
> 
> namespace WebCore {
> 
>@@ -65,7 +65,7 @@ protected:
>     RefPtr<Uint8Array> m_initData;
>     RefPtr<Uint8Array> m_certificate;
>     RetainPtr<NSData> m_expiredSession;
>-    RetainPtr<CDMSessionAVStreamSessionObserver> m_dataParserObserver;
>+    RetainPtr<WebCDMSessionAVStreamSessionObserver> m_dataParserObserver;
>     Vector<int> m_protocolVersions;
>     enum { Normal, KeyRelease } m_mode;
> };
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
>index 5b1afbf..7db8bf8 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
>@@ -66,12 +66,12 @@ + (NSArray *)pendingExpiredSessionReportsWithAppIdentifier:(NSData *)appIdentifi
> + (void)removePendingExpiredSessionReports:(NSArray *)expiredSessionReports withAppIdentifier:(NSData *)appIdentifier storageDirectoryAtURL:(NSURL *)storageURL;
> @end
> 
>-@interface CDMSessionAVStreamSessionObserver : NSObject {
>+@interface WebCDMSessionAVStreamSessionObserver : NSObject {
>     WebCore::CDMSessionAVStreamSession *m_parent;
> }
> @end
> 
>-@implementation CDMSessionAVStreamSessionObserver
>+@implementation WebCDMSessionAVStreamSessionObserver
> - (id)initWithParent:(WebCore::CDMSessionAVStreamSession *)parent
> {
>     if ((self = [super init]))
>@@ -98,7 +98,7 @@ namespace WebCore {
> CDMSessionAVStreamSession::CDMSessionAVStreamSession(const Vector<int>& protocolVersions, CDMPrivateMediaSourceAVFObjC& cdm, CDMSessionClient* client)
>     : CDMSessionMediaSourceAVFObjC(cdm, client)
>     , m_weakPtrFactory(this)
>-    , m_dataParserObserver(adoptNS([[CDMSessionAVStreamSessionObserver alloc] initWithParent:this]))
>+    , m_dataParserObserver(adoptNS([[WebCDMSessionAVStreamSessionObserver alloc] initWithParent:this]))
>     , m_protocolVersions(protocolVersions)
>     , m_mode(Normal)
> {
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index d08bfb8..5629f7d 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,19 @@
> 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
> 
>diff --git a/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm b/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm
>index bfec5b8..2c27c04 100644
>--- a/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm
>+++ b/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm
>@@ -39,11 +39,11 @@
> #import <WebCore/TimeRanges.h>
> #import <WebKitSystemInterface.h>
> 
>-@interface WebLayerHostView : UIView
>+@interface WKLayerHostView : UIView
> @property (nonatomic, assign) uint32_t contextID;
> @end
> 
>-@implementation WebLayerHostView
>+@implementation WKLayerHostView
> 
> + (Class)layerClass {
>     return [CALayerHost class];
>@@ -339,9 +339,9 @@ void WebVideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, u
> 
>     std::tie(model, interface) = ensureModelAndInterface(contextId);
> 
>-    RetainPtr<WebLayerHostView> view = static_cast<WebLayerHostView*>(model->layerHostView());
>+    RetainPtr<WKLayerHostView> view = static_cast<WKLayerHostView*>(model->layerHostView());
>     if (!view) {
>-        view = adoptNS([[WebLayerHostView alloc] init]);
>+        view = adoptNS([[WKLayerHostView alloc] init]);
>         model->setLayerHostView(view);
>     }
>     [view setContextID:videoLayerID];
>diff --git a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h
>index 015f63e..ee13cc1 100644
>--- a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h
>+++ b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h
>@@ -32,7 +32,7 @@
> #include <WebCore/IntPoint.h>
> #include <WebCore/IntSize.h>
> 
>-OBJC_CLASS OneShotDisplayLinkHandler;
>+OBJC_CLASS WKOneShotDisplayLinkHandler;
> 
> namespace WebKit {
> 
>@@ -107,7 +107,7 @@ private:
> 
>     CallbackMap m_callbacks;
> 
>-    RetainPtr<OneShotDisplayLinkHandler> m_displayLinkHandler;
>+    RetainPtr<WKOneShotDisplayLinkHandler> m_displayLinkHandler;
> };
> 
> } // namespace WebKit
>diff --git a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
>index ce9ff72..1f7a542 100644
>--- a/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
>+++ b/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
>@@ -45,7 +45,7 @@ using namespace WebCore;
> // 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 OneShotDisplayLinkHandler : NSObject {
>+@interface WKOneShotDisplayLinkHandler : NSObject {
>     WebKit::RemoteLayerTreeDrawingAreaProxy* _drawingAreaProxy;
>     CADisplayLink *_displayLink;
> }
>@@ -57,7 +57,7 @@ - (void)schedule;
> 
> @end
> 
>-@implementation OneShotDisplayLinkHandler
>+@implementation WKOneShotDisplayLinkHandler
> 
> - (id)initWithDrawingAreaProxy:(WebKit::RemoteLayerTreeDrawingAreaProxy*)drawingAreaProxy
> {
>@@ -104,7 +104,7 @@ RemoteLayerTreeDrawingAreaProxy::RemoteLayerTreeDrawingAreaProxy(WebPageProxy& w
>     : DrawingAreaProxy(DrawingAreaTypeRemoteLayerTree, webPageProxy)
>     , m_remoteLayerTreeHost(*this)
> #if PLATFORM(IOS)
>-    , m_displayLinkHandler(adoptNS([[OneShotDisplayLinkHandler alloc] initWithDrawingAreaProxy:this]))
>+    , m_displayLinkHandler(adoptNS([[WKOneShotDisplayLinkHandler alloc] initWithDrawingAreaProxy:this]))
> #endif
> {
> #if USE(IOSURFACE)
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 51e4407..d1b725d 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+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
>diff --git a/Tools/Scripts/check-for-inappropriate-objc-class-names b/Tools/Scripts/check-for-inappropriate-objc-class-names
>index 28057e3..2d11dbe 100755
>--- a/Tools/Scripts/check-for-inappropriate-objc-class-names
>+++ b/Tools/Scripts/check-for-inappropriate-objc-class-names
>@@ -60,7 +60,7 @@ my $pattern = "^(" . join('|', @allowedPrefixes) . ")";
> my $sawError = 0;
> 
> if (!defined $executablePathAge || !defined $buildTimestampAge || $executablePathAge < $buildTimestampAge || $scriptAge < $buildTimestampAge) {
>-    if (!open NM, "(nm -Ugjp '$executablePath' | sed 's/^/STDOUT:/') 2>&1 |") {
>+    if (!open NM, "(nm -Ujp '$executablePath' | sed 's/^/STDOUT:/') 2>&1 |") {
>         print "ERROR: Could not open $executablePath\n";
>         $sawError = 1;
>         next;

Actions: View | Formatted Diff | Diff

Attachments on bug 152156: 267143 | 267150 | 267152 | 267154