Bug 32772 – Missing checks for Geolocation in Navigator.cpp

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Philippe Normand]

If geolocation is disabled at configure time, the link will fail:

  CCLD   Programs/unittests/testhttpbackend
./.libs/libwebkit-1.0.so: undefined reference to `WebCore::Geolocation::disconnectFrame()'
./.libs/libwebkit-1.0.so: undefined reference to `WebCore::Geolocation::Geolocation(WebCore::Frame*)'
collect2: ld returned 1 exit status

Some ifdefs are missing.

[Philippe Normand]

Created attachment 45238 [details]
proposed patch

Reviewed by NOBODY (OOPS!).

        Missing checks for Geolocation in Navigator.cpp
        https://bugs.webkit.org/show_bug.cgi?id=32772

        Added ifdefs around Geolocation-related code.

        * page/Navigator.cpp:
        (WebCore::Navigator::disconnectFrame):

[Darin Adler]

Comment on attachment 45238 [details]
proposed patch

Is this the approach we're taking to ifdef'ing Geolocation? I thought that we were disabling this at the GeolocationService level, not here at the Navigator level.

If we are doing an ifdef at this level, then perhaps we need to put ifdefs in the header file too.

[Philippe Normand]

(In reply to comment #2)
> (From update of attachment 45238 [details])
> Is this the approach we're taking to ifdef'ing Geolocation? I thought that we
> were disabling this at the GeolocationService level, not here at the Navigator
> level.
> 
> If we are doing an ifdef at this level, then perhaps we need to put ifdefs in
> the header file too.

You are right, everything is already taken care of in GeolocationService, the problem is that this file doesn't seem to be built anymore after r52382 and if geolocation is disabled.

[Philippe Normand]

Comment on attachment 45238 [details]
proposed patch

This patch is a bad workaround for the bug. The correct fix would be to readd some of the files (including GeolocationService.cpp) in the build, even if geolocation is disabled.

[Evan Martin]

Created attachment 45241 [details]
revert

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 45241 [details] without any errors.

[WebKit Commit Bot]

Comment on attachment 45241 [details]
revert

Clearing flags on attachment: 45241

Committed r52392: <http://trac.webkit.org/changeset/52392>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.