https://bugs.webkit.org/show_bug.cgi?id=79539
Reviewed by Darin Fisher.
Source/Platform:
* Platform.gypi:
* chromium/public/WebColor.h:
(WebKit):
Source/WebKit/chromium:
* WebKit.gyp:
* public/WebColorName.h: Renamed from Source/Platform/chromium/public/WebColorName.h.
(WebKit):
* public/platform/WebColorName.h:
* src/WebColor.cpp:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@108860
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2012-02-24 James Robinson <jamesr@chromium.org>
+
+ [chromium] WebKit::setColorNames is a client API
+ https://bugs.webkit.org/show_bug.cgi?id=79539
+
+ Reviewed by Darin Fisher.
+
+ * Platform.gypi:
+ * chromium/public/WebColor.h:
+ (WebKit):
+
2012-02-22 James Robinson <jamesr@chromium.org>
[chromium] Move WebGraphicsContext3D header into the Platform directory
'chromium/public/WebCString.h',
'chromium/public/WebCanvas.h',
'chromium/public/WebColor.h',
- 'chromium/public/WebColorName.h',
'chromium/public/WebCommon.h',
'chromium/public/WebContentLayer.h',
'chromium/public/WebContentLayerClient.h',
#ifndef WebColor_h
#define WebColor_h
-#include "WebColorName.h"
-#include "WebCommon.h"
-
namespace WebKit {
typedef unsigned WebColor; // RGBA quad. Equivalent to SkColor.
-// Sets the values of a set of named colors.
-WEBKIT_EXPORT void setNamedColors(const WebColorName*, const WebColor*, size_t length);
-
} // namespace WebKit
#endif
+2012-02-24 James Robinson <jamesr@chromium.org>
+
+ [chromium] WebKit::setColorNames is a client API
+ https://bugs.webkit.org/show_bug.cgi?id=79539
+
+ Reviewed by Darin Fisher.
+
+ * WebKit.gyp:
+ * public/WebColorName.h: Renamed from Source/Platform/chromium/public/WebColorName.h.
+ (WebKit):
+ * public/platform/WebColorName.h:
+ * src/WebColor.cpp:
+
2012-02-22 James Robinson <jamesr@chromium.org>
[chromium] Move WebGraphicsContext3D header into the Platform directory
'public/WebCache.h',
'public/WebColorChooser.h',
'public/WebColorChooserClient.h',
+ 'public/WebColorName.h',
'public/WebCommonWorkerClient.h',
'public/WebCompositionUnderline.h',
'public/WebCompositor.h',
'public/platform/WebCanvas.h',
'public/platform/WebClipboard.h',
'public/platform/WebColor.h',
- 'public/platform/WebColorName.h',
'public/platform/WebCommon.h',
'public/platform/WebContentLayer.h',
'public/platform/WebContentLayerClient.h',
'src/WebBlob.cpp',
'src/WebBlobData.cpp',
'src/WebCache.cpp',
- 'src/WebColor.cpp',
'src/WebColorChooserClientImpl.cpp',
'src/WebColorChooserClientImpl.h',
+ 'src/WebColorName.cpp',
'src/WebCommon.cpp',
'src/WebCompositorImpl.cpp',
'src/WebCompositorImpl.h',
#ifndef WebColorName_h
#define WebColorName_h
+#include <public/WebColor.h>
+#include <public/WebCommon.h>
+
namespace WebKit {
enum WebColorName {
WebColorWindowText
};
-} // namespace WebKit
+// Sets the values of a set of named colors.
+WEBKIT_EXPORT void setNamedColors(const WebColorName*, const WebColor*, size_t length);
+
+} // namespace WebKit
#endif
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../../../../Platform/chromium/public/WebColorName.h"
+// FIXME: This is logically part of the WebKit client API and doesn't belong in platform. This is a forwarding header to avoid requiring a two-sided commit.
+// As soon as all chromium code is updated for the new location of this header, remove this.
+
+#include "../WebColorName.h"
*/
#include "config.h"
-#include "platform/WebColor.h"
+#include "WebColorName.h"
-#include "Color.h"
#include "CSSValueKeywords.h"
+#include "Color.h"
#include "RenderTheme.h"
#include "UnusedParam.h"
-#include "platform/WebColorName.h"
+#include <public/WebColor.h>
using namespace::WebCore;
namespace WebKit {
-static int toCSSValueKeyword(WebColorName in_value)
+static int toCSSValueKeyword(WebColorName name)
{
- switch (in_value) {
+ switch (name) {
case WebColorActiveBorder:
return CSSValueActiveborder;
case WebColorActiveCaption: