Changeset 44094 in webkit


Ignore:
Timestamp:
May 23, 2009 9:15:16 AM (15 years ago)
Author:
ddkilzer@apple.com
Message:

Fix Mac builds by backing out r44093

  • bindings/js/JSCustomPositionCallback.cpp:
  • bindings/js/JSCustomPositionCallback.h:
  • bindings/js/JSCustomPositionErrorCallback.cpp:
  • bindings/js/JSCustomPositionErrorCallback.h:
  • bindings/js/JSGeolocationCustom.cpp:
  • page/Geolocation.cpp:
  • page/Geolocation.idl:
  • page/Geoposition.cpp:
  • page/Geoposition.h:
  • page/Geoposition.idl:
  • page/Navigator.cpp: (WebCore::Navigator::disconnectFrame): (WebCore::Navigator::geolocation):
  • page/PositionError.idl:
  • platform/GeolocationService.cpp: (WebCore::GeolocationService::create):
Location:
trunk/WebCore
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r44093 r44094  
     12009-05-23  David Kilzer  <ddkilzer@apple.com>
     2
     3        Fix Mac builds by backing out r44093
     4
     5        * bindings/js/JSCustomPositionCallback.cpp:
     6        * bindings/js/JSCustomPositionCallback.h:
     7        * bindings/js/JSCustomPositionErrorCallback.cpp:
     8        * bindings/js/JSCustomPositionErrorCallback.h:
     9        * bindings/js/JSGeolocationCustom.cpp:
     10        * page/Geolocation.cpp:
     11        * page/Geolocation.idl:
     12        * page/Geoposition.cpp:
     13        * page/Geoposition.h:
     14        * page/Geoposition.idl:
     15        * page/Navigator.cpp:
     16        (WebCore::Navigator::disconnectFrame):
     17        (WebCore::Navigator::geolocation):
     18        * page/PositionError.idl:
     19        * platform/GeolocationService.cpp:
     20        (WebCore::GeolocationService::create):
     21
    1222009-05-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
    223

  • trunk/WebCore/bindings/js/JSCustomPositionCallback.cpp

    r44093 r44094  
    2626#include "config.h"
    2727#include "JSCustomPositionCallback.h"
    28 
    29 #if ENABLE(GEOLOCATION)
    3028
    3129#include "Frame.h"
    … …  
    8785
    8886} // namespace WebCore
    89 
    90 #endif // ENABLE(GEOLOCATION)

  • trunk/WebCore/bindings/js/JSCustomPositionCallback.h

    r44093 r44094  
    2626#ifndef JSCustomPositionCallback_h
    2727#define JSCustomPositionCallback_h
    28 
    29 #if ENABLE(GEOLOCATION)
    3028
    3129#include "PositionCallback.h"
    … …  
    5856} // namespace WebCore
    5957
    60 #endif // ENABLE(GEOLOCATION)
    61 
    6258#endif // JSCustomPositionCallback_h

  • trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.cpp

    r44093 r44094  
    2626#include "config.h"
    2727#include "JSCustomPositionErrorCallback.h"
    28 
    29 #if ENABLE(GEOLOCATION)
    3028
    3129#include "Frame.h"
    … …  
    8583   
    8684} // namespace WebCore
    87 
    88 #endif // ENABLE(GEOLOCATION)

  • trunk/WebCore/bindings/js/JSCustomPositionErrorCallback.h

    r44093 r44094  
    2626#ifndef JSCustomPositionErrorCallback_h
    2727#define JSCustomPositionErrorCallback_h
    28 
    29 #if ENABLE(GEOLOCATION)
    3028
    3129#include "PositionErrorCallback.h"
    … …  
    5856} // namespace WebCore
    5957
    60 #endif // ENABLE(GEOLOCATION)
    61 
    6258#endif // JSCustomPositionErrorCallback_h

  • trunk/WebCore/bindings/js/JSGeolocationCustom.cpp

    r44093 r44094  
    2626#include "config.h"
    2727#include "JSGeolocation.h"
    28 
    29 #if ENABLE(GEOLOCATION)
    3028
    3129#include "DOMWindow.h"
    … …  
    151149
    152150} // namespace WebCore
    153 
    154 #endif // ENABLE(GEOLOCATION)

  • trunk/WebCore/page/Geolocation.cpp

    r44093 r44094  
    2727#include "Geolocation.h"
    2828
    29 #if ENABLE(GEOLOCATION)
    30 
    3129#include "Chrome.h"
    3230#include "Document.h"
    … …  
    298296
    299297} // namespace WebCore
    300 
    301 #endif // ENABLE(GEOLOCATION)

  • trunk/WebCore/page/Geolocation.idl

    r44093 r44094  
    2626module core {
    2727
    28     interface [Conditional=GEOLOCATION] Geolocation {
     28    interface Geolocation {
    2929        readonly attribute Geoposition lastPosition;
    3030

  • trunk/WebCore/page/Geoposition.cpp

    r44093 r44094  
    2727#include "Geoposition.h"
    2828
    29 #if ENABLE(GEOLOCATION)
    30 
    3129namespace WebCore {
    3230
    … …  
    3735
    3836} // namespace WebCore
    39 
    40 #endif // ENABLE(GEOLOCATION)

  • trunk/WebCore/page/Geoposition.h

    r44093 r44094  
    2626#ifndef Geoposition_h
    2727#define Geoposition_h
    28 
    29 #if ENABLE(GEOLOCATION)
    3028
    3129#include "Coordinates.h"
    … …  
    6058} // namespace WebCore
    6159
    62 #endif // ENABLE(GEOLOCATION)
    63 
    6460#endif // Geoposition_h

  • trunk/WebCore/page/Geoposition.idl

    r44093 r44094  
    2626module core {
    2727
    28     interface [Conditional=GEOLOCATION] Geoposition {
     28    interface Geoposition {
    2929        readonly attribute Coordinates coords;
    3030        readonly attribute DOMTimeStamp timestamp;

  • trunk/WebCore/page/Navigator.cpp

    r44093 r44094  
    6060        m_mimeTypes = 0;
    6161    }
    62 #if ENABLE(GEOLOCATION)
    6362    if (m_geolocation) {
    6463        m_geolocation->disconnectFrame();
    6564        m_geolocation = 0;
    6665    }
    67 #endif
    6866    m_frame = 0;
    6967}
    … …  
    149147Geolocation* Navigator::geolocation() const
    150148{
    151 #if ENABLE(GEOLOCATION)
    152149    if (!m_geolocation)
    153150        m_geolocation = Geolocation::create(m_frame);
    154 #endif
    155151    return m_geolocation.get();
    156152}

  • trunk/WebCore/page/PositionError.idl

    r44093 r44094  
    2727
    2828    interface [
    29         GenerateConstructor,
    30         Conditional=GEOLOCATION
     29        GenerateConstructor
    3130    ] PositionError {
    3231        readonly attribute unsigned short code;

  • trunk/WebCore/platform/GeolocationService.cpp

    r44093 r44094  
    2727#include "GeolocationService.h"
    2828
    29 #if ENABLE(GEOLOCATION)
    30 
    3129#include <wtf/Assertions.h>
    3230
    3331namespace WebCore {
     32
     33#if !ENABLE(GEOLOCATION)
     34GeolocationService* GeolocationService::create(GeolocationServiceClient*)
     35{
     36    return 0;
     37}
     38#endif
    3439
    3540GeolocationService::GeolocationService(GeolocationServiceClient* client)
    … …  
    5055
    5156} // namespace WebCore
    52 
    53 #endif // ENABLE(GEOLOCATION)
Note: See TracChangeset for help on using the changeset viewer.