Changeset 63759 in webkit
- Timestamp:
- Jul 20, 2010 11:12:10 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r63757 r63759 1 2010-07-20 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r63750. 4 http://trac.webkit.org/changeset/63750 5 https://bugs.webkit.org/show_bug.cgi?id=42648 6 7 This revision breaks the windows builds (Requested by 8 hwennborg on #webkit). 9 10 * bindings/generic/RuntimeEnabledFeatures.cpp: 11 * bindings/generic/RuntimeEnabledFeatures.h: 12 * page/DOMWindow.cpp: 13 (WebCore::DOMWindow::addEventListener): 14 (WebCore::DOMWindow::removeEventListener): 15 (WebCore::DOMWindow::removeAllEventListeners): 16 * page/DOMWindow.idl: 17 * page/Page.cpp: 18 (WebCore::Page::Page): 19 1 20 2010-07-20 Ilya Tikhonovsky <loislo@chromium.org> 2 21 -
trunk/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
r63750 r63759 48 48 bool RuntimeEnabledFeatures::isPushStateEnabled = false; 49 49 bool RuntimeEnabledFeatures::isTouchEnabled = true; 50 bool RuntimeEnabledFeatures::isDeviceOrientationEnabled = true;51 50 52 51 #if ENABLE(VIDEO) -
trunk/WebCore/bindings/generic/RuntimeEnabledFeatures.h
r63750 r63759 114 114 #endif 115 115 116 static void setDeviceOrientationEnabled(bool isEnabled) { isDeviceOrientationEnabled = isEnabled; }117 static bool deviceOrientationEnabled() { return isDeviceOrientationEnabled; }118 static bool deviceOrientationEventEnabled() { return isDeviceOrientationEnabled; }119 static bool ondeviceorientationEnabled() { return isDeviceOrientationEnabled; }120 121 116 private: 122 117 // Never instantiate. … … 132 127 static bool isPushStateEnabled; 133 128 static bool isTouchEnabled; 134 static bool isDeviceOrientationEnabled;135 129 }; 136 130 -
trunk/WebCore/page/DOMWindow.cpp
r63750 r63759 1414 1414 addBeforeUnloadEventListener(this); 1415 1415 #if ENABLE(DEVICE_ORIENTATION) 1416 else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page() && frame()->page()->deviceOrientationController())1417 frame()->page()->deviceOrientation Controller()->addListener(this);1416 else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page()) 1417 frame()->page()->deviceOrientation()->addListener(this); 1418 1418 #endif 1419 1419 … … 1431 1431 removeBeforeUnloadEventListener(this); 1432 1432 #if ENABLE(DEVICE_ORIENTATION) 1433 else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page() && frame()->page()->deviceOrientationController())1434 frame()->page()->deviceOrientation Controller()->removeListener(this);1433 else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page()) 1434 frame()->page()->deviceOrientation()->removeListener(this); 1435 1435 #endif 1436 1436 … … 1509 1509 1510 1510 #if ENABLE(DEVICE_ORIENTATION) 1511 if (frame() && frame()->page() && frame()->page()->deviceOrientationController())1512 frame()->page()->deviceOrientation Controller()->removeAllListeners(this);1511 if (frame() && frame()->page()) 1512 frame()->page()->deviceOrientation()->removeAllListeners(this); 1513 1513 #endif 1514 1514 -
trunk/WebCore/page/DOMWindow.idl
r63750 r63759 305 305 attribute [Conditional=TOUCH_EVENTS,EnabledAtRuntime] EventListener ontouchcancel; 306 306 307 attribute [Conditional=DEVICE_ORIENTATION , EnabledAtRuntime] DeviceOrientationEventConstructor DeviceOrientationEvent;308 attribute [Conditional=DEVICE_ORIENTATION , EnabledAtRuntime] EventListener ondeviceorientation;307 attribute [Conditional=DEVICE_ORIENTATION] DeviceOrientationEventConstructor DeviceOrientationEvent; 308 attribute [Conditional=DEVICE_ORIENTATION] EventListener ondeviceorientation; 309 309 310 310 // EventTarget interface -
trunk/WebCore/page/Page.cpp
r63750 r63759 58 58 #include "RenderTheme.h" 59 59 #include "RenderWidget.h" 60 #include "RuntimeEnabledFeatures.h"61 60 #include "ScriptController.h" 62 61 #include "SelectionController.h" … … 141 140 #endif 142 141 #if ENABLE(DEVICE_ORIENTATION) 143 , m_deviceOrientationController( RuntimeEnabledFeatures::deviceOrientationEnabled() ? new DeviceOrientationController(this, deviceOrientationClient) : 0)142 , m_deviceOrientationController(new DeviceOrientationController(this, deviceOrientationClient)) 144 143 #endif 145 144 #if ENABLE(INPUT_SPEECH) -
trunk/WebKit/chromium/ChangeLog
r63755 r63759 1 2010-07-20 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r63750. 4 http://trac.webkit.org/changeset/63750 5 https://bugs.webkit.org/show_bug.cgi?id=42648 6 7 This revision breaks the windows builds (Requested by 8 hwennborg on #webkit). 9 10 * public/WebRuntimeFeatures.h: 11 * src/WebRuntimeFeatures.cpp: 12 1 13 2010-07-19 Victor Wang <victorw@chromium.org> 2 14 -
trunk/WebKit/chromium/public/WebRuntimeFeatures.h
r63750 r63759 78 78 WEBKIT_API static bool isTouchEnabled(); 79 79 80 WEBKIT_API static void enableDeviceOrientation(bool);81 WEBKIT_API static bool isDeviceOrientationEnabled();82 83 80 private: 84 81 WebRuntimeFeatures(); -
trunk/WebKit/chromium/src/WebRuntimeFeatures.cpp
r63750 r63759 227 227 } 228 228 229 void WebRuntimeFeatures::enableDeviceOrientation(bool enable)230 {231 RuntimeEnabledFeatures::setDeviceOrientationEnabled(enable);232 }233 234 bool WebRuntimeFeatures::isDeviceOrientationEnabled()235 {236 return RuntimeEnabledFeatures::deviceOrientationEnabled();237 }238 239 229 } // namespace WebKit
Note: See TracChangeset
for help on using the changeset viewer.