summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.cc
diff options
context:
space:
mode:
authorsnej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 18:35:44 +0000
committersnej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-03 18:35:44 +0000
commitd73cbc59e40b4ab2fb6060e82d294b8a50e53e1b (patch)
treed90412f7abd4cb3c1f425072d3d13cedda52f7ce /webkit/glue/webkit_glue.cc
parent080438b8886070e399c326f757cd96976a7a81ec (diff)
downloadchromium_src-d73cbc59e40b4ab2fb6060e82d294b8a50e53e1b.zip
chromium_src-d73cbc59e40b4ab2fb6060e82d294b8a50e53e1b.tar.gz
chromium_src-d73cbc59e40b4ab2fb6060e82d294b8a50e53e1b.tar.bz2
Avoid implicit char*-to-AtomicString conversion, which will soon become illegal.
(See https://bugs.webkit.org/show_bug.cgi?id=30187 for the patch that will remove this conversion.) BUG=29313 TEST=none Review URL: http://codereview.chromium.org/465033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
-rw-r--r--webkit/glue/webkit_glue.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 80f001b..c822040 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -256,7 +256,7 @@ void ResetBeforeTestRun(WebView* view) {
// Reset the main frame name since tests always expect it to be empty. It
// is normally not reset between page loads (even in IE and FF).
if (frame && frame->tree())
- frame->tree()->setName("");
+ frame->tree()->setName(WebCore::emptyAtom);
// This is papering over b/850700. But it passes a few more tests, so we'll
// keep it for now.