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

Side by Side Diff: src/utils/SkLuaCanvas.cpp

Issue 147683003: fix more 64bit warnings (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 11 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 | « src/utils/SkLua.cpp ('k') | src/views/mac/SkOptionsTableView.mm » ('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 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkLuaCanvas.h" 8 #include "SkLuaCanvas.h"
9 #include "SkLua.h" 9 #include "SkLua.h"
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 switch (enc) { 50 switch (enc) {
51 case SkPaint::kUTF8_TextEncoding: 51 case SkPaint::kUTF8_TextEncoding:
52 this->pushString((const char*)text, length, "text"); 52 this->pushString((const char*)text, length, "text");
53 break; 53 break;
54 case SkPaint::kUTF16_TextEncoding: { 54 case SkPaint::kUTF16_TextEncoding: {
55 SkString str; 55 SkString str;
56 str.setUTF16((const uint16_t*)text, length); 56 str.setUTF16((const uint16_t*)text, length);
57 this->pushString(str, "text"); 57 this->pushString(str, "text");
58 } break; 58 } break;
59 case SkPaint::kGlyphID_TextEncoding: 59 case SkPaint::kGlyphID_TextEncoding:
60 this->pushArrayU16((const uint16_t*)text, length >> 1, "glyphs"); 60 this->pushArrayU16((const uint16_t*)text, SkToInt(length >> 1),
61 "glyphs");
61 break; 62 break;
62 case SkPaint::kUTF32_TextEncoding: 63 case SkPaint::kUTF32_TextEncoding:
63 break; 64 break;
64 } 65 }
65 } 66 }
66 67
67 /////////////////////////////////////////////////////////////////////////////// 68 ///////////////////////////////////////////////////////////////////////////////
68 69
69 void SkLuaCanvas::pushThis() { 70 void SkLuaCanvas::pushThis() {
70 SkLua(fL).pushCanvas(this); 71 SkLua(fL).pushCanvas(this);
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 const SkColor colors[], SkXfermode* xmode, 281 const SkColor colors[], SkXfermode* xmode,
281 const uint16_t indices[], int indexCount, 282 const uint16_t indices[], int indexCount,
282 const SkPaint& paint) { 283 const SkPaint& paint) {
283 AUTO_LUA("drawVertices"); 284 AUTO_LUA("drawVertices");
284 lua.pushPaint(paint, "paint"); 285 lua.pushPaint(paint, "paint");
285 } 286 }
286 287
287 void SkLuaCanvas::drawData(const void* data, size_t length) { 288 void SkLuaCanvas::drawData(const void* data, size_t length) {
288 AUTO_LUA("drawData"); 289 AUTO_LUA("drawData");
289 } 290 }
OLDNEW
« no previous file with comments | « src/utils/SkLua.cpp ('k') | src/views/mac/SkOptionsTableView.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698