Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / css / MediaValuesCached.cpp

diff --git a/src/third_party/WebKit/Source/core/css/MediaValuesCached.cpp b/src/third_party/WebKit/Source/core/css/MediaValuesCached.cpp
index 8f9f547..8f0816a 100644 (file)
--- a/src/third_party/WebKit/Source/core/css/MediaValuesCached.cpp
+++ b/src/third_party/WebKit/Source/core/css/MediaValuesCached.cpp
@@ -54,7 +54,10 @@ MediaValuesCached::MediaValuesCached(LocalFrame* frame)
     m_data.devicePixelRatio = calculateDevicePixelRatio(frame);
     m_data.colorBitsPerComponent = calculateColorBitsPerComponent(frame);
     m_data.monochromeBitsPerComponent = calculateMonochromeBitsPerComponent(frame);
-    m_data.pointer = calculateLeastCapablePrimaryPointerDeviceType(frame);
+    m_data.primaryPointerType = calculatePrimaryPointerType(frame);
+    m_data.availablePointerTypes = calculateAvailablePointerTypes(frame);
+    m_data.primaryHoverType = calculatePrimaryHoverType(frame);
+    m_data.availableHoverTypes = calculateAvailableHoverTypes(frame);
     m_data.defaultFontSize = calculateDefaultFontSize(frame);
     m_data.threeDEnabled = calculateThreeDEnabled(frame);
     m_data.strictMode = calculateStrictMode(frame);
@@ -123,9 +126,24 @@ int MediaValuesCached::monochromeBitsPerComponent() const
     return m_data.monochromeBitsPerComponent;
 }
 
-MediaValues::PointerDeviceType MediaValuesCached::pointer() const
+PointerType MediaValuesCached::primaryPointerType() const
 {
-    return m_data.pointer;
+    return m_data.primaryPointerType;
+}
+
+int MediaValuesCached::availablePointerTypes() const
+{
+    return m_data.availablePointerTypes;
+}
+
+HoverType MediaValuesCached::primaryHoverType() const
+{
+    return m_data.primaryHoverType;
+}
+
+int MediaValuesCached::availableHoverTypes() const
+{
+    return m_data.availableHoverTypes;
 }
 
 bool MediaValuesCached::threeDEnabled() const