Unreviewed, rolling out r103169.
authorloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 Dec 2011 14:46:36 +0000 (14:46 +0000)
committerloislo@chromium.org <loislo@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 18 Dec 2011 14:46:36 +0000 (14:46 +0000)
http://trac.webkit.org/changeset/103169
https://bugs.webkit.org/show_bug.cgi?id=74809

it broke compilation on many platforms (Requested by loislo_
on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-12-18

Source/WebCore:

* WebCore.gypi:
* platform/ColorChooser.cpp: Renamed from Source/WebKit/chromium/src/ColorChooserProxy.h.
(WebCore::ColorChooserClient::~ColorChooserClient):
(WebCore::ColorChooserClient::newColorChooser):
(WebCore::ColorChooserClient::discardChooser):
(WebCore::ColorChooser::ColorChooser):
(WebCore::ColorChooser::create):
(WebCore::ColorChooser::~ColorChooser):
(WebCore::ColorChooser::didChooseColor):
(WebCore::ColorChooser::didCleanup):

Source/WebKit/chromium:

* WebKit.gyp:
* features.gypi:
* public/WebColorChooser.h: Removed.
* public/WebColorChooserClient.h: Removed.
* public/WebViewClient.h:
* src/ChromeClientImpl.cpp:
* src/ChromeClientImpl.h:
* src/ColorChooserProxy.cpp: Removed.
* src/WebColorChooserClientImpl.cpp: Removed.
* src/WebColorChooserClientImpl.h: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@103172 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gypi
Source/WebCore/platform/ColorChooser.cpp [moved from Source/WebKit/chromium/src/ColorChooserProxy.h with 57% similarity]
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp
Source/WebKit/chromium/features.gypi
Source/WebKit/chromium/public/WebColorChooser.h [deleted file]
Source/WebKit/chromium/public/WebColorChooserClient.h [deleted file]
Source/WebKit/chromium/public/WebViewClient.h
Source/WebKit/chromium/src/ChromeClientImpl.cpp
Source/WebKit/chromium/src/ChromeClientImpl.h
Source/WebKit/chromium/src/ColorChooserProxy.cpp [deleted file]
Source/WebKit/chromium/src/WebColorChooserClientImpl.cpp [deleted file]
Source/WebKit/chromium/src/WebColorChooserClientImpl.h [deleted file]

index d781a761fffdda1819aab24617a37b9182580dd3..fccaae236a32684583af7144b1eff19f75330384 100644 (file)
@@ -1,3 +1,23 @@
+2011-12-18  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r103169.
+        http://trac.webkit.org/changeset/103169
+        https://bugs.webkit.org/show_bug.cgi?id=74809
+
+        it broke compilation on many platforms (Requested by loislo_
+        on #webkit).
+
+        * WebCore.gypi:
+        * platform/ColorChooser.cpp: Renamed from Source/WebKit/chromium/src/ColorChooserProxy.h.
+        (WebCore::ColorChooserClient::~ColorChooserClient):
+        (WebCore::ColorChooserClient::newColorChooser):
+        (WebCore::ColorChooserClient::discardChooser):
+        (WebCore::ColorChooser::ColorChooser):
+        (WebCore::ColorChooser::create):
+        (WebCore::ColorChooser::~ColorChooser):
+        (WebCore::ColorChooser::didChooseColor):
+        (WebCore::ColorChooser::didCleanup):
+
 2011-12-18  Alexandru Chiculita  <achicu@adobe.com>
 
         [CSS Shaders] Add FECustomFilter that renders custom filters
index d9e1eb6a2834ffc6388904e2d98dbe4c6b37c69f..09e589a5040c1aabbbbc3d5b6ef7bdba358e4120 100644 (file)
             'page/mac/WebCoreFrameView.h',
             'platform/AsyncFileStream.h',
             'platform/Clock.h',
-            'platform/ColorChooser.h',
-            'platform/ColorChooserClient.h',
             'platform/ContextMenu.h',
             'platform/ContextMenuItem.h',
             'platform/Cookie.h',
similarity index 57%
rename from Source/WebKit/chromium/src/ColorChooserProxy.h
rename to Source/WebCore/platform/ColorChooser.cpp
index 56a9980f28d992ad6980f430a80e2a9efaba81e0..173f3f8e3f55d19e9c1e80317570cd403d25fddb 100644 (file)
@@ -6,10 +6,13 @@
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
+ *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 
-#ifndef ColorChooserProxy_h
-#define ColorChooserProxy_h
-
+#include "config.h"
 #include "ColorChooser.h"
-#include "WebColorChooser.h"
-#include <wtf/OwnPtr.h>
+
 #include <wtf/PassOwnPtr.h>
 
 #if ENABLE(INPUT_COLOR)
 
-namespace WebKit {
+namespace WebCore {
 
-class ColorChooserProxy : public WebCore::ColorChooser {
-public:
-    ColorChooserProxy(PassOwnPtr<WebColorChooser>);
-    virtual ~ColorChooserProxy();
+ColorChooserClient::~ColorChooserClient()
+{
+    discardChooser();
+}
 
-    virtual void setSelectedColor(const WebCore::Color&);
-    virtual void endChooser();
+ColorChooser* ColorChooserClient::newColorChooser()
+{
+    discardChooser();
 
-private:
-    OwnPtr<WebColorChooser> m_chooser;
-};
+    m_chooser = ColorChooser::create(this);
+    return m_chooser.get();
+}
 
-} // namespace WebKit
+void ColorChooserClient::discardChooser()
+{
+    if (m_chooser)
+        m_chooser->disconnectClient();
+    m_chooser.clear();
+}
 
-#endif // ENABLE(INPUT_COLOR)
+inline ColorChooser::ColorChooser(ColorChooserClient* client)
+    : m_client(client)
+{
+}
+
+PassRefPtr<ColorChooser> ColorChooser::create(ColorChooserClient* client)
+{
+    return adoptRef(new ColorChooser(client));
+}
 
-#endif // ColorChooserProxy_h
+ColorChooser::~ColorChooser()
+{
+}
+
+void ColorChooser::didChooseColor(const Color& color)
+{
+    if (m_client)
+        m_client->didChooseColor(color);
+}
+
+void ColorChooser::didCleanup()
+{
+    if (m_client)
+        m_client->didCleanup();
+}
+
+}
+
+#endif // ENABLE(INPUT_COLOR)
index 142cf3fe370b7987dab8b5a53733ffda4aea0a50..fb1de183e7dd48d30b89efc3c3e65eba1838917f 100644 (file)
@@ -1,3 +1,23 @@
+2011-12-18  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r103169.
+        http://trac.webkit.org/changeset/103169
+        https://bugs.webkit.org/show_bug.cgi?id=74809
+
+        it broke compilation on many platforms (Requested by loislo_
+        on #webkit).
+
+        * WebKit.gyp:
+        * features.gypi:
+        * public/WebColorChooser.h: Removed.
+        * public/WebColorChooserClient.h: Removed.
+        * public/WebViewClient.h:
+        * src/ChromeClientImpl.cpp:
+        * src/ChromeClientImpl.h:
+        * src/ColorChooserProxy.cpp: Removed.
+        * src/WebColorChooserClientImpl.cpp: Removed.
+        * src/WebColorChooserClientImpl.h: Removed.
+
 2011-12-18  Keishi Hattori  <keishi@webkit.org>
 
         Implement <input type=color> UI WebKit chromium part
index 3fccca5b246e70c360d6946e3f3c887c6e3be9f1..f65fdc9298fad51727b30ffd95b1a453b378ac5f 100644 (file)
                 'public/WebBindings.h',
                 'public/WebBlob.h',
                 'public/WebCache.h',
-                'public/WebColorChooser.h',
-                'public/WebColorChooserClient.h',
                 'public/WebCommonWorkerClient.h',
                 'public/WebCompositionUnderline.h',
                 'public/WebCompositor.h',
                 'src/CCThreadImpl.h',
                 'src/ChromeClientImpl.cpp',
                 'src/ChromeClientImpl.h',
-                'src/ColorChooserProxy.cpp',
-                'src/ColorChooserProxy.h',
                 'src/ChromiumCurrentTime.cpp',
                 'src/ChromiumOSRandomSource.cpp',
                 'src/ChromiumThreading.cpp',
                 'src/WebBlobData.cpp',
                 'src/WebCache.cpp',
                 'src/WebColor.cpp',
-                'src/WebColorChooserClientImpl.cpp',
-                'src/WebColorChooserClientImpl.h',
                 'src/WebCommon.cpp',
                 'src/WebCompositorImpl.cpp',
                 'src/WebCompositorImpl.h',
index 387e4602bca9227ef3125941d69526c7a35324da..0eb9de99ae8504a8b8c4d8abf81214e5108be41f 100644 (file)
@@ -53,7 +53,6 @@
       'ENABLE_GESTURE_RECOGNIZER=1',
       'ENABLE_ICONDATABASE=0',
       'ENABLE_INDEXED_DATABASE=1',
-      'ENABLE_INPUT_COLOR=0',
       'ENABLE_INPUT_SPEECH=1',
       'ENABLE_INPUT_TYPE_COLOR=0',
       'ENABLE_INPUT_TYPE_DATE=0',
diff --git a/Source/WebKit/chromium/public/WebColorChooser.h b/Source/WebKit/chromium/public/WebColorChooser.h
deleted file mode 100644 (file)
index 057f66e..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebColorChooser_h
-#define WebColorChooser_h
-
-#include "platform/WebColor.h"
-#include "platform/WebCommon.h"
-
-namespace WebKit {
-
-// This represents a color chooser.
-class WebColorChooser {
-public:
-    virtual ~WebColorChooser() { }
-
-    // Set selected color in the color chooser.
-    virtual void setSelectedColor(const WebColor color) { }
-
-    // Calling this ends the color chooser and the client won't be recieving
-    // didChooseColor callbacks anymore.
-    virtual void endChooser() { }
-};
-
-}
-
-#endif // WebColorChooser_h
diff --git a/Source/WebKit/chromium/public/WebColorChooserClient.h b/Source/WebKit/chromium/public/WebColorChooserClient.h
deleted file mode 100644 (file)
index a80a984..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebColorChooserClient_h
-#define WebColorChooserClient_h
-
-#include "platform/WebColor.h"
-#include "platform/WebCommon.h"
-
-namespace WebKit {
-
-// Receives calls from WebColorChooser and passes it to the WebCore side.
-class WebColorChooserClient {
-public:
-    virtual ~WebColorChooserClient() { }
-
-    // Called when user selects a color in the color chooser.
-    virtual void didChooseColor(const WebColor&) { }
-
-    // Called when color chooser has ended.
-    virtual void didEndChooser() { }
-};
-
-}
-
-#endif // WebColorChooserClient_h
index 5a4d4e8e49c3d72a68a0ea8eecd42024ed678e2b..039d49df37b6d6f3930b95c78d750b9e2b2d3c76 100644 (file)
 #include "WebTextAffinity.h"
 #include "WebTextDirection.h"
 #include "WebWidgetClient.h"
-#include "platform/WebColor.h"
 #include "platform/WebString.h"
 
 namespace WebKit {
 
 class WebAccessibilityObject;
-class WebColorChooser;
-class WebColorChooserClient;
 class WebDeviceOrientationClient;
 class WebDragData;
 class WebElement;
@@ -180,14 +177,8 @@ public:
     // indicating that the default action should be suppressed.
     virtual bool handleCurrentKeyboardEvent() { return false; }
 
-    // Dialogs -------------------------------------------------------------
 
-    // This method opens the color chooser and returns a new WebColorChooser
-    // instance. If there is a WebColorChooser already from the last time this
-    // was called, it ends the color chooser by calling endChooser, and replaces
-    // it with the new one.
-    virtual WebColorChooser* createColorChooser(WebColorChooserClient*,
-                                                const WebColor&) { return 0; }
+    // Dialogs -------------------------------------------------------------
 
     // This method returns immediately after showing the dialog. When the
     // dialog is closed, it should call the WebFileChooserCompletion to
index 6ba836677df828229345e402c36b2df39d79c4b0..7ddbfac3514ea0b85bce5fc404cd5deb554cbaf4 100644 (file)
 
 #include "AXObjectCache.h"
 #include "AccessibilityObject.h"
-#if ENABLE(INPUT_COLOR)
-#include "ColorChooser.h"
-#include "ColorChooserClient.h"
-#include "ColorChooserProxy.h"
-#endif
 #include "Console.h"
 #include "Cursor.h"
 #include "DatabaseTracker.h"
 #include "V8Proxy.h"
 #endif
 #include "WebAccessibilityObject.h"
-#if ENABLE(INPUT_COLOR)
-#include "WebColorChooser.h"
-#include "WebColorChooserClientImpl.h"
-#endif
 #include "WebConsoleMessage.h"
 #include "WebCursorInfo.h"
 #include "WebFileChooserCompletionImpl.h"
@@ -684,21 +675,6 @@ void ChromeClientImpl::reachedApplicationCacheOriginQuota(SecurityOrigin*, int64
     ASSERT_NOT_REACHED();
 }
 
-#if ENABLE(INPUT_COLOR)
-PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(ColorChooserClient* chooserClient, const Color& initialColor)
-{
-    WebViewClient* client = m_webView->client();
-    if (!client)
-        return nullptr;
-    WebColorChooserClientImpl* chooserClientProxy = new WebColorChooserClientImpl(chooserClient);
-    WebColor webColor = static_cast<WebColor>(initialColor.rgb());
-    WebColorChooser* chooser = client->createColorChooser(chooserClientProxy, webColor);
-    if (!chooser)
-        return nullptr;
-    return adoptPtr(new ColorChooserProxy(adoptPtr(chooser)));
-}
-#endif
-
 void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileChooser)
 {
     WebViewClient* client = m_webView->client();
index 2113ec1af4f81d7d19beca651873232177ac47dd..1ca1294551d123e95679102def0b3dbc32d8c313 100644 (file)
 
 namespace WebCore {
 class AccessibilityObject;
-#if ENABLE(INPUT_COLOR)
-class ColorChooser;
-class ColorChooserClient;
-#endif
 class Element;
 class FileChooser;
 class PopupContainer;
@@ -138,9 +134,6 @@ public:
     virtual bool paintCustomOverhangArea(WebCore::GraphicsContext*, const WebCore::IntRect&, const WebCore::IntRect&, const WebCore::IntRect&);
     virtual void requestGeolocationPermissionForFrame(WebCore::Frame*, WebCore::Geolocation*);
     virtual void cancelGeolocationPermissionRequestForFrame(WebCore::Frame*, WebCore::Geolocation*);
-#if ENABLE(INPUT_COLOR)
-    virtual PassOwnPtr<WebCore::ColorChooser> createColorChooser(WebCore::ColorChooserClient*, const WebCore::Color&) OVERRIDE;
-#endif
     virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>);
     virtual void loadIconForFiles(const Vector<WTF::String>&, WebCore::FileIconLoader*);
 #if ENABLE(DIRECTORY_UPLOAD)
diff --git a/Source/WebKit/chromium/src/ColorChooserProxy.cpp b/Source/WebKit/chromium/src/ColorChooserProxy.cpp
deleted file mode 100644 (file)
index dae1b12..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "ColorChooserProxy.h"
-
-#include "Color.h"
-#include "WebColorChooser.h"
-#include "platform/WebColor.h"
-
-#if ENABLE(INPUT_COLOR)
-
-namespace WebKit {
-
-ColorChooserProxy::ColorChooserProxy(PassOwnPtr<WebColorChooser> chooser) : m_chooser(chooser)
-{
-}
-
-ColorChooserProxy::~ColorChooserProxy()
-{
-}
-
-void ColorChooserProxy::setSelectedColor(const WebCore::Color& color)
-{
-    if (!m_chooser)
-        return;
-    WebColor webColor = static_cast<WebColor>(color.rgb());
-    m_chooser->setSelectedColor(webColor);
-}
-
-void ColorChooserProxy::endChooser()
-{
-    if (!m_chooser)
-        return;
-    m_chooser->endChooser();
-}
-
-}
-
-#endif // ENABLE(INPUT_COLOR)
diff --git a/Source/WebKit/chromium/src/WebColorChooserClientImpl.cpp b/Source/WebKit/chromium/src/WebColorChooserClientImpl.cpp
deleted file mode 100644 (file)
index c4f8e69..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebColorChooserClientImpl.h"
-
-#include "Color.h"
-#include "ColorChooserClient.h"
-
-#if ENABLE(INPUT_COLOR)
-
-namespace WebKit {
-
-WebColorChooserClientImpl::WebColorChooserClientImpl(WebCore::ColorChooserClient* client) : m_client(client)
-{
-}
-
-WebColorChooserClientImpl::~WebColorChooserClientImpl()
-{
-}
-
-void WebColorChooserClientImpl::didChooseColor(const WebColor& color)
-{
-    if (!m_client)
-        return;
-    m_client->didChooseColor(WebCore::Color(static_cast<WebCore::RGBA32>(color)));
-}
-
-void WebColorChooserClientImpl::didEndChooser()
-{
-    if (!m_client)
-        return;
-    m_client->didEndChooser();
-}
-
-}
-
-#endif // ENABLE(INPUT_COLOR)
diff --git a/Source/WebKit/chromium/src/WebColorChooserClientImpl.h b/Source/WebKit/chromium/src/WebColorChooserClientImpl.h
deleted file mode 100644 (file)
index bf735d8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebColorChooserClientImpl_h
-#define WebColorChooserClientImpl_h
-
-#include "WebColorChooserClient.h"
-
-#if ENABLE(INPUT_COLOR)
-
-namespace WebCore {
-class ColorChooserClient;
-}
-
-namespace WebKit {
-
-class WebColorChooserClientImpl : public WebColorChooserClient {
-public:
-    WebColorChooserClientImpl(WebCore::ColorChooserClient*);
-    virtual ~WebColorChooserClientImpl();
-
-    virtual void didChooseColor(const WebColor&) OVERRIDE;
-    virtual void didEndChooser() OVERRIDE;
-
-private:
-    WebCore::ColorChooserClient* m_client;
-};
-
-}
-
-#endif // ENABLE(INPUT_COLOR)
-
-#endif // WebColorChooserClientImpl_h