We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition. * DISALLOW_ASSIGN -> RTC_DISALLOW_ASSIGN * DISALLOW_COPY_AND_ASSIGN -> RTC_DISALLOW_COPY_AND_ASSIGN * DISALLOW_IMPLICIT_CONSTRUCTORS -> RTC_DISALLOW_IMPLICIT_CONSTRUCTORS Related CL: https://codereview.webrtc.org/1335923002/ BUG=chromium:468375 NOTRY=true Review URL: https://codereview.webrtc.org/1345433002 Cr-Commit-Position: refs/heads/master@{#9953}
42 lines
1.1 KiB
Objective-C
42 lines
1.1 KiB
Objective-C
/*
|
|
* Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_VIDEO_ENGINE_TEST_COMMON_MAC_VIDEO_RENDERER_MAC_H_
|
|
#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_MAC_VIDEO_RENDERER_MAC_H_
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/test/gl/gl_renderer.h"
|
|
|
|
@class CocoaWindow;
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
class MacRenderer : public GlRenderer {
|
|
public:
|
|
MacRenderer();
|
|
virtual ~MacRenderer();
|
|
|
|
bool Init(const char* window_title, int width, int height);
|
|
|
|
// Implements GlRenderer.
|
|
void RenderFrame(const VideoFrame& frame, int delta) override;
|
|
bool IsTextureSupported() const override { return false; }
|
|
|
|
private:
|
|
CocoaWindow* window_;
|
|
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(MacRenderer);
|
|
};
|
|
} // test
|
|
} // webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_ENGINE_TEST_COMMON_MAC_VIDEO_RENDERER_MAC_H_
|