Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 5 insertions, 5 deletions

diff --git a/Source/WebCore/dom/DeviceMotionEvent.cpp b/Source/WebCore/dom/DeviceMotionEvent.cpp
index b29fcbeac..568a8aee1 100644
--- a/Source/WebCore/dom/DeviceMotionEvent.cpp
+++ b/Source/WebCore/dom/DeviceMotionEvent.cpp
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. 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
@@ -55,15 +55,15 @@ void DeviceMotionEvent::initDeviceMotionEvent(const AtomicString& type, bool bub
     m_deviceMotionData = deviceMotionData;
 }
 
-const AtomicString& DeviceMotionEvent::interfaceName() const
+EventInterface DeviceMotionEvent::eventInterface() const
 {
 #if ENABLE(DEVICE_ORIENTATION)
-    return eventNames().interfaceForDeviceMotionEvent;
+    return DeviceMotionEventInterfaceType;
 #else
     // FIXME: ENABLE(DEVICE_ORIENTATION) seems to be in a strange state where
     // it is half-guarded by #ifdefs. DeviceMotionEvent.idl is guarded
     // but DeviceMotionEvent.cpp itself is required by ungarded code.
-    return eventNames().interfaceForEvent;
+    return EventInterfaceType;
 #endif
 }