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

Side by Side Diff: Source/core/platform/graphics/GraphicsLayer.cpp

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 if (flags & LayerTreeIncludesDebugInfo) { 757 if (flags & LayerTreeIncludesDebugInfo) {
758 writeIndent(ts, indent + 1); 758 writeIndent(ts, indent + 1);
759 ts << "("; 759 ts << "(";
760 if (m_client) 760 if (m_client)
761 ts << "client " << static_cast<void*>(m_client); 761 ts << "client " << static_cast<void*>(m_client);
762 else 762 else
763 ts << "no client"; 763 ts << "no client";
764 ts << ")\n"; 764 ts << ")\n";
765 } 765 }
766 766
767 if (m_backgroundColor != Color::transparent) { 767 if (m_backgroundColor.isValid() && m_backgroundColor != Color::transparent) {
768 writeIndent(ts, indent + 1); 768 writeIndent(ts, indent + 1);
769 ts << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n"; 769 ts << "(backgroundColor " << m_backgroundColor.nameForRenderTreeAsText() << ")\n";
770 } 770 }
771 771
772 if (!m_transform.isIdentity()) { 772 if (!m_transform.isIdentity()) {
773 writeIndent(ts, indent + 1); 773 writeIndent(ts, indent + 1);
774 ts << "(transform "; 774 ts << "(transform ";
775 ts << "[" << m_transform.m11() << " " << m_transform.m12() << " " << m_t ransform.m13() << " " << m_transform.m14() << "] "; 775 ts << "[" << m_transform.m11() << " " << m_transform.m12() << " " << m_t ransform.m13() << " " << m_transform.m14() << "] ";
776 ts << "[" << m_transform.m21() << " " << m_transform.m22() << " " << m_t ransform.m23() << " " << m_transform.m24() << "] "; 776 ts << "[" << m_transform.m21() << " " << m_transform.m22() << " " << m_t ransform.m23() << " " << m_transform.m24() << "] ";
777 ts << "[" << m_transform.m31() << " " << m_transform.m32() << " " << m_t ransform.m33() << " " << m_transform.m34() << "] "; 777 ts << "[" << m_transform.m31() << " " << m_transform.m32() << " " << m_t ransform.m33() << " " << m_transform.m34() << "] ";
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 #ifndef NDEBUG 1330 #ifndef NDEBUG
1331 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer) 1331 void showGraphicsLayerTree(const WebCore::GraphicsLayer* layer)
1332 { 1332 {
1333 if (!layer) 1333 if (!layer)
1334 return; 1334 return;
1335 1335
1336 String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo); 1336 String output = layer->layerTreeAsText(WebCore::LayerTreeIncludesDebugInfo);
1337 fprintf(stderr, "%s\n", output.utf8().data()); 1337 fprintf(stderr, "%s\n", output.utf8().data());
1338 } 1338 }
1339 #endif 1339 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698