summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authormiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-07 19:32:30 +0000
committermiu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-07 19:32:30 +0000
commit06666c0c1f1cade8d428cc01dbd9127a230e563b (patch)
treecea3d85b2434675e1cb59f65fbe2f61d9c7289dc /gpu
parent9b2f38d6d96a91322438042ba879fa527102eedb (diff)
downloadchromium_src-06666c0c1f1cade8d428cc01dbd9127a230e563b.zip
chromium_src-06666c0c1f1cade8d428cc01dbd9127a230e563b.tar.gz
chromium_src-06666c0c1f1cade8d428cc01dbd9127a230e563b.tar.bz2
Revert 186627
Speculative revert. The tree went red at the time this change was checked in, and multiple GpuFeatureTests started failing consistently. Example failure: http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=@DEPS - chromium.org&testType=browser_tests&tests=GpuFeatureTest.WebGLAllowed If you look at the first Win Aura Tests (2) fail, you get the following blamelist range: 186630 to 186619. > Use gpu::Mailbox in IPCs instead of std::string > > gpu::Mailbox is safer since the size is checked in the deserializer. It's also > overall less code. > > BUG=None > > > Review URL: https://chromiumcodereview.appspot.com/12440005 TBR=piman@chromium.org Review URL: https://codereview.chromium.org/12612005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/mailbox_manager.cc5
-rw-r--r--gpu/command_buffer/service/mailbox_manager.h4
2 files changed, 0 insertions, 9 deletions
diff --git a/gpu/command_buffer/service/mailbox_manager.cc b/gpu/command_buffer/service/mailbox_manager.cc
index ccc48eb..9019393 100644
--- a/gpu/command_buffer/service/mailbox_manager.cc
+++ b/gpu/command_buffer/service/mailbox_manager.cc
@@ -8,7 +8,6 @@
#include "base/rand_util.h"
#include "crypto/hmac.h"
-#include "gpu/command_buffer/common/mailbox.h"
#include "gpu/command_buffer/service/gl_utils.h"
#include "gpu/command_buffer/service/texture_definition.h"
@@ -20,10 +19,6 @@ MailboxName::MailboxName() {
std::fill(signature, signature + sizeof(signature), 0);
}
-MailboxName::MailboxName(const ::gpu::Mailbox& mailbox) {
- std::copy(mailbox.name, mailbox.name + sizeof(mailbox.name), key);
-}
-
MailboxManager::MailboxManager()
: hmac_(crypto::HMAC::SHA256),
textures_(std::ptr_fun(&MailboxManager::TargetNameLess)) {
diff --git a/gpu/command_buffer/service/mailbox_manager.h b/gpu/command_buffer/service/mailbox_manager.h
index 85a5ec0..8f97dd4 100644
--- a/gpu/command_buffer/service/mailbox_manager.h
+++ b/gpu/command_buffer/service/mailbox_manager.h
@@ -22,9 +22,6 @@
typedef signed char GLbyte;
namespace gpu {
-
-struct Mailbox;
-
namespace gles2 {
class TextureDefinition;
@@ -35,7 +32,6 @@ class TextureManager;
// group. It is a random key signed with a hash of a private key.
struct GPU_EXPORT MailboxName {
MailboxName();
- explicit MailboxName(const ::gpu::Mailbox& mailbox);
GLbyte key[GL_MAILBOX_SIZE_CHROMIUM / 2];
GLbyte signature[GL_MAILBOX_SIZE_CHROMIUM / 2];
};