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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/platform/graphics/LoggingCanvas.h

Issue 454993002: preemptive add new virtual for onDrawPicture (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: don't add OVERRIDE for cross-module subclassing Created 6 years, 4 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 | « no previous file | Source/platform/graphics/LoggingCanvas.cpp » ('j') | 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS calar y, const SkPaint&) OVERRIDE; 64 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS calar y, const SkPaint&) OVERRIDE;
65 virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoin t pos[], const SkPaint&) OVERRIDE; 65 virtual void onDrawPosText(const void* text, size_t byteLength, const SkPoin t pos[], const SkPaint&) OVERRIDE;
66 virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkSca lar xpos[], SkScalar constY, const SkPaint&) OVERRIDE; 66 virtual void onDrawPosTextH(const void* text, size_t byteLength, const SkSca lar xpos[], SkScalar constY, const SkPaint&) OVERRIDE;
67 virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkP ath&, const SkMatrix*, const SkPaint&) OVERRIDE; 67 virtual void onDrawTextOnPath(const void* text, size_t byteLength, const SkP ath&, const SkMatrix*, const SkPaint&) OVERRIDE;
68 virtual void onPushCull(const SkRect& cullRect) OVERRIDE; 68 virtual void onPushCull(const SkRect& cullRect) OVERRIDE;
69 virtual void onPopCull() OVERRIDE; 69 virtual void onPopCull() OVERRIDE;
70 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE ; 70 virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) OVERRIDE ;
71 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) OVERRI DE; 71 virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) OVERRI DE;
72 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) OVERRIDE ; 72 virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) OVERRIDE ;
73 virtual void onClipRegion(const SkRegion&, SkRegion::Op) OVERRIDE; 73 virtual void onClipRegion(const SkRegion&, SkRegion::Op) OVERRIDE;
74 virtual void onDrawPicture(const SkPicture*) OVERRIDE; 74 virtual void onDrawPicture(const SkPicture*);
75 virtual void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint* );
75 virtual void didSetMatrix(const SkMatrix&) OVERRIDE; 76 virtual void didSetMatrix(const SkMatrix&) OVERRIDE;
76 virtual void didConcat(const SkMatrix&) OVERRIDE; 77 virtual void didConcat(const SkMatrix&) OVERRIDE;
77 virtual void willSave() OVERRIDE; 78 virtual void willSave() OVERRIDE;
78 SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint*, SaveFl ags) OVERRIDE; 79 SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint*, SaveFl ags) OVERRIDE;
79 virtual void willRestore() OVERRIDE; 80 virtual void willRestore() OVERRIDE;
80 81
81 private: 82 private:
82 RefPtr<JSONArray> m_log; 83 RefPtr<JSONArray> m_log;
83 friend class AutoLogger; 84 friend class AutoLogger;
84 85
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 void concat(const SkMatrix&); 134 void concat(const SkMatrix&);
134 String saveFlagsToString(SkCanvas::SaveFlags); 135 String saveFlagsToString(SkCanvas::SaveFlags);
135 String textEncodingCanonicalName(SkPaint::TextEncoding); 136 String textEncodingCanonicalName(SkPaint::TextEncoding);
136 String stringForUTFText(const void* text, size_t length, SkPaint::TextEncodi ng); 137 String stringForUTFText(const void* text, size_t length, SkPaint::TextEncodi ng);
137 String stringForText(const void* text, size_t byteLength, const SkPaint&); 138 String stringForText(const void* text, size_t byteLength, const SkPaint&);
138 }; 139 };
139 140
140 } 141 }
141 142
142 #endif // LoggingCanvas_h 143 #endif // LoggingCanvas_h
OLDNEW
« no previous file with comments | « no previous file | Source/platform/graphics/LoggingCanvas.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698