diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 09:42:44 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-09 09:42:44 +0100 |
| commit | a59391482883479a9b28a6f1ace6d1ebd08a7ecd (patch) | |
| tree | fa539db054a20a67bff2fc891c33b0f4ec632916 /Source/WebCore/page/EventHandler.cpp | |
| parent | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (diff) | |
| download | qtwebkit-a59391482883479a9b28a6f1ace6d1ebd08a7ecd.tar.gz | |
Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)
New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.
Diffstat (limited to 'Source/WebCore/page/EventHandler.cpp')
| -rw-r--r-- | Source/WebCore/page/EventHandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index 92055a123..07e1b73ab 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -1985,7 +1985,7 @@ bool EventHandler::handlePasteGlobalSelection(const PlatformMouseEvent& mouseEve Frame* focusFrame = m_frame->page()->focusController()->focusedOrMainFrame(); // Do not paste here if the focus was moved somewhere else. if (m_frame == focusFrame && m_frame->editor()->client()->supportsGlobalSelection()) - return m_frame->editor()->command(AtomicString("PasteGlobalSelection")).execute(); + return m_frame->editor()->command(ASCIILiteral("PasteGlobalSelection")).execute(); return false; } @@ -3112,10 +3112,10 @@ bool EventHandler::keyEvent(const PlatformKeyboardEvent& initialKeyEvent) static FocusDirection focusDirectionForKey(const AtomicString& keyIdentifier) { - DEFINE_STATIC_LOCAL(AtomicString, Down, ("Down")); - DEFINE_STATIC_LOCAL(AtomicString, Up, ("Up")); - DEFINE_STATIC_LOCAL(AtomicString, Left, ("Left")); - DEFINE_STATIC_LOCAL(AtomicString, Right, ("Right")); + DEFINE_STATIC_LOCAL(AtomicString, Down, ("Down", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, Up, ("Up", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, Left, ("Left", AtomicString::ConstructFromLiteral)); + DEFINE_STATIC_LOCAL(AtomicString, Right, ("Right", AtomicString::ConstructFromLiteral)); FocusDirection retVal = FocusDirectionNone; |