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

Side by Side Diff: third_party/WebKit/WebCore/platform/graphics/GraphicsLayer.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 setDebugBorder(Color(255, 255, 0, 204), 2.0f); // container: ye llow 438 setDebugBorder(Color(255, 255, 0, 204), 2.0f); // container: ye llow
439 } 439 }
440 } 440 }
441 441
442 void GraphicsLayer::setZPosition(float position) 442 void GraphicsLayer::setZPosition(float position)
443 { 443 {
444 m_zPosition = position; 444 m_zPosition = position;
445 } 445 }
446 #endif 446 #endif
447 447
448 static void writeIndent(TextStream& ts, int indent) 448 void writeIndent(TextStream& ts, int indent)
449 { 449 {
450 for (int i = 0; i != indent; ++i) 450 for (int i = 0; i != indent; ++i)
451 ts << " "; 451 ts << " ";
452 } 452 }
453 453
454 void GraphicsLayer::dumpLayer(TextStream& ts, int indent) const 454 void GraphicsLayer::dumpLayer(TextStream& ts, int indent) const
455 { 455 {
456 writeIndent(ts, indent); 456 writeIndent(ts, indent);
457 ts << "(" << "GraphicsLayer" << " " << static_cast<void*>(const_cast<Graphic sLayer*>(this)); 457 ts << "(" << "GraphicsLayer" << " " << static_cast<void*>(const_cast<Graphic sLayer*>(this));
458 ts << " \"" << m_name << "\"\n"; 458 ts << " \"" << m_name << "\"\n";
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 unsigned i; 531 unsigned i;
532 for (i = 0; i < m_children.size(); i++) 532 for (i = 0; i < m_children.size(); i++)
533 m_children[i]->dumpLayer(ts, indent+2); 533 m_children[i]->dumpLayer(ts, indent+2);
534 writeIndent(ts, indent + 1); 534 writeIndent(ts, indent + 1);
535 ts << ")\n"; 535 ts << ")\n";
536 } 536 }
537 537
538 } // namespace WebCore 538 } // namespace WebCore
539 539
540 #endif // USE(ACCELERATED_COMPOSITING) 540 #endif // USE(ACCELERATED_COMPOSITING)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698