Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (193971 => 193972)
--- trunk/Source/_javascript_Core/ChangeLog 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-12-11 20:56:12 UTC (rev 193972)
@@ -1,3 +1,14 @@
+2015-12-11 Joseph Pecoraro <[email protected]>
+
+ 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 Dan Bernstein.
+
+ * llvm/InitializeLLVMMac.cpp:
+ Remove stale comment. The ObjC class this comment referenced
+ has already been removed.
+
2015-12-11 Benjamin Poulain <[email protected]>
[JSC] Little cleanup of FTLOutput type casts and conversions
Modified: trunk/Source/_javascript_Core/llvm/InitializeLLVMMac.cpp (193971 => 193972)
--- trunk/Source/_javascript_Core/llvm/InitializeLLVMMac.cpp 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/_javascript_Core/llvm/InitializeLLVMMac.cpp 2015-12-11 20:56:12 UTC (rev 193972)
@@ -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)
Modified: trunk/Source/WebCore/ChangeLog (193971 => 193972)
--- trunk/Source/WebCore/ChangeLog 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebCore/ChangeLog 2015-12-11 20:56:12 UTC (rev 193972)
@@ -1,3 +1,18 @@
+2015-12-11 Joseph Pecoraro <[email protected]>
+
+ 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 Dan Bernstein.
+
+ * 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-11 Brady Eidson <[email protected]>
Modern IDB: storage/indexeddb/intversion-abort-in-initial-upgradeneeded.html fails.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h (193971 => 193972)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h 2015-12-11 20:56:12 UTC (rev 193972)
@@ -34,7 +34,7 @@
OBJC_CLASS AVContentKeyRequest;
OBJC_CLASS AVContentKeySession;
-OBJC_CLASS CDMSessionAVContentKeySessionDelegate;
+OBJC_CLASS WebCDMSessionAVContentKeySessionDelegate;
namespace WebCore {
@@ -66,7 +66,7 @@
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;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm (193971 => 193972)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2015-12-11 20:56:12 UTC (rev 193972)
@@ -80,13 +80,13 @@
- (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 @@
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)
{
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h (193971 => 193972)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h 2015-12-11 20:56:12 UTC (rev 193972)
@@ -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 @@
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;
};
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm (193971 => 193972)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm 2015-12-11 20:56:12 UTC (rev 193972)
@@ -66,12 +66,12 @@
+ (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 @@
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)
{
Modified: trunk/Source/WebKit2/ChangeLog (193971 => 193972)
--- trunk/Source/WebKit2/ChangeLog 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-11 20:56:12 UTC (rev 193972)
@@ -1,3 +1,17 @@
+2015-12-11 Joseph Pecoraro <[email protected]>
+
+ 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 Dan Bernstein.
+
+ * 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 Eric Carlson <[email protected]>
[MediaStream] Expose media capture devices persistent permissions to WebCore
Modified: trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm (193971 => 193972)
--- trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm 2015-12-11 20:56:12 UTC (rev 193972)
@@ -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 @@
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];
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h (193971 => 193972)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h 2015-12-11 20:56:12 UTC (rev 193972)
@@ -32,7 +32,7 @@
#include <WebCore/IntPoint.h>
#include <WebCore/IntSize.h>
-OBJC_CLASS OneShotDisplayLinkHandler;
+OBJC_CLASS WKOneShotDisplayLinkHandler;
namespace WebKit {
@@ -107,7 +107,7 @@
CallbackMap m_callbacks;
- RetainPtr<OneShotDisplayLinkHandler> m_displayLinkHandler;
+ RetainPtr<WKOneShotDisplayLinkHandler> m_displayLinkHandler;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (193971 => 193972)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2015-12-11 20:56:12 UTC (rev 193972)
@@ -45,7 +45,7 @@
// 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 @@
@end
-@implementation OneShotDisplayLinkHandler
+@implementation WKOneShotDisplayLinkHandler
- (id)initWithDrawingAreaProxy:(WebKit::RemoteLayerTreeDrawingAreaProxy*)drawingAreaProxy
{
@@ -104,7 +104,7 @@
: 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)
Modified: trunk/Tools/ChangeLog (193971 => 193972)
--- trunk/Tools/ChangeLog 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Tools/ChangeLog 2015-12-11 20:56:12 UTC (rev 193972)
@@ -1,3 +1,16 @@
+2015-12-11 Joseph Pecoraro <[email protected]>
+
+ 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 Dan Bernstein.
+
+ 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 Eric Carlson <[email protected]>
[MediaStream] Expose media capture devices persistent permissions to WebCore
Modified: trunk/Tools/Scripts/check-for-inappropriate-objc-class-names (193971 => 193972)
--- trunk/Tools/Scripts/check-for-inappropriate-objc-class-names 2015-12-11 20:52:21 UTC (rev 193971)
+++ trunk/Tools/Scripts/check-for-inappropriate-objc-class-names 2015-12-11 20:56:12 UTC (rev 193972)
@@ -60,7 +60,7 @@
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;
