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

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

Issue 2569253002: Revert "Fix border radius on composited children." (Closed)
Patch Set: Created 4 years 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) 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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 if ((flags & LayerTreeIncludesPaintingPhases) && m_paintingPhase) { 731 if ((flags & LayerTreeIncludesPaintingPhases) && m_paintingPhase) {
732 std::unique_ptr<JSONArray> paintingPhasesJSON = JSONArray::create(); 732 std::unique_ptr<JSONArray> paintingPhasesJSON = JSONArray::create();
733 if (m_paintingPhase & GraphicsLayerPaintBackground) 733 if (m_paintingPhase & GraphicsLayerPaintBackground)
734 paintingPhasesJSON->pushString("GraphicsLayerPaintBackground"); 734 paintingPhasesJSON->pushString("GraphicsLayerPaintBackground");
735 if (m_paintingPhase & GraphicsLayerPaintForeground) 735 if (m_paintingPhase & GraphicsLayerPaintForeground)
736 paintingPhasesJSON->pushString("GraphicsLayerPaintForeground"); 736 paintingPhasesJSON->pushString("GraphicsLayerPaintForeground");
737 if (m_paintingPhase & GraphicsLayerPaintMask) 737 if (m_paintingPhase & GraphicsLayerPaintMask)
738 paintingPhasesJSON->pushString("GraphicsLayerPaintMask"); 738 paintingPhasesJSON->pushString("GraphicsLayerPaintMask");
739 if (m_paintingPhase & GraphicsLayerPaintChildClippingMask) 739 if (m_paintingPhase & GraphicsLayerPaintChildClippingMask)
740 paintingPhasesJSON->pushString("GraphicsLayerPaintChildClippingMask"); 740 paintingPhasesJSON->pushString("GraphicsLayerPaintChildClippingMask");
741 if (m_paintingPhase & GraphicsLayerPaintAncestorClippingMask)
742 paintingPhasesJSON->pushString("GraphicsLayerPaintAncestorClippingMask");
743 if (m_paintingPhase & GraphicsLayerPaintOverflowContents) 741 if (m_paintingPhase & GraphicsLayerPaintOverflowContents)
744 paintingPhasesJSON->pushString("GraphicsLayerPaintOverflowContents"); 742 paintingPhasesJSON->pushString("GraphicsLayerPaintOverflowContents");
745 if (m_paintingPhase & GraphicsLayerPaintCompositedScroll) 743 if (m_paintingPhase & GraphicsLayerPaintCompositedScroll)
746 paintingPhasesJSON->pushString("GraphicsLayerPaintCompositedScroll"); 744 paintingPhasesJSON->pushString("GraphicsLayerPaintCompositedScroll");
747 if (m_paintingPhase & GraphicsLayerPaintDecoration) 745 if (m_paintingPhase & GraphicsLayerPaintDecoration)
748 paintingPhasesJSON->pushString("GraphicsLayerPaintDecoration"); 746 paintingPhasesJSON->pushString("GraphicsLayerPaintDecoration");
749 json->setArray("paintingPhases", std::move(paintingPhasesJSON)); 747 json->setArray("paintingPhases", std::move(paintingPhasesJSON));
750 } 748 }
751 749
752 if (flags & LayerTreeIncludesClipAndScrollParents) { 750 if (flags & LayerTreeIncludesClipAndScrollParents) {
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
1355 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) { 1353 void showGraphicsLayerTree(const blink::GraphicsLayer* layer) {
1356 if (!layer) { 1354 if (!layer) {
1357 LOG(INFO) << "Cannot showGraphicsLayerTree for (nil)."; 1355 LOG(INFO) << "Cannot showGraphicsLayerTree for (nil).";
1358 return; 1356 return;
1359 } 1357 }
1360 1358
1361 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo); 1359 String output = layer->layerTreeAsText(blink::LayerTreeIncludesDebugInfo);
1362 LOG(INFO) << output.utf8().data(); 1360 LOG(INFO) << output.utf8().data();
1363 } 1361 }
1364 #endif 1362 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698