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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 888793002: Make content_browsertests for Chrome on Android running with valid Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set valid physical backing size before viewport size is set Created 5 years, 10 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 (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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
7 7
8 #include <map> 8 #include <map>
9 #include <queue> 9 #include <queue>
10 10
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 void SetOverlayVideoMode(bool enabled); 260 void SetOverlayVideoMode(bool enabled);
261 261
262 typedef base::Callback< 262 typedef base::Callback<
263 void(const base::string16& content, int start_offset, int end_offset)> 263 void(const base::string16& content, int start_offset, int end_offset)>
264 TextSurroundingSelectionCallback; 264 TextSurroundingSelectionCallback;
265 void SetTextSurroundingSelectionCallback( 265 void SetTextSurroundingSelectionCallback(
266 const TextSurroundingSelectionCallback& callback); 266 const TextSurroundingSelectionCallback& callback);
267 267
268 static void OnContextLost(); 268 static void OnContextLost();
269 269
270 float last_page_scale_factor() { return last_page_scale_factor_; }
271
270 private: 272 private:
271 void RunAckCallbacks(); 273 void RunAckCallbacks();
272 274
273 void DestroyDelegatedContent(); 275 void DestroyDelegatedContent();
274 void SwapDelegatedFrame(uint32 output_surface_id, 276 void SwapDelegatedFrame(uint32 output_surface_id,
275 scoped_ptr<cc::DelegatedFrameData> frame_data); 277 scoped_ptr<cc::DelegatedFrameData> frame_data);
276 void SendDelegatedFrameAck(uint32 output_surface_id); 278 void SendDelegatedFrameAck(uint32 output_surface_id);
277 void SendReturnedDelegatedResources(uint32 output_surface_id); 279 void SendReturnedDelegatedResources(uint32 output_surface_id);
278 280
279 void OnFrameMetadataUpdated( 281 void OnFrameMetadataUpdated(
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 scoped_ptr<LastFrameInfo> last_frame_info_; 404 scoped_ptr<LastFrameInfo> last_frame_info_;
403 405
404 TextSurroundingSelectionCallback text_surrounding_selection_callback_; 406 TextSurroundingSelectionCallback text_surrounding_selection_callback_;
405 407
406 // List of readbackrequests waiting for arrival of a valid frame. 408 // List of readbackrequests waiting for arrival of a valid frame.
407 std::queue<ReadbackRequest> readbacks_waiting_for_frame_; 409 std::queue<ReadbackRequest> readbacks_waiting_for_frame_;
408 410
409 // The last scroll offset of the view. 411 // The last scroll offset of the view.
410 gfx::Vector2dF last_scroll_offset_; 412 gfx::Vector2dF last_scroll_offset_;
411 413
414 float last_page_scale_factor_;
415
412 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_; 416 base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
413 417
414 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid); 418 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
415 }; 419 };
416 420
417 } // namespace content 421 } // namespace content
418 422
419 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_ 423 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698