Changeset 149818 in webkit

Timestamp:

May 9, 2013 9:16:32 AM (11 years ago)

Author:

mifenton@rim.com

Message:

[BlackBerry] Style updates required based on new check-webkit-style
​https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update ChromeClientBlackBerry, CredentialManager, FrameLoaderClientBlackBerry,
GeolocationClientBlackBerry and IconDatabaseClientBlackberry to
match check-webkit-style updates.

• WebCoreSupport/ChromeClientBlackBerry.h:

(ChromeClientBlackBerry):

• WebCoreSupport/CredentialManager.h:

(CredentialManager):

• WebCoreSupport/CredentialTransformData.cpp:
• WebCoreSupport/FrameLoaderClientBlackBerry.h:

(WebCore::FrameLoaderClientBlackBerry::assignIdentifierToInitialRequest):
(FrameLoaderClientBlackBerry):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveAuthenticationChallenge):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidCancelAuthenticationChallenge):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveContentLength):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidFinishLoading):
(WebCore::FrameLoaderClientBlackBerry::dispatchDidFailLoading):

• WebCoreSupport/GeolocationClientBlackBerry.cpp:

(GeolocationClientBlackBerry::onLocationUpdate):

• WebCoreSupport/GeolocationClientBlackBerry.h:

(GeolocationClientBlackBerry):

• WebCoreSupport/IconDatabaseClientBlackBerry.cpp:

(WebCore::IconDatabaseClientBlackBerry::initIconDatabase):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientBlackBerry.h (modified) (1 diff)
• WebCoreSupport/CredentialManager.h (modified) (1 diff)
• WebCoreSupport/CredentialTransformData.cpp (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.h (modified) (1 diff)
• WebCoreSupport/GeolocationClientBlackBerry.cpp (modified) (1 diff)
• WebCoreSupport/GeolocationClientBlackBerry.h (modified) (1 diff)
• WebCoreSupport/IconDatabaseClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-09  Mike Fenton  <mifenton@rim.com>
+
+        [BlackBerry] Style updates required based on new check-webkit-style
+        https://bugs.webkit.org/show_bug.cgi?id=115857
+
+        Reviewed by Rob Buis.
+
+        Update ChromeClientBlackBerry, CredentialManager, FrameLoaderClientBlackBerry,
+        GeolocationClientBlackBerry and IconDatabaseClientBlackberry to
+        match check-webkit-style updates.
+
+        * WebCoreSupport/ChromeClientBlackBerry.h:
+        (ChromeClientBlackBerry):
+        * WebCoreSupport/CredentialManager.h:
+        (CredentialManager):
+        * WebCoreSupport/CredentialTransformData.cpp:
+        * WebCoreSupport/FrameLoaderClientBlackBerry.h:
+        (WebCore::FrameLoaderClientBlackBerry::assignIdentifierToInitialRequest):
+        (FrameLoaderClientBlackBerry):
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveAuthenticationChallenge):
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidCancelAuthenticationChallenge):
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidReceiveContentLength):
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidFinishLoading):
+        (WebCore::FrameLoaderClientBlackBerry::dispatchDidFailLoading):
+        * WebCoreSupport/GeolocationClientBlackBerry.cpp:
+        (GeolocationClientBlackBerry::onLocationUpdate):
+        * WebCoreSupport/GeolocationClientBlackBerry.h:
+        (GeolocationClientBlackBerry):
+        * WebCoreSupport/IconDatabaseClientBlackBerry.cpp:
+        (WebCore::IconDatabaseClientBlackBerry::initIconDatabase):
+
 2013-05-09  Jacky Jiang  <zhajiang@blackberry.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/ChromeClientBlackBerry.h

@@ -82 +82 @@
     virtual void contentsSizeChanged(Frame*, const IntSize&) const;
     virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const;
-    virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned int);
+    virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned);
     virtual void setToolTip(const String&, TextDirection);
 #if ENABLE(EVENT_MODE_METATAGS)

trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialManager.h

@@ -46 +46 @@
     void clearNeverRememberSites();
 
- private:
+private:
     friend CredentialManager& credentialManager();
     CredentialManager() { }

trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialTransformData.cpp

@@ -94 +94 @@
             *oldPassword = passwords[0];
             *password = passwords[1];
