Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 22448003: Remove CHECK when setting the plugin window property. There could be a race condition where the win… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 949
950 // Make sure each plugin window (or its wrapper if it exists) has a pointer to 950 // Make sure each plugin window (or its wrapper if it exists) has a pointer to
951 // |this|. 951 // |this|.
952 for (size_t i = 0; i < moves.size(); ++i) { 952 for (size_t i = 0; i < moves.size(); ++i) {
953 HWND window = moves[i].window; 953 HWND window = moves[i].window;
954 if (GetParent(window) != parent) { 954 if (GetParent(window) != parent) {
955 window = GetParent(window); 955 window = GetParent(window);
956 DCHECK(GetParent(window) == parent); 956 DCHECK(GetParent(window) == parent);
957 } 957 }
958 if (!GetProp(window, kWidgetOwnerProperty)) 958 if (!GetProp(window, kWidgetOwnerProperty))
959 CHECK(SetProp(window, kWidgetOwnerProperty, this)); 959 SetProp(window, kWidgetOwnerProperty, this);
960 } 960 }
961 #endif // defined(OS_WIN) 961 #endif // defined(OS_WIN)
962 } 962 }
963 963
964 void RenderWidgetHostViewAura::Focus() { 964 void RenderWidgetHostViewAura::Focus() {
965 // Make sure we have a FocusClient before attempting to Focus(). In some 965 // Make sure we have a FocusClient before attempting to Focus(). In some
966 // situations we may not yet be in a valid Window hierarchy (such as reloading 966 // situations we may not yet be in a valid Window hierarchy (such as reloading
967 // after out of memory discarded the tab). 967 // after out of memory discarded the tab).
968 aura::client::FocusClient* client = aura::client::GetFocusClient(window_); 968 aura::client::FocusClient* client = aura::client::GetFocusClient(window_);
969 if (client) 969 if (client)
(...skipping 2201 matching lines...) Expand 10 before | Expand all | Expand 10 after
3171 RenderWidgetHost* widget) { 3171 RenderWidgetHost* widget) {
3172 return new RenderWidgetHostViewAura(widget); 3172 return new RenderWidgetHostViewAura(widget);
3173 } 3173 }
3174 3174
3175 // static 3175 // static
3176 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 3176 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
3177 GetScreenInfoForWindow(results, NULL); 3177 GetScreenInfoForWindow(results, NULL);
3178 } 3178 }
3179 3179
3180 } // namespace content 3180 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698