diff options
| author | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-08 05:35:47 +0000 |
|---|---|---|
| committer | jorlow@chromium.org <jorlow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-08 05:35:47 +0000 |
| commit | 70f7efe52831ef7f900c33af139c33d9c95f7dc4 (patch) | |
| tree | 42faab048f58f64dec7019190ebe05e6b2627faa /webkit/api/public/WebString.h | |
| parent | 8d3aa94c59b93c15c14e3f31376d5b5b55b9ec6a (diff) | |
| download | chromium_src-70f7efe52831ef7f900c33af139c33d9c95f7dc4.zip chromium_src-70f7efe52831ef7f900c33af139c33d9c95f7dc4.tar.gz chromium_src-70f7efe52831ef7f900c33af139c33d9c95f7dc4.tar.bz2 | |
Add implicit AtomicString conversion to WebString. Get rid of a couple explicit casts that are no longer needed.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/164221
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/api/public/WebString.h')
| -rw-r--r-- | webkit/api/public/WebString.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/webkit/api/public/WebString.h b/webkit/api/public/WebString.h index b0f8e49..8eee441 100644 --- a/webkit/api/public/WebString.h +++ b/webkit/api/public/WebString.h @@ -1,10 +1,10 @@ /* * Copyright (C) 2009 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 @@ -14,7 +14,7 @@ * * 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 @@ -34,7 +34,7 @@ #include "WebCommon.h" #if WEBKIT_IMPLEMENTATION -namespace WebCore { class String; } +namespace WebCore { class String; class AtomicString; } #else #include <base/string16.h> #endif @@ -84,6 +84,9 @@ namespace WebKit { WebString(const WebCore::String&); WebString& operator=(const WebCore::String&); operator WebCore::String() const; + WebString(const WebCore::AtomicString&); + WebString& operator=(const WebCore::AtomicString&); + operator WebCore::AtomicString() const; #else WebString(const string16& s) : m_private(0) { |