dawn_wire: Move manual class members from ServerBase to Server

Bug: dawn:88
Change-Id: Ic216006aa52cace7aa7451b957e72119783e6d7a
Reviewed-on: https://dawn-review.googlesource.com/c/4100
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Austin Eng
2019-01-30 17:37:28 +00:00
committed by Commit Bot service account
parent 2427666df1
commit 8749506bae
7 changed files with 67 additions and 47 deletions

View File

@@ -20,7 +20,7 @@
namespace dawn_wire { namespace server {
bool Server::PreHandleBufferUnmap(const BufferUnmapCmd& cmd) {
auto* selfData = mKnownBuffer.Get(cmd.selfId);
auto* selfData = BufferObjects().Get(cmd.selfId);
ASSERT(selfData != nullptr);
selfData->mappedData = nullptr;
@@ -49,7 +49,7 @@ namespace dawn_wire { namespace server {
return false;
}
auto* buffer = mKnownBuffer.Get(bufferId);
auto* buffer = BufferObjects().Get(bufferId);
if (buffer == nullptr) {
return false;
}
@@ -100,7 +100,7 @@ namespace dawn_wire { namespace server {
return false;
}
auto* buffer = mKnownBuffer.Get(bufferId);
auto* buffer = BufferObjects().Get(bufferId);
if (buffer == nullptr || !buffer->valid || buffer->mappedData == nullptr ||
buffer->mappedDataSize != dataLength) {
return false;
@@ -133,7 +133,7 @@ namespace dawn_wire { namespace server {
std::unique_ptr<MapUserdata> data(userdata);
// Skip sending the callback if the buffer has already been destroyed.
auto* bufferData = mKnownBuffer.Get(data->buffer.id);
auto* bufferData = BufferObjects().Get(data->buffer.id);
if (bufferData == nullptr || bufferData->serial != data->buffer.serial) {
return;
}
@@ -160,7 +160,7 @@ namespace dawn_wire { namespace server {
std::unique_ptr<MapUserdata> data(userdata);
// Skip sending the callback if the buffer has already been destroyed.
auto* bufferData = mKnownBuffer.Get(data->buffer.id);
auto* bufferData = BufferObjects().Get(data->buffer.id);
if (bufferData == nullptr || bufferData->serial != data->buffer.serial) {
return;
}