Skip to content

Commit

Permalink
Remove "master" from lua files
Browse files Browse the repository at this point in the history
Bug: chromium:1101491
Bug: b/161896447

Change-Id: I68f7f0ed65ac94550b167328e70d7bdb25a60189
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305964
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
  • Loading branch information
LeonScroggins authored and Skia Commit-Bot committed Jul 28, 2020
1 parent 487d9d1 commit 07b0099
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions resources/lua/slides.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ function stroke_rect(canvas, rect, color)
canvas:drawRect(rect, paint)
end

function drawSlide(canvas, slide, master_template)
function drawSlide(canvas, slide, main_template)

if #slide == 1 then
template = master_template.title
template = main_template.title
canvas:drawText(slide[1].text, 320, 240, template[1])
return
end

template = master_template.slide
template = main_template.slide

local x = template.margin_x
local y = template.margin_y
local scale = 1.25

if slide.blockstyle == "code" then
local paint = master_template.codePaint
local paint = main_template.codePaint
local fm = paint:getFontMetrics()
local height = #slide * (fm.descent - fm.ascent)
y = (480 - height) / 2
Expand Down
6 changes: 3 additions & 3 deletions tools/lua/ngrams.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ local n = 3
-- CHANGEME

-- This algorithm uses a list-of-lists for each SKP. For API call, append a
-- list containing just the verb to the master list. Then, backtrack over the
-- last (n-1) sublists in the master list and append the verb to those
-- sublists. At the end of execution, the master list contains a sublist for
-- list containing just the verb to the main list. Then, backtrack over the
-- last (n-1) sublists in the main list and append the verb to those
-- sublists. At the end of execution, the main list contains a sublist for
-- every verb in the SKP file. Each sublist has length n, with the exception of
-- the last n-1 sublists, which are discarded in the summarize() function,
-- which generates counts for each n-gram.
Expand Down

0 comments on commit 07b0099

Please sign in to comment.