Should remove |struct HitRegionOptionsInternal|.

Source/core/html/canvas/CanvasRenderingContext2D.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012, 2013 Intel Corporation. All rights reserved.
  * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
  *
@@ skipping 37 matching lines @@
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "core/html/TextMetrics.h"
 #include "core/html/canvas/CanvasGradient.h"
 #include "core/html/canvas/CanvasPattern.h"
 #include "core/html/canvas/CanvasStyle.h"
-#include "core/html/canvas/HitRegionOptions.h"
 #include "core/html/canvas/Path2D.h"
 #include "core/rendering/RenderImage.h"
 #include "core/rendering/RenderLayer.h"
 #include "core/rendering/RenderTheme.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/graphics/DrawLooperBuilder.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/text/TextRun.h"
 #include "wtf/CheckedArithmetic.h"
@@ skipping 2314 matching lines @@
     c->clearShadow();
     c->setCompositeOperation(CompositeSourceOver, blink::WebBlendModeNormal);
     c->drawFocusRing(path, focusRingWidth, focusRingOutline, focusRingColor);
     c->restore();
     validateStateStack();
     didDraw(dirtyRect);
 }
 
 void CanvasRenderingContext2D::addHitRegion(const HitRegionOptions& options, ExceptionState& exceptionState)
 {
-    HitRegionOptionsInternal passOptions;
-    passOptions.id = options.id();
-    passOptions.control = options.control();
-    if (passOptions.id.isEmpty() && !passOptions.control) {
+    if (options.id().isEmpty() && !options.control()) {
         exceptionState.throwDOMException(NotSupportedError, "Both id and control are null.");
         return;
     }
 
     Path hitRegionPath = options.hasPath() ? options.path()->path() : m_path;
 
     FloatRect clipBounds;
     GraphicsContext* context = drawingContext();
 
     if (hitRegionPath.isEmpty() || !context || !state().m_invertibleCTM
         || !context->getTransformedClipBounds(&clipBounds)) {
         exceptionState.throwDOMException(NotSupportedError, "The specified path has no pixels.");
         return;
     }
 
     hitRegionPath.transform(state().m_transform);
 
     if (hasClip()) {
         // FIXME: The hit regions should take clipping region into account.
         // However, we have no way to get the region from canvas state stack by now.
         // See http://crbug.com/387057
         exceptionState.throwDOMException(NotSupportedError, "The specified path has no pixels.");
         return;
     }
 
-    passOptions.path = hitRegionPath;
-
-    if (options.fillRule() != "evenodd")
-        passOptions.fillRule = RULE_NONZERO;
-    else
-        passOptions.fillRule = RULE_EVENODD;
-
-    addHitRegionInternal(passOptions, exceptionState);
-}
-
-void CanvasRenderingContext2D::addHitRegionInternal(const HitRegionOptionsInternal& options, ExceptionState& exceptionState)
-{
     if (!m_hitRegionManager)
         m_hitRegionManager = HitRegionManager::create();
 
     // Remove previous region (with id or control)
-    m_hitRegionManager->removeHitRegionById(options.id);
-    m_hitRegionManager->removeHitRegionByControl(options.control.get());
+    m_hitRegionManager->removeHitRegionById(options.id());
+    m_hitRegionManager->removeHitRegionByControl(options.control().get());
 
-    RefPtrWillBeRawPtr<HitRegion> hitRegion = HitRegion::create(options);
+    RefPtrWillBeRawPtr<HitRegion> hitRegion = HitRegion::create(hitRegionPath, options);
     hitRegion->updateAccessibility(canvas());
     m_hitRegionManager->addHitRegion(hitRegion.release());
 }
 
 void CanvasRenderingContext2D::removeHitRegion(const String& id)
 {
     if (m_hitRegionManager)
         m_hitRegionManager->removeHitRegionById(id);
 }
 
@@ skipping 13 matching lines @@
 
 unsigned CanvasRenderingContext2D::hitRegionsCount() const
 {
     if (m_hitRegionManager)
         return m_hitRegionManager->getHitRegionsCount();
 
     return 0;
 }
 
 } // namespace blink