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

Side by Side Diff: content/browser/android/composited_touch_handle_drawable.cc

Issue 481683003: Support for Adaptive Handle Orientation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: some more cleaning up Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/android/composited_touch_handle_drawable.h" 5 #include "content/browser/android/composited_touch_handle_drawable.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "cc/layers/ui_resource_layer.h" 10 #include "cc/layers/ui_resource_layer.h"
(...skipping 26 matching lines...) Expand all
37 JNIEnv* env = base::android::AttachCurrentThread(); 37 JNIEnv* env = base::android::AttachCurrentThread();
38 if (!context) 38 if (!context)
39 context = base::android::GetApplicationContext(); 39 context = base::android::GetApplicationContext();
40 40
41 left_bitmap_ = CreateSkBitmapFromJavaBitmap( 41 left_bitmap_ = CreateSkBitmapFromJavaBitmap(
42 Java_HandleViewResources_getLeftHandleBitmap(env, context)); 42 Java_HandleViewResources_getLeftHandleBitmap(env, context));
43 right_bitmap_ = CreateSkBitmapFromJavaBitmap( 43 right_bitmap_ = CreateSkBitmapFromJavaBitmap(
44 Java_HandleViewResources_getRightHandleBitmap(env, context)); 44 Java_HandleViewResources_getRightHandleBitmap(env, context));
45 center_bitmap_ = CreateSkBitmapFromJavaBitmap( 45 center_bitmap_ = CreateSkBitmapFromJavaBitmap(
46 Java_HandleViewResources_getCenterHandleBitmap(env, context)); 46 Java_HandleViewResources_getCenterHandleBitmap(env, context));
47 left_inverted_bitmap_ = CreateSkBitmapFromJavaBitmap(
48 Java_HandleViewResources_getLeftHandleBitmapInverted(env, context));
49 right_inverted_bitmap_ = CreateSkBitmapFromJavaBitmap(
50 Java_HandleViewResources_getRightHandleBitmapInverted(env, context));
51 center_inverted_bitmap_ = CreateSkBitmapFromJavaBitmap(
52 Java_HandleViewResources_getCenterHandleBitmapInverted(env, context));
47 53
48 left_bitmap_.setImmutable(); 54 left_bitmap_.setImmutable();
49 right_bitmap_.setImmutable(); 55 right_bitmap_.setImmutable();
50 center_bitmap_.setImmutable(); 56 center_bitmap_.setImmutable();
57 left_inverted_bitmap_.setImmutable();
58 right_inverted_bitmap_.setImmutable();
59 center_inverted_bitmap_.setImmutable();
51 } 60 }
52 61
53 const SkBitmap& GetBitmap(TouchHandleOrientation orientation) { 62 const SkBitmap& GetBitmap(TouchHandleOrientation orientation) {
54 DCHECK(loaded_); 63 DCHECK(loaded_);
55 switch (orientation) { 64 switch (orientation) {
56 case TOUCH_HANDLE_LEFT: 65 case TOUCH_HANDLE_LEFT:
57 return left_bitmap_; 66 return left_bitmap_;
58 case TOUCH_HANDLE_RIGHT: 67 case TOUCH_HANDLE_RIGHT:
59 return right_bitmap_; 68 return right_bitmap_;
60 case TOUCH_HANDLE_CENTER: 69 case TOUCH_HANDLE_CENTER:
61 return center_bitmap_; 70 return center_bitmap_;
71 case TOUCH_HANDLE_LEFT_INVERTED:
72 return left_inverted_bitmap_;
73 case TOUCH_HANDLE_RIGHT_INVERTED:
74 return right_inverted_bitmap_;
75 case TOUCH_HANDLE_LEFT_FLIPPED:
76 return right_bitmap_;
77 case TOUCH_HANDLE_RIGHT_FLIPPED:
78 return left_bitmap_;
79 case TOUCH_HANDLE_LEFT_FLIPPED_INVERTED:
80 return right_inverted_bitmap_;
81 case TOUCH_HANDLE_RIGHT_FLIPPED_INVERTED:
82 return left_inverted_bitmap_;
83 case TOUCH_HANDLE_CENTER_INVERTED:
84 return center_inverted_bitmap_;
62 case TOUCH_HANDLE_ORIENTATION_UNDEFINED: 85 case TOUCH_HANDLE_ORIENTATION_UNDEFINED:
63 NOTREACHED() << "Invalid touch handle orientation."; 86 NOTREACHED() << "Invalid touch handle orientation.";
64 }; 87 };
65 return center_bitmap_; 88 return center_bitmap_;
66 } 89 }
67 90
68 private: 91 private:
69 SkBitmap left_bitmap_; 92 SkBitmap left_bitmap_;
70 SkBitmap right_bitmap_; 93 SkBitmap right_bitmap_;
71 SkBitmap center_bitmap_; 94 SkBitmap center_bitmap_;
95 SkBitmap left_inverted_bitmap_;
96 SkBitmap right_inverted_bitmap_;
97 SkBitmap center_inverted_bitmap_;
72 bool loaded_; 98 bool loaded_;
73 99
74 DISALLOW_COPY_AND_ASSIGN(HandleResources); 100 DISALLOW_COPY_AND_ASSIGN(HandleResources);
75 }; 101 };
76 102
77 base::LazyInstance<HandleResources>::Leaky g_selection_resources; 103 base::LazyInstance<HandleResources>::Leaky g_selection_resources;
78 104
79 } // namespace 105 } // namespace
80 106
81 CompositedTouchHandleDrawable::CompositedTouchHandleDrawable( 107 CompositedTouchHandleDrawable::CompositedTouchHandleDrawable(
(...skipping 28 matching lines...) Expand all
110 switch (orientation_) { 136 switch (orientation_) {
111 case TOUCH_HANDLE_LEFT: 137 case TOUCH_HANDLE_LEFT:
112 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.75f, 0); 138 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.75f, 0);
113 break; 139 break;
114 case TOUCH_HANDLE_RIGHT: 140 case TOUCH_HANDLE_RIGHT:
115 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.25f, 0); 141 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.25f, 0);
116 break; 142 break;
117 case TOUCH_HANDLE_CENTER: 143 case TOUCH_HANDLE_CENTER:
118 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.5f, 0); 144 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.5f, 0);
119 break; 145 break;
146 case TOUCH_HANDLE_LEFT_INVERTED:
147 focal_offset_from_origin_ =
148 gfx::Vector2dF(bitmap.width() * 0.75f, bitmap.height());
149 break;
150 case TOUCH_HANDLE_RIGHT_INVERTED:
151 focal_offset_from_origin_ =
152 gfx::Vector2dF(bitmap.width() * 0.25f, bitmap.height());
153 break;
154 case TOUCH_HANDLE_LEFT_FLIPPED:
155 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.25f, 0);
156 break;
157 case TOUCH_HANDLE_RIGHT_FLIPPED:
158 focal_offset_from_origin_ = gfx::Vector2dF(bitmap.width() * 0.75f, 0);
159 break;
160 case TOUCH_HANDLE_LEFT_FLIPPED_INVERTED:
161 focal_offset_from_origin_ =
162 gfx::Vector2dF(bitmap.width() * 0.25f, bitmap.height());
163 break;
164 case TOUCH_HANDLE_RIGHT_FLIPPED_INVERTED:
165 focal_offset_from_origin_ =
166 gfx::Vector2dF(bitmap.width() * 0.75f, bitmap.height());
167 break;
168 case TOUCH_HANDLE_CENTER_INVERTED:
169 focal_offset_from_origin_ =
170 gfx::Vector2dF(bitmap.width() * 0.5f, bitmap.height());
171 break;
120 case TOUCH_HANDLE_ORIENTATION_UNDEFINED: 172 case TOUCH_HANDLE_ORIENTATION_UNDEFINED:
121 NOTREACHED() << "Invalid touch handle orientation."; 173 NOTREACHED() << "Invalid touch handle orientation.";
122 break; 174 break;
123 }; 175 };
124 176
125 layer_->SetPosition(focal_position_ - focal_offset_from_origin_); 177 layer_->SetPosition(focal_position_ - focal_offset_from_origin_);
126 } 178 }
127 179
128 void CompositedTouchHandleDrawable::SetAlpha(float alpha) { 180 void CompositedTouchHandleDrawable::SetAlpha(float alpha) {
129 DCHECK(layer_->parent()); 181 DCHECK(layer_->parent());
(...skipping 26 matching lines...) Expand all
156 layer_->bounds().width(), 208 layer_->bounds().width(),
157 layer_->bounds().height()); 209 layer_->bounds().height());
158 } 210 }
159 211
160 // static 212 // static
161 bool CompositedTouchHandleDrawable::RegisterHandleViewResources(JNIEnv* env) { 213 bool CompositedTouchHandleDrawable::RegisterHandleViewResources(JNIEnv* env) {
162 return RegisterNativesImpl(env); 214 return RegisterNativesImpl(env);
163 } 215 }
164 216
165 } // namespace content 217 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698