Changeset 139005 in webkit

Timestamp:

Jan 7, 2013 3:57:30 PM (11 years ago)

Author:

Joseph Pecoraro

Message:

String improvements in geolocation and notifications modules
​https://bugs.webkit.org/show_bug.cgi?id=105352

Reviewed by Sam Weinig.

• Modules/geolocation/Geolocation.cpp:

(WebCore::Geolocation::GeoNotifier::timerFired):
(WebCore::Geolocation::startRequest):
(WebCore::Geolocation::requestUsesCachedPosition):
(WebCore::Geolocation::makeCachedPositionCallbacks):
(WebCore::Geolocation::setIsAllowed):
(WebCore::Geolocation::cancelRequests):
(WebCore::Geolocation::handlePendingPermissionNotifiers):

• Modules/geolocation/GeolocationController.cpp:

(WebCore::GeolocationController::positionChanged):

• Modules/notifications/WorkerContextNotifications.cpp:

Use ASCIILiteral for constant strings becoming WTFStrings.

(WebCore::WorkerContextNotifications::from):
Use AtomicString::ConstructFromLiteral for the static local.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/geolocation/Geolocation.cpp (modified) (9 diffs)
• Modules/geolocation/GeolocationController.cpp (modified) (1 diff)
• Modules/notifications/WorkerContextNotifications.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-07  Joseph Pecoraro  <pecoraro@apple.com>
+
+        String improvements in geolocation and notifications modules
+        https://bugs.webkit.org/show_bug.cgi?id=105352
+
+        Reviewed by Sam Weinig.
+
+        * Modules/geolocation/Geolocation.cpp:
+        (WebCore::Geolocation::GeoNotifier::timerFired):
+        (WebCore::Geolocation::startRequest):
+        (WebCore::Geolocation::requestUsesCachedPosition):
+        (WebCore::Geolocation::makeCachedPositionCallbacks):
+        (WebCore::Geolocation::setIsAllowed):
+        (WebCore::Geolocation::cancelRequests):
+        (WebCore::Geolocation::handlePendingPermissionNotifiers):
+        * Modules/geolocation/GeolocationController.cpp:
+        (WebCore::GeolocationController::positionChanged):
+        * Modules/notifications/WorkerContextNotifications.cpp:
+        Use ASCIILiteral for constant strings becoming WTFStrings.
+
+        (WebCore::WorkerContextNotifications::from):
+        Use AtomicString::ConstructFromLiteral for the static local.
+
 2013-01-07  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/Modules/geolocation/Geolocation.cpp

@@ -31 +31 @@
 #if ENABLE(GEOLOCATION)
 
-#include "Chrome.h"
-#include "ChromeClient.h"
 #include "Document.h"
 #include "Frame.h"
@@ -170 +168 @@
 
     if (m_errorCallback) {
-        RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, "Timeout expired");
+        RefPtr<PositionError> error = PositionError::create(PositionError::TIMEOUT, ASCIILiteral("Timeout expired"));
         m_errorCallback->handleEvent(error.get());
     }
@@ -320 +318 @@
     // the permission state can not change again in the lifetime of this page.
     if (isDenied())
-        notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
+        notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, ASCIILiteral(permissionDeniedErrorMessage)));
     else if (haveSuitableCachedPosition(notifier->options()))
         notifier->setUseCachedPosition();
@@ -332 +330 @@
         notifier->startTimerIfNeeded();
     else
-        notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
+        notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(failedToStartServiceErrorMessage)));
 }
 
@@ -350 +348 @@
     // since we last checked in startRequest.
     if (isDenied()) {
-        notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
+        notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, ASCIILiteral(permissionDeniedErrorMessage)));
         return;
     }
@@ -384 +382 @@
                 notifier->startTimerIfNeeded();
             else
-                notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
+                notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(failedToStartServiceErrorMessage)));
         }
     }
@@ -446 +444 @@
 
     if (!isAllowed()) {
-        RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage);
+        RefPtr<PositionError> error = PositionError::create(PositionError::PERMISSION_DENIED,  ASCIILiteral(permissionDeniedErrorMessage));
         error->setIsFatal(true);
         handleError(error.get());
@@ -512 +510 @@
     GeoNotifierVector::const_iterator end = notifiers.end();
     for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end; ++it)
-        (*it)->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, framelessDocumentErrorMessage));
+        (*it)->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(framelessDocumentErrorMessage)));
 }
 
@@ -671 +669 @@
                 notifier->startTimerIfNeeded();
             else
-                notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
+                notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, ASCIILiteral(failedToStartServiceErrorMessage)));
         } else
-            notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
+            notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, ASCIILiteral(permissionDeniedErrorMessage)));
     }
 }

trunk/Source/WebCore/Modules/geolocation/GeolocationController.cpp

@@ -104 +104 @@
     position = InspectorInstrumentation::overrideGeolocationPosition(m_page, position);
     if (!position) {
-        errorOccurred(GeolocationError::create(GeolocationError::PositionUnavailable, "PositionUnavailable").get());
+        errorOccurred(GeolocationError::create(GeolocationError::PositionUnavailable, ASCIILiteral("PositionUnavailable")).get());
         return;
     }

trunk/Source/WebCore/Modules/notifications/WorkerContextNotifications.cpp

@@ -48 +48 @@
 WorkerContextNotifications* WorkerContextNotifications::from(WorkerContext* context)
 {
-    AtomicString supplementName = "WorkerContextNotifications";
+    DEFINE_STATIC_LOCAL(AtomicString, supplementName, ("WorkerContextNotifications", AtomicString::ConstructFromLiteral));
     WorkerContextNotifications* supplement = static_cast<WorkerContextNotifications*>(Supplement<ScriptExecutionContext>::from(context, supplementName));
     if (!supplement) {