Skip to content

Commit

Permalink
Updating to the latest WTF shim.
Browse files Browse the repository at this point in the history
  • Loading branch information
@benvanik
benvanik committed May 6, 2013
1 parent 47ecb14 commit 169bc10
Show file tree
Hide file tree
Showing 19 changed files with 46 additions and 46 deletions.
8 changes: 4 additions & 4 deletions BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,13 @@ file_set(

closure_js_fixstyle(
name='blk_js_fixstyle',
namespaces=['goog', 'gf', 'blk', 'wtfapi',],
namespaces=['goog', 'gf', 'blk', 'WTF',],
srcs=[':all_js'],
linter_path=CLOSURE_LINTER_PATH)

closure_js_fixstyle(
name='all_js_fixstyle',
namespaces=['goog', 'gf', 'blk', 'wtfapi',],
namespaces=['goog', 'gf', 'blk', 'WTF',],
srcs=[
GF + ':gf_js',
':all_js',
Expand All @@ -227,13 +227,13 @@ closure_js_fixstyle(

closure_js_lint(
name='blk_js_lint',
namespaces=['goog', 'gf', 'blk', 'wtfapi',],
namespaces=['goog', 'gf', 'blk', 'WTF',],
srcs=[':blk_js_fixstyle'],
linter_path=CLOSURE_LINTER_PATH)

closure_js_lint(
name='all_js_lint',
namespaces=['goog', 'gf', 'blk', 'wtfapi',],
namespaces=['goog', 'gf', 'blk', 'WTF',],
srcs=[':all_js_fixstyle'],
linter_path=CLOSURE_LINTER_PATH)

Expand Down
4 changes: 2 additions & 2 deletions src/blk/env/chunkview.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ goog.require('goog.asserts');
goog.require('goog.math');
goog.require('goog.reflect');
goog.require('goog.vec.Vec3');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -842,7 +842,7 @@ blk.env.ChunkView.tmpVec3_ = [
blk.env.ChunkView.tmpAabb_ = gf.vec.BoundingBox.create();


blk.env.ChunkView = wtfapi.trace.instrumentType(
blk.env.ChunkView = WTF.trace.instrumentType(
blk.env.ChunkView, 'blk.env.ChunkView',
goog.reflect.object(blk.env.ChunkView, {
initialize: 'initialize',
Expand Down
6 changes: 3 additions & 3 deletions src/blk/env/client/buildqueue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ goog.require('goog.Disposable');
goog.require('goog.array');
goog.require('goog.reflect');
goog.require('goog.vec.Vec3');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -327,7 +327,7 @@ blk.env.client.BuildQueue.prototype.update = function(frame, viewport) {
blk.env.client.BuildQueue.prototype.sortListByDistance_ =
function(frame, viewport, list) {
// TODO(benvanik): more efficient sort
wtfapi.trace.appendScopeData('length', list.length);
WTF.trace.appendScopeData('length', list.length);

// Compute distances
var frameNumber = frame.frameNumber;
Expand All @@ -348,7 +348,7 @@ blk.env.client.BuildQueue.prototype.sortListByDistance_ =
};


blk.env.client.BuildQueue = wtfapi.trace.instrumentType(
blk.env.client.BuildQueue = WTF.trace.instrumentType(
blk.env.client.BuildQueue, 'blk.env.client.BuildQueue',
goog.reflect.object(blk.env.client.BuildQueue, {
update: 'update',
Expand Down
14 changes: 7 additions & 7 deletions src/blk/env/client/segmentrenderer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ goog.require('goog.reflect');
goog.require('goog.vec.Mat4');
goog.require('goog.vec.Vec3');
goog.require('goog.vec.Vec4');
goog.require('wtfapi.trace');
goog.require('wtfapi.trace.events');
goog.require('WTF.trace');
goog.require('WTF.trace.events');



Expand Down Expand Up @@ -283,9 +283,9 @@ blk.env.client.SegmentRenderer.prototype.invalidate = function() {
};


blk.env.client.SegmentRenderer.build0_ = wtfapi.trace.events.createScope(
blk.env.client.SegmentRenderer.build0_ = WTF.trace.events.createScope(
'blk.env.client.SegmentRenderer#build:fast');
blk.env.client.SegmentRenderer.build1_ = wtfapi.trace.events.createScope(
blk.env.client.SegmentRenderer.build1_ = WTF.trace.events.createScope(
'blk.env.client.SegmentRenderer#build:slow');


Expand Down Expand Up @@ -348,7 +348,7 @@ blk.env.client.SegmentRenderer.prototype.build = function() {
}
}
}
wtfapi.trace.leaveScope(scope);
WTF.trace.leaveScope(scope);

scope = blk.env.client.SegmentRenderer.build1_();
/** @type {!Array.<blk.env.Chunk>} */
Expand Down Expand Up @@ -386,7 +386,7 @@ blk.env.client.SegmentRenderer.prototype.build = function() {
for (bx = 1; bx < blk.env.client.SegmentRenderer.SIZE; bx++) {
this.addFaces_(bx, bymin, bymax, bz, neighborChunks);
}
wtfapi.trace.leaveScope(scope);
WTF.trace.leaveScope(scope);

// Finish the build
var gl = this.graphicsContext.gl;
Expand Down Expand Up @@ -574,7 +574,7 @@ blk.env.client.SegmentRenderer.tmpVec4_ = goog.vec.Vec4.createFloat32();
blk.env.client.SegmentRenderer.tmpFaces_ = new Uint16Array(6);


blk.env.client.SegmentRenderer = wtfapi.trace.instrumentType(
blk.env.client.SegmentRenderer = WTF.trace.instrumentType(
blk.env.client.SegmentRenderer, 'blk.env.client.SegmentRenderer',
goog.reflect.object(blk.env.client.SegmentRenderer, {
build: 'build'
Expand Down
4 changes: 2 additions & 2 deletions src/blk/env/client/viewrenderer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ goog.require('goog.Disposable');
goog.require('goog.asserts');
goog.require('goog.async.Deferred');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');


/**
Expand Down Expand Up @@ -577,7 +577,7 @@ blk.env.client.ViewRenderer.prototype.handleVisibleChunk_ = function(chunk) {
};


blk.env.client.ViewRenderer = wtfapi.trace.instrumentType(
blk.env.client.ViewRenderer = WTF.trace.instrumentType(
blk.env.client.ViewRenderer, 'blk.env.client.ViewRenderer',
goog.reflect.object(blk.env.client.ViewRenderer, {
ensureChunkRenderData_: 'ensureChunkRenderData_',
Expand Down
6 changes: 3 additions & 3 deletions src/blk/env/server/chunksendqueue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ goog.require('gf.net.PacketWriter');
goog.require('goog.Disposable');
goog.require('goog.array');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -145,7 +145,7 @@ blk.env.server.ChunkSendQueue.prototype.process = function(time, center) {
var sendCount = Math.min(blk.env.server.ChunkSendQueue.MAX_CHUNK_SENDS_,
this.sendQueue_.length);

wtfapi.trace.appendScopeData('count', this.sendQueue_.length);
WTF.trace.appendScopeData('count', this.sendQueue_.length);

// Re-sort the send list
if (time - this.lastSortTime_ >
Expand Down Expand Up @@ -231,7 +231,7 @@ blk.env.server.ChunkSendQueue.prototype.invalidateBlockRegion =
goog.nullFunction;


blk.env.server.ChunkSendQueue = wtfapi.trace.instrumentType(
blk.env.server.ChunkSendQueue = WTF.trace.instrumentType(
blk.env.server.ChunkSendQueue, 'blk.env.server.ChunkSendQueue',
goog.reflect.object(blk.env.server.ChunkSendQueue, {
process: 'process'
Expand Down
4 changes: 2 additions & 2 deletions src/blk/game/client/clientcontroller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.async.Deferred');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -834,7 +834,7 @@ blk.game.client.ClientController.prototype.connected = goog.nullFunction;
blk.game.client.ClientController.prototype.disconnected = goog.nullFunction;


blk.game.client.ClientController = wtfapi.trace.instrumentType(
blk.game.client.ClientController = WTF.trace.instrumentType(
blk.game.client.ClientController, 'blk.game.client.ClientController',
goog.reflect.object(blk.game.client.ClientController, {
update: 'update',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/game/client/clientgame.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ goog.require('goog.asserts');
goog.require('goog.async.Deferred');
goog.require('goog.reflect');
goog.require('goog.userAgent.product');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -869,7 +869,7 @@ blk.game.client.ClientGame.prototype.getGameScreen_ = function() {
};


blk.game.client.ClientGame = wtfapi.trace.instrumentType(
blk.game.client.ClientGame = WTF.trace.instrumentType(
blk.game.client.ClientGame, 'blk.game.client.ClientGame',
goog.reflect.object(blk.game.client.ClientGame, {
connectToHost: 'connectToHost',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/game/fps/fpsclientcontroller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ goog.require('goog.events.KeyCodes');
goog.require('goog.reflect');
goog.require('goog.vec.Mat4');
goog.require('goog.vec.Vec4');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -501,7 +501,7 @@ blk.game.fps.FpsClientController.tmpVec4_ =
goog.vec.Vec4.createFloat32();


blk.game.fps.FpsClientController = wtfapi.trace.instrumentType(
blk.game.fps.FpsClientController = WTF.trace.instrumentType(
blk.game.fps.FpsClientController, 'blk.game.fps.FpsClientController',
goog.reflect.object(blk.game.fps.FpsClientController, {
entityAdded: 'entityAdded',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/game/fps/fpsservercontroller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ goog.require('blk.sim.Player');
goog.require('blk.sim.World');
goog.require('goog.asserts');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -119,7 +119,7 @@ blk.game.fps.FpsServerController.prototype.deletePlayer =
};


blk.game.fps.FpsServerController = wtfapi.trace.instrumentType(
blk.game.fps.FpsServerController = WTF.trace.instrumentType(
blk.game.fps.FpsServerController, 'blk.game.fps.FpsServerController',
goog.reflect.object(blk.game.fps.FpsServerController, {
setupSimulation: 'setupSimulation',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/game/server/servercontroller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.async.Deferred');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -400,7 +400,7 @@ blk.game.server.ServerController.prototype.connected = goog.nullFunction;
blk.game.server.ServerController.prototype.disconnected = goog.nullFunction;


blk.game.server.ServerController = wtfapi.trace.instrumentType(
blk.game.server.ServerController = WTF.trace.instrumentType(
blk.game.server.ServerController, 'blk.game.server.ServerController',
goog.reflect.object(blk.game.server.ServerController, {
load: 'load',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/game/server/servergame.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ goog.require('gf.log');
goog.require('gf.net.SessionType');
goog.require('gf.net.browser.BrowserClient');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -179,7 +179,7 @@ blk.game.server.ServerGame.prototype.render = function(frame) {
};


blk.game.server.ServerGame = wtfapi.trace.instrumentType(
blk.game.server.ServerGame = WTF.trace.instrumentType(
blk.game.server.ServerGame, 'blk.game.server.ServerGame',
goog.reflect.object(blk.game.server.ServerGame, {
update: 'update',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/graphics/blockbuilder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ goog.require('goog.asserts');
goog.require('goog.reflect');
goog.require('goog.vec.Mat4');
goog.require('goog.webgl');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -457,7 +457,7 @@ blk.graphics.BlockBuilder.prototype.draw = function(viewport, worldMatrix,
blk.graphics.BlockBuilder.tmpMat4_ = goog.vec.Mat4.createFloat32();


blk.graphics.BlockBuilder = wtfapi.trace.instrumentType(
blk.graphics.BlockBuilder = WTF.trace.instrumentType(
blk.graphics.BlockBuilder, 'blk.graphics.BlockBuilder',
goog.reflect.object(blk.graphics.BlockBuilder, {
createIndexBuffer: 'createIndexBuffer',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/graphics/renderlist.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ goog.provide('blk.graphics.RenderList');
goog.require('goog.Disposable');
goog.require('goog.reflect');
goog.require('goog.vec.Mat4');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -106,7 +106,7 @@ blk.graphics.RenderList.prototype.flush = function(viewport) {
};


blk.graphics.RenderList = wtfapi.trace.instrumentType(
blk.graphics.RenderList = WTF.trace.instrumentType(
blk.graphics.RenderList, 'blk.graphics.RenderList',
goog.reflect.object(blk.graphics.RenderList, {
flush: 'flush'
Expand Down
4 changes: 2 additions & 2 deletions src/blk/graphics/renderstate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ goog.require('goog.async.DeferredList');
goog.require('goog.reflect');
goog.require('goog.vec.Vec3');
goog.require('goog.webgl');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -751,7 +751,7 @@ blk.graphics.RenderState.LightingInfo.prototype.setModelUniforms =
};


blk.graphics.RenderState = wtfapi.trace.instrumentType(
blk.graphics.RenderState = WTF.trace.instrumentType(
blk.graphics.RenderState, 'blk.graphics.RenderState',
goog.reflect.object(blk.graphics.RenderState, {
reset: 'reset',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/io/chunkserializer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ goog.require('gf.net.PacketReader');
goog.require('gf.net.PacketWriter');
goog.require('goog.asserts');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -234,7 +234,7 @@ blk.io.ChunkSerializer.getSharedSerializer = function() {
};


blk.io.ChunkSerializer = wtfapi.trace.instrumentType(
blk.io.ChunkSerializer = WTF.trace.instrumentType(
blk.io.ChunkSerializer, 'blk.io.ChunkSerializer',
goog.reflect.object(blk.io.ChunkSerializer, {
serializeToWriter: 'serializeToWriter',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/io/mapstore.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.async.Deferred');
goog.require('goog.reflect');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -540,7 +540,7 @@ blk.io.MapStore.QueueEntry.comparePriority = function(a, b) {
};


blk.io.MapStore = wtfapi.trace.instrumentType(
blk.io.MapStore = WTF.trace.instrumentType(
blk.io.MapStore, 'blk.io.MapStore',
goog.reflect.object(blk.io.MapStore, {
update: 'update',
Expand Down
4 changes: 2 additions & 2 deletions src/blk/ui/playerlisting.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ goog.require('goog.reflect');
goog.require('goog.soy');
goog.require('goog.string');
goog.require('goog.style');
goog.require('wtfapi.trace');
goog.require('WTF.trace');



Expand Down Expand Up @@ -120,7 +120,7 @@ blk.ui.PlayerListing.prototype.refresh = function() {
};


blk.ui.PlayerListing = wtfapi.trace.instrumentType(
blk.ui.PlayerListing = WTF.trace.instrumentType(
blk.ui.PlayerListing, 'blk.ui.PlayerListing',
goog.reflect.object(blk.ui.PlayerListing, {
refresh: 'refresh'
Expand Down
2 changes: 1 addition & 1 deletion third_party/games-framework
Submodule games-framework updated 9 files
+1 −1 BUILD
+2 −2 src/gf/game.js
+2 −2 src/gf/net/clientsession.js
+2 −2 src/gf/sim/clientsimulator.js
+2 −2 src/gf/sim/serversimulator.js
+2 −2 src/gf/sim/simulator.js
+2 −2 src/gf/timing/rendertimer.js
+843 −0 third_party/wtf-trace-closure.js
+0 −503 third_party/wtf-trace-shim.js

0 comments on commit 169bc10

Please sign in to comment.