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

Side by Side Diff: Source/platform/graphics/GraphicsContextRecorder.cpp

Issue 338863002: Switch to the new SkCanvas::willSave() API. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased layer-canvas-log-expected.txt Created 6 years, 6 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
« no previous file with comments | « LayoutTests/inspector/layers/layer-canvas-log-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 { 416 {
417 RefPtr<JSONObject> params = addItemWithParams("saveLayer"); 417 RefPtr<JSONObject> params = addItemWithParams("saveLayer");
418 if (bounds) 418 if (bounds)
419 params->setObject("bounds", objectForSkRect(*bounds)); 419 params->setObject("bounds", objectForSkRect(*bounds));
420 params->setObject("paint", objectForSkPaint(*paint)); 420 params->setObject("paint", objectForSkPaint(*paint));
421 params->setString("saveFlags", saveFlagsToString(flags)); 421 params->setString("saveFlags", saveFlagsToString(flags));
422 this->SkCanvas::willSaveLayer(bounds, paint, flags); 422 this->SkCanvas::willSaveLayer(bounds, paint, flags);
423 return kNoLayer_SaveLayerStrategy; 423 return kNoLayer_SaveLayerStrategy;
424 } 424 }
425 425
426 void willSave(SaveFlags flags) OVERRIDE 426 void willSave() OVERRIDE
427 { 427 {
428 RefPtr<JSONObject> params = addItemWithParams("save"); 428 RefPtr<JSONObject> params = addItemWithParams("save");
429 params->setString("saveFlags", saveFlagsToString(flags)); 429 this->SkCanvas::willSave();
430 this->SkCanvas::willSave(flags);
431 } 430 }
432 431
433 bool isClipEmpty() const OVERRIDE 432 bool isClipEmpty() const OVERRIDE
434 { 433 {
435 return false; 434 return false;
436 } 435 }
437 436
438 bool isClipRect() const OVERRIDE 437 bool isClipRect() const OVERRIDE
439 { 438 {
440 return true; 439 return true;
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 921
923 void concat(const SkMatrix& matrix) 922 void concat(const SkMatrix& matrix)
924 { 923 {
925 RefPtr<JSONObject> params = addItemWithParams("concat"); 924 RefPtr<JSONObject> params = addItemWithParams("concat");
926 params->setArray("matrix", arrayForSkMatrix(matrix)); 925 params->setArray("matrix", arrayForSkMatrix(matrix));
927 } 926 }
928 927
929 String saveFlagsToString(SkCanvas::SaveFlags flags) 928 String saveFlagsToString(SkCanvas::SaveFlags flags)
930 { 929 {
931 String flagsString = ""; 930 String flagsString = "";
932 if (flags & SkCanvas::kMatrix_SaveFlag)
933 flagsString.append("kMatrix_SaveFlag ");
934 if (flags & SkCanvas::kClip_SaveFlag)
935 flagsString.append("kClip_SaveFlag ");
936 if (flags & SkCanvas::kHasAlphaLayer_SaveFlag) 931 if (flags & SkCanvas::kHasAlphaLayer_SaveFlag)
937 flagsString.append("kHasAlphaLayer_SaveFlag "); 932 flagsString.append("kHasAlphaLayer_SaveFlag ");
938 if (flags & SkCanvas::kFullColorLayer_SaveFlag) 933 if (flags & SkCanvas::kFullColorLayer_SaveFlag)
939 flagsString.append("kFullColorLayer_SaveFlag "); 934 flagsString.append("kFullColorLayer_SaveFlag ");
940 if (flags & SkCanvas::kClipToLayer_SaveFlag) 935 if (flags & SkCanvas::kClipToLayer_SaveFlag)
941 flagsString.append("kClipToLayer_SaveFlag "); 936 flagsString.append("kClipToLayer_SaveFlag ");
942 return flagsString; 937 return flagsString;
943 } 938 }
944 939
945 String textEncodingCanonicalName(SkPaint::TextEncoding encoding) 940 String textEncodingCanonicalName(SkPaint::TextEncoding encoding)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
1023 1018
1024 PassRefPtr<JSONArray> GraphicsContextSnapshot::snapshotCommandLog() const 1019 PassRefPtr<JSONArray> GraphicsContextSnapshot::snapshotCommandLog() const
1025 { 1020 {
1026 LoggingCanvas canvas(m_picture->width(), m_picture->height()); 1021 LoggingCanvas canvas(m_picture->width(), m_picture->height());
1027 FragmentSnapshotPlayer player(m_picture, &canvas); 1022 FragmentSnapshotPlayer player(m_picture, &canvas);
1028 player.play(0, 0); 1023 player.play(0, 0);
1029 return canvas.log(); 1024 return canvas.log();
1030 } 1025 }
1031 1026
1032 } 1027 }
OLDNEW
« no previous file with comments | « LayoutTests/inspector/layers/layer-canvas-log-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698