Skip to content
This repository has been archived by the owner on Jul 3, 2019. It is now read-only.

Please don't die: collection of typos #2442

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.package eol=lf
test/avm2/shumway.txt eol=lf
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- "9.2.0"

before_script:
- npm update -g npm
Expand Down
4 changes: 2 additions & 2 deletions src/TextContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -479,13 +479,13 @@ module Shumway {
if (font.fontType === flash.text.FontType.DEVICE) {
if (textFormat.bold === null) {
bold = font.fontStyle === flash.text.FontStyle.BOLD ||
font.fontType === flash.text.FontStyle.BOLD_ITALIC;
font.fontStyle === flash.text.FontStyle.BOLD_ITALIC;
} else {
bold = !!textFormat.bold;
}
if (textFormat.italic === null) {
italic = font.fontStyle === flash.text.FontStyle.ITALIC ||
font.fontType === flash.text.FontStyle.BOLD_ITALIC;
font.fontStyle === flash.text.FontStyle.BOLD_ITALIC;
} else {
italic = !!textFormat.italic;
}
Expand Down
2 changes: 1 addition & 1 deletion src/avm1/interpreter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2730,12 +2730,12 @@ module Shumway.AVM1 {
var instructionsExecuted = 0;
var abortExecutionAt = currentContext.abortExecutionAt;

var ir = actionsData.ir;
if (avm1DebuggerEnabled.value &&
(Debugger.pause || Debugger.breakpoints[(<AnalyzerResults>ir).dataId])) {
debugger;
}

var ir = actionsData.ir;
release || Debug.assert(ir);

var position = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/avm1/runtime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ module Shumway.AVM1 {
}

public alGet(p): any {
name = this.context.normalizeName(p);
var name = this.context.normalizeName(p);
var desc = this.alGetProperty(name);
if (!desc) {
return undefined;
Expand Down
4 changes: 2 additions & 2 deletions src/avm2/nat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ module Shumway.AVMX.AS {
var descriptor = Object.getOwnPropertyDescriptor(this.value, nm);
return !!descriptor && descriptor.enumerable;
}
super.native_propertyIsEnumerable(nm);
return super.native_propertyIsEnumerable(nm);
}

$Bglength: number;
Expand Down Expand Up @@ -1553,7 +1553,7 @@ module Shumway.AVMX.AS {
if (as3Compatibility) {
return as3ToLowerCase(String(receiver));
}
String.prototype.toLowerCase.call(receiver);
return String.prototype.toLowerCase.call(receiver);
}
generic_toUpperCase() {
var receiver = this == undefined ? '' : this;
Expand Down
4 changes: 2 additions & 2 deletions src/flash/display/BitmapData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -698,11 +698,11 @@ module Shumway.AVMX.AS.flash.display {
}

getVector(rect: flash.geom.Rectangle): Uint32Vector {
var outputVector = new this.sec.Uint32Vector(pixelData.length);
var pixelData = this._getPixelData(rect);
if (!pixelData) {
return outputVector;
return new this.sec.Uint32Vector(0);
}
var outputVector = new this.sec.Uint32Vector(pixelData.length);
outputVector.length = pixelData.length;
outputVector._view().set(pixelData);
return outputVector;
Expand Down
2 changes: 1 addition & 1 deletion src/flash/filters/GradientBevelFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module Shumway.AVMX.AS.flash.filters {
for (var i = 0; i < obj.colors.length; i++) {
var color = obj.colors[i];
colors.push(color >>> 8);
alphas.push(color & 0xff) / 0xff;
alphas.push((color & 0xff) / 0xff);
}
// type is derived from obj.onTop and obj.innerShadow
// obj.onTop true: type is FULL
Expand Down
2 changes: 1 addition & 1 deletion src/flash/filters/GradientGlowFilter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module Shumway.AVMX.AS.flash.filters {
for (var i = 0; i < obj.colors.length; i++) {
var color = obj.colors[i];
colors.push(color >>> 8);
alphas.push(color & 0xff) / 0xff;
alphas.push((color & 0xff) / 0xff);
}
// type is derived from obj.onTop and obj.innerShadow
// obj.onTop true: type is FULL
Expand Down
2 changes: 1 addition & 1 deletion src/player/avmLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module Shumway {
export function createSecurityDomain(libraries: AVM2LoadLibrariesFlags): Promise<AXSecurityDomain> {
var result = new PromiseWrapper<AXSecurityDomain>();
release || assert (!!(libraries & AVM2LoadLibrariesFlags.Builtin));
SWF.enterTimeline('Load builton.abc file');
SWF.enterTimeline('Load builtin.abc file');
SystemResourcesLoadingService.instance.load(SystemResourceId.BuiltinAbc).then(function (buffer) {
var sec = new Shumway.AVMX.AXSecurityDomain();
var env = {url: 'builtin.abc', app: sec.system};
Expand Down
2 changes: 1 addition & 1 deletion src/rtmp/flvparser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ module RtmpJs.FLV {
var needPreprocessing = !!(flags & 0x20);
var timestamp = (parseBuffer[parsed + 8] << 16) |
(parseBuffer[parsed + 9] << 8) | parseBuffer[parsed + 10] |
(parseBuffer[parseBuffer + 11] << 24) /* signed part */;
(parseBuffer[parsed + 11] << 24) /* signed part */;
this.onTag && this.onTag({
type: dataType,
needPreprocessing: needPreprocessing,
Expand Down
2 changes: 1 addition & 1 deletion utils/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ install-tamarin-tests: $(TAMARIN_HOME)/configure.py

$(TAMARIN_HOME)/configure.py:
hg clone $(TAMARIN_URL) $(TAMARIN_HOME)
cd $(TAMARIN_HOME) hg update -C 2b38aa82c803 # get a stable version
cd $(TAMARIN_HOME); hg update -C 2b38aa82c803 # get a stable version
cd $(TAMARIN_HOME); patch -p 1 < ../patches/tamarin-108-fix.patch
cd $(TAMARIN_HOME); patch -p 1 < ../patches/tamarin-npexp-fix.patch
cd $(TAMARIN_HOME); patch -p 1 < ../patches/tamarin-gcc47-fix.patch
Expand Down