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

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 experimental changes to resource handling. Created 7 years, 11 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;
212 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE; 216 virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
pkotwicz 2013/01/23 19:39:23 Move GetScreenInfo() here and in .cc file right ab
kevers 2013/01/23 21:37:00 Done.
213 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE; 217 virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
214 virtual void AcceleratedSurfaceBuffersSwapped( 218 virtual void AcceleratedSurfaceBuffersSwapped(
215 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params, 219 const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
216 int gpu_host_id) OVERRIDE; 220 int gpu_host_id) OVERRIDE;
217 virtual void AcceleratedSurfacePostSubBuffer( 221 virtual void AcceleratedSurfacePostSubBuffer(
218 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params, 222 const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
219 int gpu_host_id) OVERRIDE; 223 int gpu_host_id) OVERRIDE;
220 virtual void AcceleratedSurfaceSuspend() OVERRIDE; 224 virtual void AcceleratedSurfaceSuspend() OVERRIDE;
221 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE; 225 virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
222 virtual void OnAccessibilityNotifications( 226 virtual void OnAccessibilityNotifications(
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE; 269 virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;
266 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE; 270 virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;
267 virtual bool DeleteRange(const ui::Range& range) OVERRIDE; 271 virtual bool DeleteRange(const ui::Range& range) OVERRIDE;
268 virtual bool GetTextFromRange(const ui::Range& range, 272 virtual bool GetTextFromRange(const ui::Range& range,
269 string16* text) OVERRIDE; 273 string16* text) OVERRIDE;
270 virtual void OnInputMethodChanged() OVERRIDE; 274 virtual void OnInputMethodChanged() OVERRIDE;
271 virtual bool ChangeTextDirectionAndLayoutAlignment( 275 virtual bool ChangeTextDirectionAndLayoutAlignment(
272 base::i18n::TextDirection direction) OVERRIDE; 276 base::i18n::TextDirection direction) OVERRIDE;
273 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE; 277 virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE;
274 278
279 virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE;
275 protected: 280 protected:
276 friend class RenderWidgetHostView; 281 friend class RenderWidgetHostView;
277 282
278 // Should construct only via RenderWidgetHostView::CreateViewForWidget. 283 // Should construct only via RenderWidgetHostView::CreateViewForWidget.
279 // 284 //
280 // The view will associate itself with the given widget. 285 // The view will associate itself with the given widget.
281 explicit RenderWidgetHostViewWin(RenderWidgetHost* widget); 286 explicit RenderWidgetHostViewWin(RenderWidgetHost* widget);
282 287
283 // Windows Message Handlers 288 // Windows Message Handlers
284 LRESULT OnCreate(CREATESTRUCT* create_struct); 289 LRESULT OnCreate(CREATESTRUCT* create_struct);
(...skipping 121 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 // The associated Model. While |this| is being Destroyed, 424 // The associated Model. While |this| is being Destroyed,
417 // |render_widget_host_| is NULL and the Windows message loop is run one last 425 // |render_widget_host_| is NULL and the Windows message loop is run one last
418 // time. Message handlers must check for a NULL |render_widget_host_|. 426 // time. Message handlers must check for a NULL |render_widget_host_|.
419 RenderWidgetHostImpl* render_widget_host_; 427 RenderWidgetHostImpl* render_widget_host_;
420 428
421 // When we are doing accelerated compositing 429 // When we are doing accelerated compositing
422 HWND compositor_host_window_; 430 HWND compositor_host_window_;
423 431
424 // Presents a texture received from another process to the compositing 432 // Presents a texture received from another process to the compositing
425 // window. 433 // window.
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 bool touch_events_enabled_; 567 bool touch_events_enabled_;
560 568
561 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_; 569 scoped_ptr<ui::GestureRecognizer> gesture_recognizer_;
562 570
563 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin); 571 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
564 }; 572 };
565 573
566 } // namespace content 574 } // namespace content
567 575
568 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_ 576 #endif // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698