X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fhtml%2Fcanvas%2FHitRegion.cpp;h=5de075cd5db3528d8526db95fc9af9c12dbede26;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=e1853a4f1599af5b9a075743522bf6d4156d83d2;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/core/html/canvas/HitRegion.cpp b/src/third_party/WebKit/Source/core/html/canvas/HitRegion.cpp
index e1853a4..5de075c 100644
--- a/src/third_party/WebKit/Source/core/html/canvas/HitRegion.cpp
+++ b/src/third_party/WebKit/Source/core/html/canvas/HitRegion.cpp
@@ -10,12 +10,15 @@
 
 namespace blink {
 
-HitRegion::HitRegion(const HitRegionOptionsInternal& options)
-    : m_id(options.id)
-    , m_control(options.control)
-    , m_path(options.path)
-    , m_fillRule(options.fillRule)
+HitRegion::HitRegion(const Path& path, const HitRegionOptions& options)
+    : m_id(options.id())
+    , m_control(options.control())
+    , m_path(path)
 {
+    if (options.fillRule() != "evenodd")
+        m_fillRule = RULE_NONZERO;
+    else
+        m_fillRule = RULE_EVENODD;
 }
 
 void HitRegion::updateAccessibility(Element* canvas)
@@ -131,7 +134,7 @@ HitRegion* HitRegionManager::getHitRegionByControl(Element* control) const
     if (control)
         return m_hitRegionControlMap.get(control);
 
-    return 0;
+    return nullptr;
 }
 
 HitRegion* HitRegionManager::getHitRegionAtPoint(const LayoutPoint& point) const
@@ -144,7 +147,7 @@ HitRegion* HitRegionManager::getHitRegionAtPoint(const LayoutPoint& point) const
             return hitRegion.get();
     }
 
-    return 0;
+    return nullptr;
 }
 
 unsigned HitRegionManager::getHitRegionsCount() const