Diff
Modified: trunk/Source/WebCore/ChangeLog (100003 => 100004)
--- trunk/Source/WebCore/ChangeLog 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/ChangeLog 2011-11-11 20:24:33 UTC (rev 100004)
@@ -1,3 +1,23 @@
+2011-11-11 Vincent Scheib <sch...@chromium.org>
+
+ Unreviewed, rolling out r99994.
+ http://trac.webkit.org/changeset/99994
+ https://bugs.webkit.org/show_bug.cgi?id=72150
+
+ Broke chromium windows build
+
+ * WebCore.gypi:
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::webkitLockMouseEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitUnlockMouseEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitMouseLockedEnabled):
+ * page/MouseLockable.cpp: Removed.
+ * page/MouseLockable.h: Removed.
+ * page/MouseLockable.idl: Removed.
+ * page/Navigator.cpp:
+ * page/Navigator.h:
+ * page/Navigator.idl:
+
2011-11-11 Adam Klein <ad...@chromium.org>
[v8] Remove unused V8Proxy::executingScript method
Modified: trunk/Source/WebCore/WebCore.gypi (100003 => 100004)
--- trunk/Source/WebCore/WebCore.gypi 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/WebCore.gypi 2011-11-11 20:24:33 UTC (rev 100004)
@@ -1404,7 +1404,6 @@
'page/History.idl',
'page/Location.idl',
'page/MemoryInfo.idl',
- 'page/MouseLockable.idl',
'page/Navigator.idl',
'page/NavigatorUserMediaError.idl',
'page/NavigatorUserMediaErrorCallback.idl',
@@ -2958,8 +2957,6 @@
'page/MemoryInfo.cpp',
'page/MouseEventWithHitTestResults.cpp',
'page/MouseEventWithHitTestResults.h',
- 'page/MouseLockable.cpp',
- 'page/MouseLockable.h',
'page/Navigator.cpp',
'page/Navigator.h',
'page/NavigatorBase.cpp',
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (100003 => 100004)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2011-11-11 20:24:33 UTC (rev 100004)
@@ -83,7 +83,9 @@
#if ENABLE(MOUSE_LOCK_API)
static bool webkitMouseLockAPIEnabled() { return isMouseLockAPIEnabled; }
static void setWebkitMouseLockAPIEnabled(bool isEnabled) { isMouseLockAPIEnabled = isEnabled; }
- static bool webkitPointerEnabled() { return isMouseLockAPIEnabled; }
+ static bool webkitLockMouseEnabled() { return isMouseLockAPIEnabled; }
+ static bool webkitUnlockMouseEnabled() { return isMouseLockAPIEnabled; }
+ static bool webkitMouseLockedEnabled() { return isMouseLockAPIEnabled; }
#endif
#if ENABLE(VIDEO)
Deleted: trunk/Source/WebCore/page/MouseLockable.cpp (100003 => 100004)
--- trunk/Source/WebCore/page/MouseLockable.cpp 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/page/MouseLockable.cpp 2011-11-11 20:24:33 UTC (rev 100004)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "MouseLockable.h"
-
-#if ENABLE(MOUSE_LOCK_API)
-
-namespace WebCore {
-
-MouseLockable::MouseLockable()
-{
-}
-
-MouseLockable::~MouseLockable()
-{
-}
-
-void MouseLockable::webkitLock(Element* target, PassRefPtr<VoidCallback> successCallback, PassRefPtr<VoidCallback> failureCallback)
-{
- // FIXME: Implement
-}
-
-void MouseLockable::webkitUnlock()
-{
- // FIXME: Implement
-}
-
-bool MouseLockable::webkitIsLocked()
-{
- // FIXME: Implement
- return false;
-}
-
-}
-
-#endif // ENABLE(MOUSE_LOCK_API)
Deleted: trunk/Source/WebCore/page/MouseLockable.h (100003 => 100004)
--- trunk/Source/WebCore/page/MouseLockable.h 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/page/MouseLockable.h 2011-11-11 20:24:33 UTC (rev 100004)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef MouseLockable_h
-#define MouseLockable_h
-
-#if ENABLE(MOUSE_LOCK_API)
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class Element;
-class VoidCallback;
-
-class MouseLockable : public RefCounted<MouseLockable> {
-public:
- static PassRefPtr<MouseLockable> create() { return adoptRef(new MouseLockable()); }
-
- ~MouseLockable();
-
- void webkitLock(Element* target, PassRefPtr<VoidCallback> successCallback, PassRefPtr<VoidCallback> failureCallback);
- void webkitUnlock();
- bool webkitIsLocked();
-
-private:
- MouseLockable();
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MOUSE_LOCK_API)
-
-#endif // MouseLockable_h
-
Deleted: trunk/Source/WebCore/page/MouseLockable.idl (100003 => 100004)
--- trunk/Source/WebCore/page/MouseLockable.idl 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/page/MouseLockable.idl 2011-11-11 20:24:33 UTC (rev 100004)
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-module core {
-
- interface [
- Conditional=MOUSE_LOCK_API,
- OmitConstructor
- ] MouseLockable {
- void webkitLock(in Element target, in [Callback, Optional] VoidCallback successCallback, in [Callback, Optional] VoidCallback failureCallback);
- void webkitUnlock();
- boolean webkitIsLocked();
- };
-
-}
Modified: trunk/Source/WebCore/page/Navigator.cpp (100003 => 100004)
--- trunk/Source/WebCore/page/Navigator.cpp 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/page/Navigator.cpp 2011-11-11 20:24:33 UTC (rev 100004)
@@ -33,7 +33,6 @@
#include "FrameLoader.h"
#include "FrameLoaderClient.h"
#include "Geolocation.h"
-#include "MouseLockable.h"
#include "KURL.h"
#include "Language.h"
#include "Page.h"
@@ -171,15 +170,6 @@
return m_geolocation.get();
}
-#if ENABLE(MOUSE_LOCK_API)
-MouseLockable* Navigator::webkitPointer() const
-{
- if (!m_pointer)
- m_pointer = MouseLockable::create();
- return m_pointer.get();
-}
-#endif
-
void Navigator::getStorageUpdates()
{
if (!m_frame)
Modified: trunk/Source/WebCore/page/Navigator.h (100003 => 100004)
--- trunk/Source/WebCore/page/Navigator.h 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/page/Navigator.h 2011-11-11 20:24:33 UTC (rev 100004)
@@ -32,7 +32,6 @@
class DOMPluginArray;
class Frame;
class Geolocation;
-class MouseLockable;
class NavigatorUserMediaErrorCallback;
class NavigatorUserMediaSuccessCallback;
class PluginData;
@@ -59,10 +58,6 @@
Geolocation* geolocation() const;
-#if ENABLE(MOUSE_LOCK_API)
- MouseLockable* webkitPointer() const;
-#endif
-
// Relinquishes the storage lock, if one exists.
void getStorageUpdates();
@@ -80,9 +75,6 @@
mutable RefPtr<DOMPluginArray> m_plugins;
mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
mutable RefPtr<Geolocation> m_geolocation;
-#if ENABLE(MOUSE_LOCK_API)
- mutable RefPtr<MouseLockable> m_pointer;
-#endif
};
}
Modified: trunk/Source/WebCore/page/Navigator.idl (100003 => 100004)
--- trunk/Source/WebCore/page/Navigator.idl 2011-11-11 19:49:20 UTC (rev 100003)
+++ trunk/Source/WebCore/page/Navigator.idl 2011-11-11 20:24:33 UTC (rev 100004)
@@ -44,10 +44,6 @@
readonly attribute [EnabledAtRuntime] Geolocation geolocation;
#endif
-#if defined(ENABLE_MOUSE_LOCK_API) && ENABLE_MOUSE_LOCK_API
- readonly attribute [EnabledAtRuntime] MouseLockable webkitPointer;
-#endif
-
void getStorageUpdates();
#if defined(ENABLE_REGISTER_PROTOCOL_HANDLER) && ENABLE_REGISTER_PROTOCOL_HANDLER
