Chromium Code Reviews| Index: Source/WebCore/page/DeviceController.h |
| diff --git a/Source/WebCore/page/DeviceController.h b/Source/WebCore/page/DeviceController.h |
| index b7ff7822d16ab63fa0ee22d7c16c74d9a11b9d7f..bb53683f9986fb79c062dd43cfa9d9d003a7e9af 100644 |
| --- a/Source/WebCore/page/DeviceController.h |
| +++ b/Source/WebCore/page/DeviceController.h |
| @@ -1,27 +1,31 @@ |
| /* |
| - * Copyright 2010, The Android Open Source Project |
| - * Copyright (C) 2012 Samsung Electronics. All rights reserved. |
| + * Copyright (C) 2013 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. |
| + * modification, are permitted provided that the following conditions are |
| + * met: |
| * |
| - * 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. |
| + * * Redistributions of source code must retain the above copyright |
| + * notice, this list of conditions and the following disclaimer. |
| + * * 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. |
| + * * Neither the name of Google Inc. nor the names of its |
| + * contributors may be used to endorse or promote products derived from |
| + * this software without specific prior written permission. |
| + * |
| + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT |
| + * OWNER OR 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. |
| */ |
|
Peter Beverloo
2013/04/09 17:29:53
We can't just change the copyright header and this
timvolodine
2013/04/10 19:06:12
Done.
|
| #ifndef DeviceController_h |
| @@ -40,6 +44,8 @@ class Page; |
| class DeviceController : public Supplement<Page> { |
| public: |
| + // FIXME(timvolodine): remove this constructor and all references to DeviceClient |
|
Peter Beverloo
2013/04/09 17:29:53
nit: FIXMEs in WebKit code are unattributed.
timvolodine
2013/04/10 19:06:12
Done.
|
| + // once the device orientation is switched to platform implementation. |
| explicit DeviceController(DeviceClient*); |
| ~DeviceController() { } |
| @@ -55,6 +61,7 @@ public: |
| virtual PassRefPtr<Event> getLastEvent() { return 0; } |
| protected: |
| + DeviceController() : m_timer(this, &DeviceController::fireDeviceEvent) { } |
|
Peter Beverloo
2013/04/09 17:29:53
Do we have any static analysis tools which may ass
timvolodine
2013/04/10 19:06:12
ok I've added init to null
|
| void fireDeviceEvent(Timer<DeviceController>*); |
| HashCountedSet<RefPtr<DOMWindow> > m_listeners; |