Skip to content

A
angle
Commit 91dc5da8 by James Darpinian Committed by Commit Bot
Options

WebKit requires "Web" as prefix to Objective-C class names

WebKit's build process requires that every Objective-C class name begin with the prefix "Web". While this is unfortunate, we only have one Objective-C class in the codebase that needs to change so we might as well just do it. Bug: angleproject:3439 Change-Id: I07d1f5478b067f680971d0f24befe2f63651c735 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1764649Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Commit-Queue: James Darpinian <jdarpinian@chromium.org>
parent 720a8bab
Showing with 8 additions and 8 deletions
src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.h
...@@ -17,7 +17,8 @@ typedef _CGLContextObject *CGLContextObj; ...@@ -17,7 +17,8 @@ typedef _CGLContextObject *CGLContextObj;
struct __IOSurface; struct __IOSurface;
typedef __IOSurface *IOSurfaceRef; typedef __IOSurface *IOSurfaceRef;
@class SwapLayer; // WebKit's build process requires that every Objective-C class name has the prefix "Web".
@class WebSwapLayer;
namespace rx namespace rx
{ {
...@@ -86,7 +87,7 @@ class WindowSurfaceCGL : public SurfaceGL ...@@ -86,7 +87,7 @@ class WindowSurfaceCGL : public SurfaceGL
const gl::FramebufferState &state) override; const gl::FramebufferState &state) override;
private: private:
SwapLayer *mSwapLayer; WebSwapLayer *mSwapLayer;
SharedSwapState mSwapState; SharedSwapState mSwapState;
uint64_t mCurrentSwapId; uint64_t mCurrentSwapId;
......
src/libANGLE/renderer/gl/cgl/WindowSurfaceCGL.mm
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
#include "libANGLE/renderer/gl/StateManagerGL.h" #include "libANGLE/renderer/gl/StateManagerGL.h"
#include "libANGLE/renderer/gl/cgl/DisplayCGL.h" #include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
@interface SwapLayer : CAOpenGLLayer @interface WebSwapLayer : CAOpenGLLayer {
{
CGLContextObj mDisplayContext; CGLContextObj mDisplayContext;
bool initialized; bool initialized;
...@@ -34,7 +33,7 @@ ...@@ -34,7 +33,7 @@
withFunctions:(const rx::FunctionsGL *)functions; withFunctions:(const rx::FunctionsGL *)functions;
@end @end
@implementation SwapLayer @implementation WebSwapLayer
- (id)initWithSharedState:(rx::SharedSwapState *)swapState - (id)initWithSharedState:(rx::SharedSwapState *)swapState
withContext:(CGLContextObj)displayContext withContext:(CGLContextObj)displayContext
withFunctions:(const rx::FunctionsGL *)functions withFunctions:(const rx::FunctionsGL *)functions
...@@ -205,9 +204,9 @@ egl::Error WindowSurfaceCGL::initialize(const egl::Display *display) ...@@ -205,9 +204,9 @@ egl::Error WindowSurfaceCGL::initialize(const egl::Display *display)
mSwapState.lastRendered = &mSwapState.textures[1]; mSwapState.lastRendered = &mSwapState.textures[1];
mSwapState.beingPresented = &mSwapState.textures[2]; mSwapState.beingPresented = &mSwapState.textures[2];
mSwapLayer = [[SwapLayer alloc] initWithSharedState:&mSwapState mSwapLayer = [[WebSwapLayer alloc] initWithSharedState:&mSwapState
withContext:mContext withContext:mContext
withFunctions:mFunctions]; withFunctions:mFunctions];
[mLayer addSublayer:mSwapLayer]; [mLayer addSublayer:mSwapLayer];
mFunctions->genRenderbuffers(1, &mDSRenderbuffer); mFunctions->genRenderbuffers(1, &mDSRenderbuffer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment