Skip to content

Commit

Permalink
Bug 1504835 - Remove remaining references to web replay graphics over…
Browse files Browse the repository at this point in the history
…lay, r=lsmyth.
  • Loading branch information
bhackett1024 committed Nov 5, 2018
1 parent c50e00a commit 5fd2194
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 38 deletions.
9 changes: 1 addition & 8 deletions devtools/server/actors/replay/graphics.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ Cu.evalInSandbox(
);

// Windows in the middleman process are initially set up as about:blank pages.
// This method fills them in with a canvas filling the tab, and an overlay that
// can be displayed over that canvas.
// This method fills them in with a canvas filling the tab.
function setupContents(window) {
// The middlemanCanvas element fills the tab's contents.
const canvas = window.middlemanCanvas = window.document.createElement("canvas");
Expand Down Expand Up @@ -91,13 +90,7 @@ function UpdateCanvas(buffer, width, height, hadFailure) {
}
}

// Entry point for when we need to update the overlay's contents or visibility.
// eslint-disable-next-line no-unused-vars
function UpdateOverlay() {
}

// eslint-disable-next-line no-unused-vars
var EXPORTED_SYMBOLS = [
"UpdateCanvas",
"UpdateOverlay",
];
17 changes: 0 additions & 17 deletions toolkit/recordreplay/ipc/ParentGraphics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,23 +201,6 @@ UpdateGraphicsInUIProcess(const PaintMessage* aMsg)
}
}

void
UpdateGraphicsOverlay()
{
if (!gLastPaintWidth || !gLastPaintHeight) {
return;
}

AutoSafeJSContext cx;
JSAutoRealm ar(cx, *gGraphicsSandbox);

RootedValue rval(cx);
if (!JS_CallFunctionName(cx, *gGraphicsSandbox, "UpdateOverlay",
JS::HandleValueArray::empty(), &rval)) {
MOZ_CRASH("UpdateGraphicsOverlay");
}
}

static void
MaybeTriggerExplicitPaint()
{
Expand Down
10 changes: 0 additions & 10 deletions toolkit/recordreplay/ipc/ParentIPC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -611,12 +611,6 @@ SwitchActiveChild(ChildProcessInfo* aChild, bool aRecoverPosition = true)
oldActiveChild->RecoverToCheckpoint(oldActiveChild->MostRecentSavedCheckpoint());
oldActiveChild->SetRole(MakeUnique<ChildRoleStandby>());
}

// The graphics overlay is affected when we switch between recording and
// replaying children.
if (aChild->IsRecording() != oldActiveChild->IsRecording()) {
UpdateGraphicsOverlay();
}
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1187,10 +1181,6 @@ RecvHitCheckpoint(const HitCheckpointMessage& aMsg)
UpdateCheckpointTimes(aMsg);
MaybeUpdateGraphicsAtCheckpoint(aMsg.mCheckpointId);

if (!gActiveChild->IsRecording()) {
UpdateGraphicsOverlay();
}

// Resume either forwards or backwards. Break the resume off into a separate
// runnable, to avoid starving any code already on the stack and waiting for
// the process to pause. Immediately resume if the main thread is blocked.
Expand Down
3 changes: 0 additions & 3 deletions toolkit/recordreplay/ipc/ParentInternal.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ void SendGraphicsMemoryToChild();
// an unhandled recording divergence.
void UpdateGraphicsInUIProcess(const PaintMessage* aMsg);

// Update the overlay shown over the tab's graphics.
void UpdateGraphicsOverlay();

// If necessary, update graphics after the active child sends a paint message
// or reaches a checkpoint.
void MaybeUpdateGraphicsAtPaint(const PaintMessage& aMsg);
Expand Down

0 comments on commit 5fd2194

Please sign in to comment.