diff options
author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 16:15:01 +0000 |
---|---|---|
committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 16:15:01 +0000 |
commit | d5db36157268e246c048e69db46f680283e02667 (patch) | |
tree | 6536c2679e3dcd0a1631f11aba6219ba02d60bbc | |
parent | 6314e6f6d7ac203479afe79a46a3e592a2a8da69 (diff) | |
download | chromium_src-d5db36157268e246c048e69db46f680283e02667.zip chromium_src-d5db36157268e246c048e69db46f680283e02667.tar.gz chromium_src-d5db36157268e246c048e69db46f680283e02667.tar.bz2 |
Delete RGBColor and use the upstreamed version BUG=none TEST=none
Review URL: http://codereview.chromium.org/149541
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20732 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | webkit/port/bindings/v8/RGBColor.cpp | 58 | ||||
-rw-r--r-- | webkit/port/bindings/v8/RGBColor.h | 32 | ||||
-rw-r--r-- | webkit/webkit.gyp | 3 |
3 files changed, 0 insertions, 93 deletions
diff --git a/webkit/port/bindings/v8/RGBColor.cpp b/webkit/port/bindings/v8/RGBColor.cpp deleted file mode 100644 index fbeff38..0000000 --- a/webkit/port/bindings/v8/RGBColor.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2008, 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: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * 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. -// * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT -// OWNER OR 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 "RGBColor.h" - -namespace WebCore { - -PassRefPtr<RGBColor> RGBColor::create(unsigned rgbcolor) -{ - return adoptRef(new RGBColor(rgbcolor)); -} - -PassRefPtr<CSSPrimitiveValue> RGBColor::red() -{ - unsigned int value = (m_rgbcolor >> 16) & 0xFF; - return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER); -} - -PassRefPtr<CSSPrimitiveValue> RGBColor::green() -{ - unsigned int value = (m_rgbcolor >> 8) & 0xFF; - return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER); -} - -PassRefPtr<CSSPrimitiveValue> RGBColor::blue() -{ - unsigned int value = m_rgbcolor & 0xFF; - return CSSPrimitiveValue::create(value, CSSPrimitiveValue::CSS_NUMBER); -} - -} // namespace WebCore - diff --git a/webkit/port/bindings/v8/RGBColor.h b/webkit/port/bindings/v8/RGBColor.h deleted file mode 100644 index c96edfd..0000000 --- a/webkit/port/bindings/v8/RGBColor.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef RGBColor_h -#define RGBColor_h - -#include "config.h" -#include "CSSPrimitiveValue.h" -#include <wtf/RefCounted.h> - -namespace WebCore { - -class RGBColor : public RefCounted<RGBColor> { -public: - // TODO(ager): Make constructor private once codegenerator changes - // have landed upstream. - RGBColor(unsigned rgbcolor) : m_rgbcolor(rgbcolor) { } - - static PassRefPtr<RGBColor> create(unsigned rgbcolor); - - PassRefPtr<CSSPrimitiveValue> red(); - PassRefPtr<CSSPrimitiveValue> green(); - PassRefPtr<CSSPrimitiveValue> blue(); - -private: - unsigned m_rgbcolor; -}; - -} // namespace WebCore - -#endif // RGBColor_h diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 5fbd9ea..f62281c 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -585,8 +585,6 @@ 'extensions/v8/profiler_extension.h', 'extensions/v8/benchmarking_extension.cc', 'extensions/v8/benchmarking_extension.h', - 'port/bindings/v8/RGBColor.cpp', - 'port/bindings/v8/RGBColor.h', 'port/bindings/v8/NPV8Object.cpp', 'port/bindings/v8/NPV8Object.h', 'port/bindings/v8/V8NPUtils.cpp', @@ -594,7 +592,6 @@ 'port/bindings/v8/V8NPObject.cpp', 'port/bindings/v8/V8NPObject.h', - # For WebCoreSystemInterface, Mac-only. '../third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.m', ], |