Skip to content

Commit

Permalink
Grab bag of semicolon removals.
Browse files Browse the repository at this point in the history
Bug: 926235
Change-Id: I14f82448d1c618f9b2bd1b3bfe883f3933c7ca9b
Reviewed-on: https://chromium-review.googlesource.com/c/1471005
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#631956}
  • Loading branch information
nico authored and Commit Bot committed Feb 13, 2019
1 parent e1c9e5b commit 5cb415d
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class PictureInPictureDelegate : public WebContentsDelegate {
class TestOverlayWindow : public OverlayWindow {
public:
TestOverlayWindow() = default;
~TestOverlayWindow() override{};
~TestOverlayWindow() override {}

static std::unique_ptr<OverlayWindow> Create(
PictureInPictureWindowController* controller) {
Expand Down
2 changes: 1 addition & 1 deletion gpu/command_buffer/service/gles2_cmd_decoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5012,7 +5012,7 @@ gfx::Size GLES2DecoderImpl::GetBoundDrawFramebufferSize() {
} else {
return surface_->GetSize();
}
};
}

GLuint GLES2DecoderImpl::GetBoundReadFramebufferServiceId() {
Framebuffer* framebuffer = GetBoundReadFramebuffer();
Expand Down
4 changes: 2 additions & 2 deletions media/ffmpeg/ffmpeg_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// Include FFmpeg header files.
extern "C" {
// Temporarily disable possible loss of data warning.
MSVC_PUSH_DISABLE_WARNING(4244);
MSVC_PUSH_DISABLE_WARNING(4244)
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavformat/avio.h>
Expand All @@ -34,7 +34,7 @@ MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavutil/log.h>
#include <libavutil/mathematics.h>
#include <libavutil/opt.h>
MSVC_POP_WARNING();
MSVC_POP_WARNING()
} // extern "C"

namespace media {
Expand Down
3 changes: 1 addition & 2 deletions media/filters/ffmpeg_demuxer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ static void EosOnReadDone(bool* got_eos_buffer,
EXPECT_TRUE(buffer->data());
EXPECT_GT(buffer->data_size(), 0u);
*got_eos_buffer = false;
};

}

// Fixture class to facilitate writing tests. Takes care of setting up the
// FFmpeg, pipeline and filter host mocks.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class CORE_EXPORT ObjectPaintProperties {
} \
\
private: \
scoped_refptr<type##PaintPropertyNode> variable;
scoped_refptr<type##PaintPropertyNode> variable
// (End of ADD_NODE definition)

#define ADD_TRANSFORM(function, variable) \
Expand Down Expand Up @@ -207,7 +207,7 @@ class CORE_EXPORT ObjectPaintProperties {
// containment. It is the deepest child of any clip tree on the contain:
// paint element.
ADD_CLIP(FragmentClip, fragment_clip_);
ADD_CLIP(ClipPathClip, clip_path_clip_)
ADD_CLIP(ClipPathClip, clip_path_clip_);
ADD_CLIP(MaskClip, mask_clip_);
ADD_CLIP(CssClip, css_clip_);
ADD_CLIP(CssClipFixedPosition, css_clip_fixed_position_);
Expand Down
2 changes: 1 addition & 1 deletion ui/views/controls/menu/menu_model_adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
int item_id);

// MenuModelDelegate:
void OnIconChanged(int index) override{};
void OnIconChanged(int index) override {}
void OnMenuStructureChanged() override;
void OnMenuClearingDelegate() override;

Expand Down
46 changes: 23 additions & 23 deletions ui/wm/core/focus_controller_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1425,70 +1425,70 @@ class FocusControllerParentRemovalTest : public FocusControllerRemovalTest {
IMPLICIT_FOCUS_CHANGE_TARGET_TESTS(TESTNAME)

// - Focuses a window, verifies that focus changed.
ALL_FOCUS_TESTS(BasicFocus);
ALL_FOCUS_TESTS(BasicFocus)

// - Activates a window, verifies that activation changed.
TARGET_FOCUS_TESTS(BasicActivation);
TARGET_FOCUS_TESTS(BasicActivation)

// - Focuses a window, verifies that focus events were dispatched.
ALL_FOCUS_TESTS(FocusEvents);
ALL_FOCUS_TESTS(FocusEvents)

// - Focuses or activates a window multiple times, verifies that events are only
// dispatched when focus/activation actually changes.
DIRECT_FOCUS_CHANGE_TESTS(DuplicateFocusEvents);
DIRECT_FOCUS_CHANGE_TESTS(DuplicateActivationEvents);
DIRECT_FOCUS_CHANGE_TESTS(DuplicateFocusEvents)
DIRECT_FOCUS_CHANGE_TESTS(DuplicateActivationEvents)

// - Activates a window, verifies that activation events were dispatched.
TARGET_FOCUS_TESTS(ActivationEvents);
TARGET_FOCUS_TESTS(ActivationEvents)

// - Attempts to active a hidden window, verifies that current window is
// attempted to be reactivated and the appropriate event dispatched.
FOCUS_CONTROLLER_TEST(FocusControllerApiTest, ReactivationEvents);
FOCUS_CONTROLLER_TEST(FocusControllerApiTest, ReactivationEvents)

// - Input events/API calls shift focus between focusable windows within the
// active window.
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusWithinActiveWindow);
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusWithinActiveWindow)

