Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: Source/platform/graphics/gpu/DrawingBufferTest.cpp

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase build fix Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 DepthStencilTrackingContext() 540 DepthStencilTrackingContext()
541 : m_nextRenderBufferId(1) 541 : m_nextRenderBufferId(1)
542 , m_stencilAttachment(0) 542 , m_stencilAttachment(0)
543 , m_depthAttachment(0) { } 543 , m_depthAttachment(0) { }
544 virtual ~DepthStencilTrackingContext() { } 544 virtual ~DepthStencilTrackingContext() { }
545 545
546 int numAllocatedRenderBuffer() const { return m_nextRenderBufferId - 1; } 546 int numAllocatedRenderBuffer() const { return m_nextRenderBufferId - 1; }
547 WebGLId stencilAttachment() const { return m_stencilAttachment; } 547 WebGLId stencilAttachment() const { return m_stencilAttachment; }
548 WebGLId depthAttachment() const { return m_depthAttachment; } 548 WebGLId depthAttachment() const { return m_depthAttachment; }
549 549
550 virtual WebString getString(WGC3Denum type) OVERRIDE 550 virtual WebString getString(WGC3Denum type) override
551 { 551 {
552 if (type == GL_EXTENSIONS) { 552 if (type == GL_EXTENSIONS) {
553 return WebString::fromUTF8("GL_OES_packed_depth_stencil"); 553 return WebString::fromUTF8("GL_OES_packed_depth_stencil");
554 } 554 }
555 return WebString(); 555 return WebString();
556 } 556 }
557 557
558 virtual WebGLId createRenderbuffer() OVERRIDE 558 virtual WebGLId createRenderbuffer() override
559 { 559 {
560 return ++m_nextRenderBufferId; 560 return ++m_nextRenderBufferId;
561 } 561 }
562 562
563 virtual void framebufferRenderbuffer(WGC3Denum target, WGC3Denum attachment, WGC3Denum renderbuffertarget, WebGLId renderbuffer) OVERRIDE 563 virtual void framebufferRenderbuffer(WGC3Denum target, WGC3Denum attachment, WGC3Denum renderbuffertarget, WebGLId renderbuffer) override
564 { 564 {
565 if (attachment == GL_STENCIL_ATTACHMENT) { 565 if (attachment == GL_STENCIL_ATTACHMENT) {
566 m_stencilAttachment = renderbuffer; 566 m_stencilAttachment = renderbuffer;
567 } else { 567 } else {
568 m_depthAttachment = renderbuffer; 568 m_depthAttachment = renderbuffer;
569 } 569 }
570 } 570 }
571 571
572 virtual void getIntegerv(WGC3Denum ptype, WGC3Dint* value) OVERRIDE 572 virtual void getIntegerv(WGC3Denum ptype, WGC3Dint* value) override
573 { 573 {
574 switch (ptype) { 574 switch (ptype) {
575 case GL_DEPTH_BITS: 575 case GL_DEPTH_BITS:
576 *value = m_depthAttachment ? 24 : 0; 576 *value = m_depthAttachment ? 24 : 0;
577 return; 577 return;
578 case GL_STENCIL_BITS: 578 case GL_STENCIL_BITS:
579 *value = m_stencilAttachment ? 8 : 0; 579 *value = m_stencilAttachment ? 8 : 0;
580 return; 580 return;
581 } 581 }
582 MockWebGraphicsContext3D::getIntegerv(ptype, value); 582 MockWebGraphicsContext3D::getIntegerv(ptype, value);
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 mailbox.syncPoint = waitSyncPoint; 670 mailbox.syncPoint = waitSyncPoint;
671 m_drawingBuffer->setIsHidden(true); 671 m_drawingBuffer->setIsHidden(true);
672 m_drawingBuffer->mailboxReleased(mailbox); 672 m_drawingBuffer->mailboxReleased(mailbox);
673 // m_drawingBuffer deletes mailbox immediately when hidden. 673 // m_drawingBuffer deletes mailbox immediately when hidden.
674 EXPECT_EQ(waitSyncPoint, webContext()->mostRecentlyWaitedSyncPoint()); 674 EXPECT_EQ(waitSyncPoint, webContext()->mostRecentlyWaitedSyncPoint());
675 675
676 m_drawingBuffer->beginDestruction(); 676 m_drawingBuffer->beginDestruction();
677 } 677 }
678 678
679 } // namespace 679 } // namespace
OLDNEW
« no previous file with comments | « Source/platform/graphics/gpu/DrawingBuffer.h ('k') | Source/platform/graphics/gpu/WebGLImageBufferSurface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698