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

Side by Side Diff: webkit/glue/plugins/fake_plugin_window_tracker_mac.cc

Issue 165250: Merge 22799 - Set up a interposing library for Carbon calls made by plugins.... (Closed) Base URL: svn://chrome-svn/chrome/branches/197/src/
Patch Set: Created 11 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
Property Changes:
Added: svn:mergeinfo
Merged /trunk/src/webkit/glue/plugins/fake_plugin_window_tracker_mac.cc:r22799
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "base/logging.h" 5 #include "base/logging.h"
6 #include "webkit/glue/plugins/fake_plugin_window_tracker_mac.h" 6 #include "webkit/glue/plugins/fake_plugin_window_tracker_mac.h"
7 7
8 FakePluginWindowTracker::FakePluginWindowTracker() 8 FakePluginWindowTracker::FakePluginWindowTracker()
9 : window_to_delegate_map_(CFDictionaryCreateMutable(kCFAllocatorDefault, 9 : window_to_delegate_map_(CFDictionaryCreateMutable(kCFAllocatorDefault,
10 0, NULL, NULL)) { 10 0, NULL, NULL)) {
(...skipping 29 matching lines...) Expand all
40 CFDictionaryGetValue(window_to_delegate_map_, window)); 40 CFDictionaryGetValue(window_to_delegate_map_, window));
41 } 41 }
42 42
43 void FakePluginWindowTracker::RemoveFakeWindowForDelegate( 43 void FakePluginWindowTracker::RemoveFakeWindowForDelegate(
44 WebPluginDelegateImpl* delegate, WindowRef window) { 44 WebPluginDelegateImpl* delegate, WindowRef window) {
45 DCHECK(GetDelegateForFakeWindow(window) == delegate); 45 DCHECK(GetDelegateForFakeWindow(window) == delegate);
46 CFDictionaryRemoveValue(window_to_delegate_map_, delegate); 46 CFDictionaryRemoveValue(window_to_delegate_map_, delegate);
47 if (window) // Check just in case the initial window creation failed. 47 if (window) // Check just in case the initial window creation failed.
48 DisposeWindow(window); 48 DisposeWindow(window);
49 } 49 }
OLDNEW
« no previous file with comments | « webkit/glue/plugins/fake_plugin_window_tracker_mac.h ('k') | webkit/glue/plugins/webplugin_delegate_impl_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698