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

Side by Side Diff: content/common/cc_messages.cc

Issue 1387283002: cc: Remove redundant is_overlay arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo changes on overlay_strategy_single_on_top.cc Created 5 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
« no previous file with comments | « content/common/cc_messages.h ('k') | content/common/cc_messages_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/cc_messages.h" 5 #include "content/common/cc_messages.h"
6 6
7 #include "cc/output/compositor_frame.h" 7 #include "cc/output/compositor_frame.h"
8 #include "cc/output/filter_operations.h" 8 #include "cc/output/filter_operations.h"
9 #include "cc/quads/draw_quad.h" 9 #include "cc/quads/draw_quad.h"
10 #include "cc/quads/largest_draw_quad.h" 10 #include "cc/quads/largest_draw_quad.h"
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 l->append(", "); 793 l->append(", ");
794 } 794 }
795 l->append("])"); 795 l->append("])");
796 } 796 }
797 797
798 void ParamTraits<cc::StreamVideoDrawQuad::OverlayResources>::Write( 798 void ParamTraits<cc::StreamVideoDrawQuad::OverlayResources>::Write(
799 Message* m, 799 Message* m,
800 const param_type& p) { 800 const param_type& p) {
801 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) { 801 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) {
802 WriteParam(m, p.size_in_pixels[i]); 802 WriteParam(m, p.size_in_pixels[i]);
803 WriteParam(m, p.allow_overlay[i]);
804 } 803 }
805 } 804 }
806 805
807 bool ParamTraits<cc::StreamVideoDrawQuad::OverlayResources>::Read( 806 bool ParamTraits<cc::StreamVideoDrawQuad::OverlayResources>::Read(
808 const Message* m, 807 const Message* m,
809 base::PickleIterator* iter, 808 base::PickleIterator* iter,
810 param_type* p) { 809 param_type* p) {
811 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) { 810 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) {
812 if (!ReadParam(m, iter, &p->size_in_pixels[i])) 811 if (!ReadParam(m, iter, &p->size_in_pixels[i]))
813 return false; 812 return false;
814 if (!ReadParam(m, iter, &p->allow_overlay[i]))
815 return false;
816 } 813 }
817 return true; 814 return true;
818 } 815 }
819 816
820 void ParamTraits<cc::StreamVideoDrawQuad::OverlayResources>::Log( 817 void ParamTraits<cc::StreamVideoDrawQuad::OverlayResources>::Log(
821 const param_type& p, 818 const param_type& p,
822 std::string* l) { 819 std::string* l) {
823 l->append("StreamVideoDrawQuad::OverlayResources(["); 820 l->append("StreamVideoDrawQuad::OverlayResources([");
824 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) { 821 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) {
825 LogParam(p.size_in_pixels[i], l); 822 LogParam(p.size_in_pixels[i], l);
826 l->append(", ");
827 LogParam(p.allow_overlay[i], l);
828 if (i < (cc::DrawQuad::Resources::kMaxResourceIdCount - 1)) 823 if (i < (cc::DrawQuad::Resources::kMaxResourceIdCount - 1))
829 l->append(", "); 824 l->append(", ");
830 } 825 }
831 l->append("])"); 826 l->append("])");
832 } 827 }
833 828
834 void ParamTraits<cc::TextureDrawQuad::OverlayResources>::Write( 829 void ParamTraits<cc::TextureDrawQuad::OverlayResources>::Write(
835 Message* m, 830 Message* m,
836 const param_type& p) { 831 const param_type& p) {
837 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) { 832 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) {
838 WriteParam(m, p.size_in_pixels[i]); 833 WriteParam(m, p.size_in_pixels[i]);
839 WriteParam(m, p.allow_overlay[i]);
840 } 834 }
841 } 835 }
842 836
843 bool ParamTraits<cc::TextureDrawQuad::OverlayResources>::Read( 837 bool ParamTraits<cc::TextureDrawQuad::OverlayResources>::Read(
844 const Message* m, 838 const Message* m,
845 base::PickleIterator* iter, 839 base::PickleIterator* iter,
846 param_type* p) { 840 param_type* p) {
847 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) { 841 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) {
848 if (!ReadParam(m, iter, &p->size_in_pixels[i])) 842 if (!ReadParam(m, iter, &p->size_in_pixels[i]))
849 return false; 843 return false;
850 if (!ReadParam(m, iter, &p->allow_overlay[i]))
851 return false;
852 } 844 }
853 return true; 845 return true;
854 } 846 }
855 847
856 void ParamTraits<cc::TextureDrawQuad::OverlayResources>::Log( 848 void ParamTraits<cc::TextureDrawQuad::OverlayResources>::Log(
857 const param_type& p, 849 const param_type& p,
858 std::string* l) { 850 std::string* l) {
859 l->append("TextureDrawQuad::OverlayResources(["); 851 l->append("TextureDrawQuad::OverlayResources([");
860 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) { 852 for (size_t i = 0; i < cc::DrawQuad::Resources::kMaxResourceIdCount; ++i) {
861 LogParam(p.size_in_pixels[i], l); 853 LogParam(p.size_in_pixels[i], l);
862 l->append(", ");
863 LogParam(p.allow_overlay[i], l);
864 if (i < (cc::DrawQuad::Resources::kMaxResourceIdCount - 1)) 854 if (i < (cc::DrawQuad::Resources::kMaxResourceIdCount - 1))
865 l->append(", "); 855 l->append(", ");
866 } 856 }
867 l->append("])"); 857 l->append("])");
868 } 858 }
869 859
870 } // namespace IPC 860 } // namespace IPC
OLDNEW
« no previous file with comments | « content/common/cc_messages.h ('k') | content/common/cc_messages_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698