Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / html / forms / ColorInputType.h

diff --git a/src/third_party/WebKit/Source/core/html/forms/ColorInputType.h b/src/third_party/WebKit/Source/core/html/forms/ColorInputType.h
index 317f0a8..13adc81 100644 (file)
--- a/src/third_party/WebKit/Source/core/html/forms/ColorInputType.h
+++ b/src/third_party/WebKit/Source/core/html/forms/ColorInputType.h
@@ -32,7 +32,7 @@
 #define ColorInputType_h
 
 #include "core/html/forms/BaseClickableWithKeyInputType.h"
-#include "platform/ColorChooserClient.h"
+#include "core/html/forms/ColorChooserClient.h"
 
 namespace blink {
 
@@ -46,15 +46,16 @@ public:
     // ColorChooserClient implementation.
     virtual void didChooseColor(const Color&) OVERRIDE;
     virtual void didEndChooser() OVERRIDE;
+    virtual Element& ownerElement() const OVERRIDE;
     virtual IntRect elementRectRelativeToRootView() const OVERRIDE;
     virtual Color currentColor() OVERRIDE;
     virtual bool shouldShowSuggestions() const OVERRIDE;
     virtual Vector<ColorSuggestion> suggestions() const OVERRIDE;
+    ColorChooserClient* colorChooserClient() OVERRIDE;
 
 private:
     ColorInputType(HTMLInputElement& element) : BaseClickableWithKeyInputType(element) { }
     virtual void countUsage() OVERRIDE;
-    virtual bool isColorControl() const OVERRIDE;
     virtual const AtomicString& formControlType() const OVERRIDE;
     virtual bool supportsRequired() const OVERRIDE;
     virtual String fallbackValue() const OVERRIDE;
@@ -66,6 +67,7 @@ private:
     virtual bool shouldRespectListAttribute() OVERRIDE;
     virtual bool typeMismatchFor(const String&) const OVERRIDE;
     virtual void updateView() OVERRIDE;
+    virtual AXObject* popupRootAXObject() OVERRIDE;
 
     Color valueAsColor() const;
     void endColorChooser();