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

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

Issue 11953054: Fix high-DPI on Windows to make use of DIP scaling in WebKit. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove redundant comments. Created 7 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_WIN_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlapp.h> 9 #include <atlapp.h>
10 #include <atlcrack.h> 10 #include <atlcrack.h>
(...skipping 30 matching lines...) Expand all
41 } 41 }
42 42
43 namespace IPC { 43 namespace IPC {
44 class Message; 44 class Message;
45 } 45 }
46 46
47 namespace ui { 47 namespace ui {
48 class ViewProp; 48 class ViewProp;
49 } 49 }
50 50
51 namespace WebKit {
52 struct WebScreenInfo;
53 }
54
51 namespace content { 55 namespace content {
52 class BackingStore; 56 class BackingStore;
53 class RenderWidgetHost; 57 class RenderWidgetHost;
54 class WebTouchState; 58 class WebTouchState;
55 59
56 typedef CWinTraits<WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0> 60 typedef CWinTraits<WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0>
57 RenderWidgetHostHWNDTraits; 61 RenderWidgetHostHWNDTraits;
58 62
59 CONTENT_EXPORT extern const wchar_t kRenderWidgetHostHWNDClass[]; 63 CONTENT_EXPORT extern const wchar_t kRenderWidgetHostHWNDClass[];
60 64
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 const gfx::Size& dst_size, 206 const gfx::Size& dst_size,
203 const base::Callback<void(bool)>& callback, 207 const base::Callback<void(bool)>& callback,
204 skia::PlatformBitmap* output) OVERRIDE; 208 skia::PlatformBitmap* output) OVERRIDE;
205 virtual void OnAcceleratedCompositingStateChange() OVERRIDE; 209 virtual void OnAcceleratedCompositingStateChange() OVERRIDE;
206 virtual void ProcessAckedTouchEvent(const WebKit::WebTouchEvent& touch, 210 virtual void ProcessAckedTouchEvent(const WebKit::WebTouchEvent& touch,
207 InputEventAckState ack_result) OVERRIDE; 211 InputEventAckState ack_result) OVERRIDE;
208 virtual void SetHasHorizontalScrollbar( 212 virtual void SetHasHorizontalScrollbar(
209 bool has_horizontal_scrollbar) OVERRIDE; 213 bool has_horizontal_scrollbar) OVERRIDE;
210 virtual void SetScrollOffsetPinning( 214 virtual void SetScrollOffsetPinning(
211 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE; 215 bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE;
216 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
212 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 217 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
213 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 218 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
214 virtual void AcceleratedSurfaceBuffersSwapped( 219 virtual void AcceleratedSurfaceBuffersSwapped(
215 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 220 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
216 int gpu_host_id) OVERRIDE; 221 int gpu_host_id) OVERRIDE;
217 virtual void AcceleratedSurfacePostSubBuffer( 222 virtual void AcceleratedSurfacePostSubBuffer(
218 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 223 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
219 int gpu_host_id) OVERRIDE; 224 int gpu_host_id) OVERRIDE;
220 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 225 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
221 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 226 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 LRESULT OnQueryCharPosition(IMECHARPOSITION* position); 411 LRESULT OnQueryCharPosition(IMECHARPOSITION* position);
407 412
408 // Sets the appropriate mode for raw-touches or gestures. Currently touch mode 413 // Sets the appropriate mode for raw-touches or gestures. Currently touch mode
409 // will only take effect on Win7+. 414 // will only take effect on Win7+.
410 void UpdateDesiredTouchMode(); 415 void UpdateDesiredTouchMode();
411 416
412 // Configures the enable/disable state of |ime_input_| to match with the 417 // Configures the enable/disable state of |ime_input_| to match with the
413 // current |text_input_type_|. 418 // current |text_input_type_|.
414 void UpdateIMEState(); 419 void UpdateIMEState();
415 420
421 // Returns bounds of the view in pixels.
422 gfx::Rect GetPixelBounds() const;
423
416 // Sets the appropriate input scope for given |text_input_type| if TSF-aware 424 // Sets the appropriate input scope for given |text_input_type| if TSF-aware
417 // is not required. Does nothing if TSF-aware is required (and TSF text store 425 // is not required. Does nothing if TSF-aware is required (and TSF text store
418 // is responsible for managing input scope). Currently input scope will only 426 // is responsible for managing input scope). Currently input scope will only
419 // take effect on Vista+. 427 // take effect on Vista+.
420 void UpdateInputScopeIfNecessary(ui::TextInputType text_input_type); 428 void UpdateInputScopeIfNecessary(ui::TextInputType text_input_type);
421 429
422 // The associated Model. While |this| is being Destroyed, 430 // The associated Model. While |this| is being Destroyed,
423 // |render_widget_host_| is NULL and the Windows message loop is run one last 431 // |render_widget_host_| is NULL and the Windows message loop is run one last
424 // time. Message handlers must check for a NULL |render_widget_host_|. 432 // time. Message handlers must check for a NULL |render_widget_host_|.
425 RenderWidgetHostImpl* render_widget_host_; 433 RenderWidgetHostImpl* render_widget_host_;
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 bool touch_events_enabled_; 573 bool touch_events_enabled_;
566 574
567 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; 575 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
568 576
569 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); 577 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
570 }; 578 };
571 579
572 } // namespace content 580 } // namespace content
573 581
574 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 582 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698