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

Side by Side Diff: ui/gfx/win/direct_manipulation.cc

Issue 2824773002: Rename ScopedComPtr::get() to ScopedComPtr::Get() (Closed)
Patch Set: Update to 5293966 Created 3 years, 8 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
« no previous file with comments | « ui/gfx/platform_font_win.cc ('k') | ui/gfx/win/direct_write.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/gfx/win/direct_manipulation.h" 5 #include "ui/gfx/win/direct_manipulation.h"
6 6
7 #include "base/win/windows_version.h" 7 #include "base/win/windows_version.h"
8 8
9 namespace gfx { 9 namespace gfx {
10 namespace win { 10 namespace win {
(...skipping 26 matching lines...) Expand all
37 nullptr, CLSCTX_INPROC_SERVER); 37 nullptr, CLSCTX_INPROC_SERVER);
38 CHECK(SUCCEEDED(hr)); 38 CHECK(SUCCEEDED(hr));
39 39
40 hr = compositor_.CreateInstance(CLSID_DCompManipulationCompositor, 40 hr = compositor_.CreateInstance(CLSID_DCompManipulationCompositor,
41 nullptr, CLSCTX_INPROC_SERVER); 41 nullptr, CLSCTX_INPROC_SERVER);
42 CHECK(SUCCEEDED(hr)); 42 CHECK(SUCCEEDED(hr));
43 43
44 hr = manager_->GetUpdateManager(IID_PPV_ARGS(update_manager_.Receive())); 44 hr = manager_->GetUpdateManager(IID_PPV_ARGS(update_manager_.Receive()));
45 CHECK(SUCCEEDED(hr)); 45 CHECK(SUCCEEDED(hr));
46 46
47 hr = compositor_->SetUpdateManager(update_manager_.get()); 47 hr = compositor_->SetUpdateManager(update_manager_.Get());
48 CHECK(SUCCEEDED(hr)); 48 CHECK(SUCCEEDED(hr));
49 49
50 hr = frame_info_.QueryFrom(compositor_.get()); 50 hr = frame_info_.QueryFrom(compositor_.Get());
51 CHECK(SUCCEEDED(hr)); 51 CHECK(SUCCEEDED(hr));
52 52
53 hr = manager_->CreateViewport(frame_info_.get(), window, 53 hr = manager_->CreateViewport(frame_info_.Get(), window,
54 IID_PPV_ARGS(view_port_outer_.Receive())); 54 IID_PPV_ARGS(view_port_outer_.Receive()));
55 CHECK(SUCCEEDED(hr)); 55 CHECK(SUCCEEDED(hr));
56 56
57 // 57 //
58 // Enable the desired configuration for each viewport. 58 // Enable the desired configuration for each viewport.
59 // 59 //
60 DIRECTMANIPULATION_CONFIGURATION configuration = 60 DIRECTMANIPULATION_CONFIGURATION configuration =
61 DIRECTMANIPULATION_CONFIGURATION_INTERACTION 61 DIRECTMANIPULATION_CONFIGURATION_INTERACTION
62 | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X 62 | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_X
63 | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y 63 | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_Y
64 | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA 64 | DIRECTMANIPULATION_CONFIGURATION_TRANSLATION_INERTIA
65 | DIRECTMANIPULATION_CONFIGURATION_RAILS_X 65 | DIRECTMANIPULATION_CONFIGURATION_RAILS_X
66 | DIRECTMANIPULATION_CONFIGURATION_RAILS_Y 66 | DIRECTMANIPULATION_CONFIGURATION_RAILS_Y
67 | DIRECTMANIPULATION_CONFIGURATION_SCALING 67 | DIRECTMANIPULATION_CONFIGURATION_SCALING
68 | DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA; 68 | DIRECTMANIPULATION_CONFIGURATION_SCALING_INERTIA;
69 69
70 hr = view_port_outer_->ActivateConfiguration(configuration); 70 hr = view_port_outer_->ActivateConfiguration(configuration);
71 CHECK(SUCCEEDED(hr)); 71 CHECK(SUCCEEDED(hr));
72 } 72 }
73 73
74 void DirectManipulationHelper::SetBounds(const gfx::Rect& bounds) { 74 void DirectManipulationHelper::SetBounds(const gfx::Rect& bounds) {
75 base::win::ScopedComPtr<IDirectManipulationPrimaryContent> 75 base::win::ScopedComPtr<IDirectManipulationPrimaryContent>
76 primary_content_outer; 76 primary_content_outer;
77 HRESULT hr = view_port_outer_->GetPrimaryContent( 77 HRESULT hr = view_port_outer_->GetPrimaryContent(
78 IID_PPV_ARGS(primary_content_outer.Receive())); 78 IID_PPV_ARGS(primary_content_outer.Receive()));
79 CHECK(SUCCEEDED(hr)); 79 CHECK(SUCCEEDED(hr));
80 80
81 base::win::ScopedComPtr<IDirectManipulationContent> content_outer; 81 base::win::ScopedComPtr<IDirectManipulationContent> content_outer;
82 hr = content_outer.QueryFrom(primary_content_outer.get()); 82 hr = content_outer.QueryFrom(primary_content_outer.Get());
83 CHECK(SUCCEEDED(hr)); 83 CHECK(SUCCEEDED(hr));
84 84
85 RECT rect = bounds.ToRECT(); 85 RECT rect = bounds.ToRECT();
86 86
87 hr = view_port_outer_->SetViewportRect(&rect); 87 hr = view_port_outer_->SetViewportRect(&rect);
88 CHECK(SUCCEEDED(hr)); 88 CHECK(SUCCEEDED(hr));
89 89
90 hr = content_outer->SetContentRect(&rect); 90 hr = content_outer->SetContentRect(&rect);
91 CHECK(SUCCEEDED(hr)); 91 CHECK(SUCCEEDED(hr));
92 } 92 }
(...skipping 15 matching lines...) Expand all
108 HRESULT hr = view_port_outer_->SetContact(DIRECTMANIPULATION_MOUSEFOCUS); 108 HRESULT hr = view_port_outer_->SetContact(DIRECTMANIPULATION_MOUSEFOCUS);
109 if (SUCCEEDED(hr)) { 109 if (SUCCEEDED(hr)) {
110 BOOL handled = FALSE; 110 BOOL handled = FALSE;
111 manager_->ProcessInput(&msg, &handled); 111 manager_->ProcessInput(&msg, &handled);
112 view_port_outer_->ReleaseContact(DIRECTMANIPULATION_MOUSEFOCUS); 112 view_port_outer_->ReleaseContact(DIRECTMANIPULATION_MOUSEFOCUS);
113 } 113 }
114 } 114 }
115 115
116 } // namespace win. 116 } // namespace win.
117 } // namespace gfx. 117 } // namespace gfx.
OLDNEW
« no previous file with comments | « ui/gfx/platform_font_win.cc ('k') | ui/gfx/win/direct_write.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698