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

Report blank lines that follow an open brace #11472

Merged
merged 2 commits into from May 28, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -548,7 +548,6 @@ impl<'a> CanvasPaintThread<'a> {
offset: Point2D<f64>,
image_data_size: Size2D<f64>,
mut dirty_rect: Rect<f64>) {

if image_data_size.width <= 0.0 || image_data_size.height <= 0.0 {
return
}
@@ -929,7 +929,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
debug!("Panic handler for pipeline {:?}: {}.", pipeline_id, reason);

if let Some(pipeline_id) = pipeline_id {

let parent_info = self.pipelines.get(&pipeline_id).and_then(|pipeline| pipeline.parent_info);
let window_size = self.pipelines.get(&pipeline_id).and_then(|pipeline| pipeline.size);

@@ -1026,13 +1025,11 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
// containing_page_pipeline_id's frame tree's children. This message is never the result of a
// page navigation.
fn handle_script_loaded_url_in_iframe_msg(&mut self, load_info: IFrameLoadInfo) {

let old_pipeline_id = load_info.old_subpage_id
.and_then(|old_subpage_id| self.subpage_map.get(&(load_info.containing_pipeline_id, old_subpage_id)))
.cloned();

let (load_data, script_chan, window_size) = {

let old_pipeline = old_pipeline_id
.and_then(|old_pipeline_id| self.pipelines.get(&old_pipeline_id));

@@ -1599,7 +1596,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
}

fn add_or_replace_pipeline_in_frame_tree(&mut self, frame_change: FrameChange) {

// If the currently focused pipeline is the one being changed (or a child
// of the pipeline being changed) then update the focus pipeline to be
// the replacement.
@@ -1804,7 +1800,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
// are met, then the output image should not change and a reftest
// screenshot can safely be written.
for frame in self.current_frame_tree_iter(self.root_frame_id) {

let pipeline_id = frame.current;

let pipeline = match self.pipelines.get(&pipeline_id) {
@@ -2050,7 +2045,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
// with low-resource scenarios.
if let Some(root_frame_id) = self.root_frame_id {
if let Some(frame_tree) = self.frame_to_sendable(root_frame_id) {

let (chan, port) = ipc::channel().expect("Failed to create IPC channel!");
self.compositor_proxy.send(ToCompositorMsg::SetFrameTree(frame_tree,
chan,
@@ -373,7 +373,6 @@ impl NetworkEventActor {
}

pub fn response_cookies(&self) -> ResponseCookiesMsg {

let mut cookies_size = 0;
if let Some(ref headers) = self.response.headers {
cookies_size = match headers.get() {
@@ -387,7 +386,6 @@ impl NetworkEventActor {
}

pub fn response_headers(&self) -> ResponseHeadersMsg {

let mut headers_size = 0;
let mut headers_byte_count = 0;
if let Some(ref headers) = self.response.headers {
@@ -404,7 +402,6 @@ impl NetworkEventActor {
}

pub fn request_cookies(&self) -> RequestCookiesMsg {

let mut cookies_size = 0;
if let Some(ref headers) = self.response.headers {
cookies_size = match headers.get() {
@@ -127,7 +127,6 @@ impl TimelineActor {
pub fn new(name: String,
pipeline: PipelineId,
script_sender: IpcSender<DevtoolScriptControlMsg>) -> TimelineActor {

let marker_types = vec!(TimelineMarkerType::Reflow,
TimelineMarkerType::DOMEvent);

@@ -270,7 +269,6 @@ impl Emitter {
stream: TcpStream,
memory_actor_name: Option<String>,
framerate_actor_name: Option<String>) -> Emitter {

Emitter {
from: name,
stream: stream,
@@ -387,7 +387,6 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
pipeline_id: PipelineId,
request_id: String,
network_event: NetworkEvent) {

let console_actor_name = match find_console_actor(actors.clone(), pipeline_id, None,
actor_workers, actor_pipelines) {
Some(name) => name,
@@ -422,7 +422,6 @@ impl DisplayList {
traversal: &mut DisplayListTraversal<'a>,
paint_context: &mut PaintContext,
transform: &Matrix4D<f32>) {

if stacking_context.context_type != StackingContextType::Real {
self.draw_stacking_context_contents(stacking_context,
traversal,
@@ -405,7 +405,6 @@ impl FontCacheThread {

pub fn find_font_template(&self, family: FontFamily, desc: FontTemplateDescriptor)
-> Option<FontTemplateInfo> {

let (response_chan, response_port) = ipc::channel().unwrap();
self.chan.send(Command::GetFontTemplate(family, desc, response_chan)).unwrap();

@@ -420,7 +419,6 @@ impl FontCacheThread {

pub fn last_resort_font_template(&self, desc: FontTemplateDescriptor)
-> FontTemplateInfo {

let (response_chan, response_port) = ipc::channel().unwrap();
self.chan.send(Command::GetLastResortFontTemplate(desc, response_chan)).unwrap();

@@ -663,7 +663,6 @@ impl<'a> PaintContext<'a> {
fn corner_bounds(bounds: &Rect<f32>,
border: &SideOffsets2D<f32>,
radii: &BorderRadii<AzFloat>) -> (CornerOrigin, SideOffsets2D<Size2D<f32>>) {

fn distance_to_elbow(radius: &Size2D<AzFloat>,
corner_width: f32,
corner_height: f32) -> Size2D<f32> {
@@ -1658,7 +1657,6 @@ pub trait ToAzureRect {
}

impl ToAzureRect for Rect<Au> {

/// Round rects to pixel coordinates, maintaining the invariant of non-overlap,
/// assuming that before rounding rects don't overlap.
fn to_nearest_azure_rect(&self, pixels_per_px: ScaleFactor<PagePx, ScreenPx, f32>) -> Rect<AzFloat> {
@@ -867,7 +867,6 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
splits,
fragments: successors,
})) => {

// Bubble up {ib} splits.
self.accumulate_inline_block_splits(splits,
node,
@@ -120,7 +120,6 @@ impl<'a> StyleContext<'a, ServoSelectorImpl> for LayoutContext<'a> {

impl<'a> LayoutContext<'a> {
pub fn new(shared_layout_context: &'a SharedLayoutContext) -> LayoutContext<'a> {

let local_context = create_or_get_local_context(shared_layout_context);

LayoutContext {
@@ -108,7 +108,6 @@ impl FlexFlow {
pub fn from_fragment(fragment: Fragment,
flotation: Option<FloatKind>)
-> FlexFlow {

let (main_mode, is_reverse) = match fragment.style.get_position().flex_direction {
flex_direction::T::row => (Mode::Inline, false),
flex_direction::T::row_reverse => (Mode::Inline, true),
@@ -51,7 +51,6 @@ fn overflow_direction(writing_mode: &WritingMode) -> OverflowDirection {
}

impl LayoutRPC for LayoutRPCImpl {

// The neat thing here is that in order to answer the following two queries we only
// need to compare nodes for equality. Thus we can safely work only with `OpaqueNode`.
fn content_box(&self) -> ContentBoxResponse {
@@ -411,7 +411,6 @@ impl TextRunScanner {
#[inline]
fn bounding_box_for_run_metrics(metrics: &RunMetrics, writing_mode: WritingMode)
-> LogicalSize<Au> {

// This does nothing, but it will fail to build
// when more values are added to the `text-orientation` CSS property.
// This will be a reminder to update the code below.
@@ -982,7 +982,6 @@ impl<'a> PartialEq for ServoThreadSafeLayoutNode<'a> {
}

impl<'ln> DangerousThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {

unsafe fn dangerous_first_child(&self) -> Option<Self> {
self.get_jsmanaged().first_child_ref()
.map(|node| self.new_with_this_lifetime(&node))
@@ -77,7 +77,6 @@ fn match_headers(cors_cache: &CORSCacheEntry, cors_req: &Request) -> bool {
pub struct CORSCache(Vec<CORSCacheEntry>);

impl CORSCache {

pub fn new() -> CORSCache {
CORSCache(vec![])
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.