Chromium Code Reviews| Index: remoting/host/screen_resolution.h |
| diff --git a/remoting/host/screen_resolution.h b/remoting/host/screen_resolution.h |
| index d09eb647c07b68765720f21c7f833de8ccf5e63e..81690db701a2a877789514bd8cd364ffb66bb441 100644 |
| --- a/remoting/host/screen_resolution.h |
| +++ b/remoting/host/screen_resolution.h |
| @@ -7,8 +7,7 @@ |
| #include "base/basictypes.h" |
| #include "base/compiler_specific.h" |
| -#include "third_party/skia/include/core/SkPoint.h" |
| -#include "third_party/skia/include/core/SkSize.h" |
| +#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
| namespace remoting { |
| @@ -16,25 +15,26 @@ namespace remoting { |
| class ScreenResolution { |
| public: |
| ScreenResolution(); |
| - |
| - ScreenResolution(const SkISize& dimensions, const SkIPoint& dpi); |
| + ScreenResolution(const webrtc::DesktopSize& dimensions, |
| + const webrtc::DesktopVector& dpi); |
| // Returns the screen dimensions scaled according to the passed |new_dpi|. |
| - SkISize ScaleDimensionsToDpi(const SkIPoint& new_dpi) const; |
| + webrtc::DesktopSize ScaleDimensionsToDpi( |
| + const webrtc::DesktopVector& new_dpi) const; |
| + |
| + // Dimensions of the screen in pixels. |
| + const webrtc::DesktopSize& dimensions() const { return dimensions_; } |
| + |
| + // The vertical and horizontal DPI of the screen. |
| + const webrtc::DesktopVector& dpi() const { return dpi_; } |
| // Returns true if |dimensions_| specifies an empty rectangle or when |
| // IsValid() returns false. |
| bool IsEmpty() const; |
| - // Returns true if both |dimensions_| and |dpi_| are valid. |dimensions_| |
| - // specifying an empty rectangle is considered to be valid. |
| - bool IsValid() const; |
| - |
| - // Dimensions of the screen in pixels. |
| - SkISize dimensions_; |
| - |
| - // The vertical and horizontal DPI of the screen. |
| - SkIPoint dpi_; |
| + private: |
| + webrtc::DesktopSize dimensions_; |
|
alexeypa (please no reviews)
2013/04/26 21:33:58
I believe the reason to have public fields was IPC
Sergey Ulanov
2013/05/07 22:25:50
You can do it without making these fields public.
|
| + webrtc::DesktopVector dpi_; |
| }; |
| } // namespace remoting |