-        }
-        else {
+        } else {
             // Three different passwords, or first and last match with middle
             // different. No idea which is which, so no luck.

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h

@@ -56 +56 @@
     virtual void detachedFromParent2();
     virtual void detachedFromParent3() { notImplemented(); }
-    virtual void assignIdentifierToInitialRequest(long unsigned int, DocumentLoader*, const ResourceRequest&) { notImplemented(); }
-    virtual void dispatchWillSendRequest(DocumentLoader*, long unsigned int, ResourceRequest&, const ResourceResponse&);
+    virtual void assignIdentifierToInitialRequest(long unsigned, DocumentLoader*, const ResourceRequest&) { notImplemented(); }
+    virtual void dispatchWillSendRequest(DocumentLoader*, long unsigned, ResourceRequest&, const ResourceResponse&);
     virtual bool shouldUseCredentialStorage(DocumentLoader*, long unsigned);
-    virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, long unsigned int, const AuthenticationChallenge&) { notImplemented(); }
-    virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, long unsigned int, const AuthenticationChallenge&) { notImplemented(); }
-    virtual void dispatchDidReceiveResponse(DocumentLoader*, long unsigned int, const ResourceResponse&);
-    virtual void dispatchDidReceiveContentLength(DocumentLoader*, long unsigned int, int) { notImplemented(); }
-    virtual void dispatchDidFinishLoading(DocumentLoader*, long unsigned int) { notImplemented(); }
-    virtual void dispatchDidFailLoading(DocumentLoader*, long unsigned int, const ResourceError&) { notImplemented(); }
+    virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, long unsigned, const AuthenticationChallenge&) { notImplemented(); }
+    virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, long unsigned, const AuthenticationChallenge&) { notImplemented(); }
+    virtual void dispatchDidReceiveResponse(DocumentLoader*, long unsigned, const ResourceResponse&);
+    virtual void dispatchDidReceiveContentLength(DocumentLoader*, long unsigned, int) { notImplemented(); }
+    virtual void dispatchDidFinishLoading(DocumentLoader*, long unsigned) { notImplemented(); }
+    virtual void dispatchDidFailLoading(DocumentLoader*, long unsigned, const ResourceError&) { notImplemented(); }
     virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int) { notImplemented(); return false; }
     virtual void dispatchDidHandleOnloadEvents();

trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp

@@ -157 +157 @@
 
 void GeolocationClientBlackBerry::onLocationUpdate(double timestamp, double latitude, double longitude, double accuracy, double altitude, bool altitudeValid,
-                                                             double altitudeAccuracy, bool altitudeAccuracyValid, double speed, bool speedValid, double heading, bool headingValid)
+    double altitudeAccuracy, bool altitudeAccuracyValid, double speed, bool speedValid, double heading, bool headingValid)
 {
     m_lastPosition = GeolocationPosition::create(timestamp, latitude, longitude, accuracy, altitudeValid, altitude, altitudeAccuracyValid,
-                                                 altitudeAccuracy, headingValid, heading, speedValid, speed);
+        altitudeAccuracy, headingValid, heading, speedValid, speed);
     GeolocationController::from(m_webPagePrivate->m_page)->positionChanged(m_lastPosition.get());
 }

trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.h

@@ -49 +49 @@
     virtual bool requiresHighAccuracy() { return m_accuracy; }
     virtual void onLocationUpdate(double timestamp, double latitude, double longitude, double accuracy, double altitude, bool altitudeValid, double altitudeAccuracy,
-                                  bool altitudeAccuracyValid, double speed, bool speedValid, double heading, bool headingValid);
+        bool altitudeAccuracyValid, double speed, bool speedValid, double heading, bool headingValid);
     virtual void onLocationError(const char* error);
     virtual void onPermission(const BlackBerry::Platform::String& origin, bool isAllowed);

trunk/Source/WebKit/blackberry/WebCoreSupport/IconDatabaseClientBlackBerry.cpp

@@ -46 +46 @@
 
     m_initState = iconDatabase().open(BlackBerry::Platform::Settings::instance()->applicationDataDirectory().c_str(),
-                                      IconDatabase::defaultDatabaseFilename()) ? InitializeSucceeded : InitializeFailed;
+        IconDatabase::defaultDatabaseFilename()) ? InitializeSucceeded : InitializeFailed;
 
     return m_initState == InitializeSucceeded;