// - Input events/API calls to a child window of an inactive window shifts
// activation to the activatable parent and focuses the child.
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusToChildOfInactiveWindow);
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusToChildOfInactiveWindow)

// - Input events/API calls to focus the parent of the focused window do not
// shift focus away from the child.
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusToParentOfFocusedWindow);
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusToParentOfFocusedWindow)

// - Verifies that FocusRules determine what can be focused.
ALL_FOCUS_TESTS(FocusRulesOverride);
ALL_FOCUS_TESTS(FocusRulesOverride)

// - Verifies that FocusRules determine what can be activated.
TARGET_FOCUS_TESTS(ActivationRulesOverride);
TARGET_FOCUS_TESTS(ActivationRulesOverride)

// - Verifies that attempts to change focus or activation from a focus or
// activation change observer are ignored.
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusOnActivation);
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusOnActivationDueToHide);
DIRECT_FOCUS_CHANGE_TESTS(NoShiftActiveOnActivation);
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusOnActivation)
DIRECT_FOCUS_CHANGE_TESTS(ShiftFocusOnActivationDueToHide)
DIRECT_FOCUS_CHANGE_TESTS(NoShiftActiveOnActivation)

FOCUS_CONTROLLER_TEST(FocusControllerApiTest, FocusChangeDuringDrag);
FOCUS_CONTROLLER_TEST(FocusControllerApiTest, FocusChangeDuringDrag)

FOCUS_CONTROLLER_TEST(FocusControllerApiTest,
ChangeFocusWhenNothingFocusedAndCaptured);
ChangeFocusWhenNothingFocusedAndCaptured)

// See description above DontPassDeletedWindow() for details.
FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow);
FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow)

FOCUS_CONTROLLER_TEST(FocusControllerApiTest, StackWindowAtTopOnActivation);
FOCUS_CONTROLLER_TEST(FocusControllerApiTest, StackWindowAtTopOnActivation)

FOCUS_CONTROLLER_TEST(FocusControllerApiTest,
HideFocusedWindowDuringActivationLoss);
HideFocusedWindowDuringActivationLoss)

FOCUS_CONTROLLER_TEST(FocusControllerApiTest, ActivateWhileActivating);
FOCUS_CONTROLLER_TEST(FocusControllerApiTest, ActivateWhileActivating)

// See description above TransientChildWindowActivationTest() for details.
FOCUS_CONTROLLER_TEST(FocusControllerParentHideTest,
TransientChildWindowActivationTest);
TransientChildWindowActivationTest)

// If a mouse event was handled, it should not activate a window.
FOCUS_CONTROLLER_TEST(FocusControllerMouseEventTest, IgnoreHandledEvent);
FOCUS_CONTROLLER_TEST(FocusControllerMouseEventTest, IgnoreHandledEvent)

} // namespace wm

0 comments on commit 5cb415d

Please sign in to comment.