[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
steveblock at google.com
steveblock at google.com
Wed Dec 22 11:56:49 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 05d9409ad1afb2c6942890b40bc64a0745a8993a
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 11 23:46:33 2010 +0000
2010-08-11 Steve Block <steveblock at google.com>
Reviewed by David Levin.
[chromium] Geolocation breaks the compile if ENABLE_GEOLOCATION is set to 0
https://bugs.webkit.org/show_bug.cgi?id=43753
This change guards the entire contents of the V8 custom bindings files
with ENABLE(GEOLOCATION) to match JSC.
No new tests, build fix only.
* bindings/v8/custom/V8CustomPositionCallback.cpp:
* bindings/v8/custom/V8CustomPositionErrorCallback.cpp:
* bindings/v8/custom/V8GeolocationCustom.cpp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65199 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aa68707..317e5dc 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-11 Steve Block <steveblock at google.com>
+
+ Reviewed by David Levin.
+
+ [chromium] Geolocation breaks the compile if ENABLE_GEOLOCATION is set to 0
+ https://bugs.webkit.org/show_bug.cgi?id=43753
+
+ This change guards the entire contents of the V8 custom bindings files
+ with ENABLE(GEOLOCATION) to match JSC.
+
+ No new tests, build fix only.
+
+ * bindings/v8/custom/V8CustomPositionCallback.cpp:
+ * bindings/v8/custom/V8CustomPositionErrorCallback.cpp:
+ * bindings/v8/custom/V8GeolocationCustom.cpp:
+
2010-08-11 Kwang Yul Seo <skyul at company100.net>
Reviewed by David Levin.
diff --git a/WebCore/bindings/v8/custom/V8CustomPositionCallback.cpp b/WebCore/bindings/v8/custom/V8CustomPositionCallback.cpp
index 18f27cb..97d0dde 100644
--- a/WebCore/bindings/v8/custom/V8CustomPositionCallback.cpp
+++ b/WebCore/bindings/v8/custom/V8CustomPositionCallback.cpp
@@ -26,6 +26,8 @@
#include "config.h"
#include "V8CustomPositionCallback.h"
+#if ENABLE(GEOLOCATION)
+
#include "ScriptExecutionContext.h"
#include "V8CustomVoidCallback.h" // For invokeCallback
#include "V8Geoposition.h"
@@ -76,3 +78,5 @@ void V8CustomPositionCallback::handleEvent(Geoposition* position)
}
} // namespace WebCore
+
+#endif // ENABLE(GEOLOCATION)
diff --git a/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.cpp b/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.cpp
index 36b5e04..906a909 100644
--- a/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.cpp
+++ b/WebCore/bindings/v8/custom/V8CustomPositionErrorCallback.cpp
@@ -26,6 +26,8 @@
#include "config.h"
#include "V8CustomPositionErrorCallback.h"
+#if ENABLE(GEOLOCATION)
+
#include "ScriptExecutionContext.h"
#include "V8CustomVoidCallback.h" // For invokeCallback
#include "V8PositionError.h"
@@ -76,3 +78,5 @@ void V8CustomPositionErrorCallback::handleEvent(PositionError* error)
}
} // namespace WebCore
+
+#endif // ENABLE(GEOLOCATION)
diff --git a/WebCore/bindings/v8/custom/V8GeolocationCustom.cpp b/WebCore/bindings/v8/custom/V8GeolocationCustom.cpp
index 649c45f..54bd11c 100644
--- a/WebCore/bindings/v8/custom/V8GeolocationCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8GeolocationCustom.cpp
@@ -26,6 +26,8 @@
#include "config.h"
#include "V8Geolocation.h"
+#if ENABLE(GEOLOCATION)
+
#include "Frame.h"
#include "Geolocation.h"
#include "V8Binding.h"
@@ -215,3 +217,5 @@ v8::Handle<v8::Value> V8Geolocation::watchPositionCallback(const v8::Arguments&
}
} // namespace WebCore
+
+#endif // ENABLE(GEOLOCATION)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list