Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Firefox to be able to connect to devtools again #10158

Merged
merged 3 commits into from Mar 24, 2016
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

Add a dummy reconfigure reply in the thread actor

  • Loading branch information
nox committed Mar 24, 2016
commit 04e085a4e50df45ed38e43172ceee055d3e68280
@@ -77,6 +77,12 @@ struct EvaluateJSReply {
helperResult: Json,
}

#[derive(RustcEncodable)]
struct SetPreferencesReply {
from: String,
updated: Vec<String>,
}

pub struct ConsoleActor {
pub name: String,
pub pipeline: PipelineId,
@@ -237,6 +243,15 @@ impl Actor for ConsoleActor {
ActorMessageStatus::Processed
}

"setPreferences" => {
let msg = SetPreferencesReply {
from: self.name(),
updated: vec![],
};
stream.write_json_packet(&msg);
ActorMessageStatus::Processed
}

_ => ActorMessageStatus::Ignored
})
}
@@ -30,6 +30,11 @@ struct ThreadResumedReply {
__type__: String,
}

#[derive(RustcEncodable)]
struct ReconfigureReply {
from: String
}

pub struct ThreadActor {
name: String,
}
@@ -74,6 +79,11 @@ impl Actor for ThreadActor {
ActorMessageStatus::Processed
},

"reconfigure" => {
stream.write_json_packet(&ReconfigureReply { from: self.name() });
ActorMessageStatus::Processed
}

_ => ActorMessageStatus::Ignored,
})
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.