summaryrefslogtreecommitdiffstats
path: root/ash/sticky_keys/sticky_keys_overlay.cc
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2014-12-02 18:17:29 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-03 02:18:17 +0000
commite94ef4a31d0591d11421fa34065d3bc0dcd1302a (patch)
tree9ee89654a8fb50cf2c9635e580cd7c14db9c6138 /ash/sticky_keys/sticky_keys_overlay.cc
parent6450d054c6846df45ffb656c334d432f587a1dd3 (diff)
downloadchromium_src-e94ef4a31d0591d11421fa34065d3bc0dcd1302a.zip
chromium_src-e94ef4a31d0591d11421fa34065d3bc0dcd1302a.tar.gz
chromium_src-e94ef4a31d0591d11421fa34065d3bc0dcd1302a.tar.bz2
Revert of Speculative fix for sticky keys overlay crash. (patchset #2 id:20001 of https://codereview.chromium.org/754763005/)
Reason for revert: StickyKeysBrowserTest leaking memory. Original issue's description: > Speculative fix for sticky keys overlay crash. > > The new test case reproduces the same stack trace as in the bug, so it's very > probable that this case is causing the crash. > > BUG=435600 > > Committed: https://crrev.com/9391c0e45bc3ae50008d0aebf11437550e7f38c6 > Cr-Commit-Position: refs/heads/master@{#306504} TBR=jamescook@chromium.org,tengs@chromium.org NOTREECHECKS=true NOTRY=true BUG=435600 Review URL: https://codereview.chromium.org/757433005 Cr-Commit-Position: refs/heads/master@{#306529}
Diffstat (limited to 'ash/sticky_keys/sticky_keys_overlay.cc')
-rw-r--r--ash/sticky_keys/sticky_keys_overlay.cc12
1 files changed, 0 insertions, 12 deletions
diff --git a/ash/sticky_keys/sticky_keys_overlay.cc b/ash/sticky_keys/sticky_keys_overlay.cc
index 464d9f6..0766ba25 100644
--- a/ash/sticky_keys/sticky_keys_overlay.cc
+++ b/ash/sticky_keys/sticky_keys_overlay.cc
@@ -109,7 +109,6 @@ class StickyKeysOverlayView : public views::WidgetDelegateView {
// views::WidgetDelegateView overrides:
void OnPaint(gfx::Canvas* canvas) override;
- void DeleteDelegate() override;
void SetKeyState(ui::EventFlags modifier, StickyKeyState state);
@@ -167,13 +166,6 @@ void StickyKeysOverlayView::OnPaint(gfx::Canvas* canvas) {
views::WidgetDelegateView::OnPaint(canvas);
}
-void StickyKeysOverlayView::DeleteDelegate() {
- // The ownership of a WidgetDelegateView is kind of tricky. It has the
- // lifetime semantics of both a View and a WidgetDelegate. We should just rely
- // on the Views semantics and do nothing here. This object will be deleted
- // when the parent widget is deleted.
-}
-
void StickyKeysOverlayView::SetKeyState(ui::EventFlags modifier,
StickyKeyState state) {
ModifierLabelMap::iterator it = modifier_label_map_.find(modifier);
@@ -287,10 +279,6 @@ StickyKeyState StickyKeysOverlay::GetModifierKeyState(
return overlay_view_->GetKeyState(modifier);
}
-views::Widget* StickyKeysOverlay::GetWidgetForTesting() {
- return overlay_widget_.get();
-}
-
gfx::Rect StickyKeysOverlay::CalculateOverlayBounds() {
int x = is_visible_ ? kHorizontalOverlayOffset : -widget_size_.width();
return gfx::Rect(gfx::Point(x, kVerticalOverlayOffset), widget_size_);