Changeset 140960 in webkit

Timestamp:

Jan 28, 2013 2:25:32 AM (11 years ago)

Author:

kihong.kwon@samsung.com

Message:

Replace the type of Proximity's supplementName for char*
​https://bugs.webkit.org/show_bug.cgi?id=108049

Reviewed by Benjamin Poulain.

There are some changes for supplementName by Bug 107535.
It makes build break when PROXIMITY_EVENT feature is enabled.
Therefore ProximityController need to change the type of supplementName for char* also.

No new tests. Functionality is not changed.

• Modules/proximity/DeviceProximityController.cpp:

(WebCore::DeviceProximityController::supplementName):

• Modules/proximity/DeviceProximityController.h:

(DeviceProximityController):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/proximity/DeviceProximityController.cpp (modified) (1 diff)
• Modules/proximity/DeviceProximityController.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-28  Kihong Kwon  <kihong.kwon@samsung.com>
+
+        Replace the type of Proximity's supplementName for char*
+        https://bugs.webkit.org/show_bug.cgi?id=108049
+
+        Reviewed by Benjamin Poulain.
+
+        There are some changes for supplementName by Bug 107535.
+        It makes build break when PROXIMITY_EVENT feature is enabled.
+        Therefore ProximityController need to change the type of supplementName for char* also.
+
+        No new tests. Functionality is not changed.
+
+        * Modules/proximity/DeviceProximityController.cpp:
+        (WebCore::DeviceProximityController::supplementName):
+        * Modules/proximity/DeviceProximityController.h:
+        (DeviceProximityController):
+
 2013-01-28  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/Modules/proximity/DeviceProximityController.cpp

@@ -66 +66 @@
 }
 
-const AtomicString& DeviceProximityController::supplementName()
+const char* DeviceProximityController::supplementName()
 {
-    DEFINE_STATIC_LOCAL(AtomicString, name, ("DeviceProximityController"));
-    return name;
+    return "DeviceProximityController";
 }
 

trunk/Source/WebCore/Modules/proximity/DeviceProximityController.h

@@ -47 +47 @@
     virtual PassRefPtr<Event> getLastEvent();
 
-    static const AtomicString& supplementName();
+    static const char* supplementName();
     static DeviceProximityController* from(Page*);
     static bool isActiveAt(Page*);