- Revision
- 193820
- Author
- zandober...@gmail.com
- Date
- 2015-12-09 03:27:56 -0800 (Wed, 09 Dec 2015)
Log Message
Make MainThreadSharedTimerGtk implementation GLib-specific
https://bugs.webkit.org/show_bug.cgi?id=152044
Reviewed by Carlos Garcia Campos.
MainThreadSharedTimerGtk has implementation that only directly depends
on GLib, and not GTK+. Because of that it can be moved under
Source/WebCore/platform/glib and slightly renamed.
* PlatformGTK.cmake:
* platform/glib/MainThreadSharedTimerGLib.cpp: Renamed from Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp.
(WebCore::MainThreadSharedTimer::MainThreadSharedTimer):
(WebCore::MainThreadSharedTimer::setFireInterval):
(WebCore::MainThreadSharedTimer::stop):
(WebCore::MainThreadSharedTimer::invalidate):
* platform/gtk/MainThreadSharedTimerGtk.cpp:
(WebCore::MainThreadSharedTimer::MainThreadSharedTimer): Deleted.
(WebCore::MainThreadSharedTimer::setFireInterval): Deleted.
(WebCore::MainThreadSharedTimer::stop): Deleted.
(WebCore::MainThreadSharedTimer::invalidate): Deleted.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (193819 => 193820)
--- trunk/Source/WebCore/ChangeLog 2015-12-09 11:26:30 UTC (rev 193819)
+++ trunk/Source/WebCore/ChangeLog 2015-12-09 11:27:56 UTC (rev 193820)
@@ -1,5 +1,28 @@
2015-12-09 Zan Dobersek <zdober...@igalia.com>
+ Make MainThreadSharedTimerGtk implementation GLib-specific
+ https://bugs.webkit.org/show_bug.cgi?id=152044
+
+ Reviewed by Carlos Garcia Campos.
+
+ MainThreadSharedTimerGtk has implementation that only directly depends
+ on GLib, and not GTK+. Because of that it can be moved under
+ Source/WebCore/platform/glib and slightly renamed.
+
+ * PlatformGTK.cmake:
+ * platform/glib/MainThreadSharedTimerGLib.cpp: Renamed from Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp.
+ (WebCore::MainThreadSharedTimer::MainThreadSharedTimer):
+ (WebCore::MainThreadSharedTimer::setFireInterval):
+ (WebCore::MainThreadSharedTimer::stop):
+ (WebCore::MainThreadSharedTimer::invalidate):
+ * platform/gtk/MainThreadSharedTimerGtk.cpp:
+ (WebCore::MainThreadSharedTimer::MainThreadSharedTimer): Deleted.
+ (WebCore::MainThreadSharedTimer::setFireInterval): Deleted.
+ (WebCore::MainThreadSharedTimer::stop): Deleted.
+ (WebCore::MainThreadSharedTimer::invalidate): Deleted.
+
+2015-12-09 Zan Dobersek <zdober...@igalia.com>
+
[TextureMapper] TextureMapperShaderProgram::setMatrix() should use TransformationMatrix::FloatMatrix4
https://bugs.webkit.org/show_bug.cgi?id=152042
Modified: trunk/Source/WebCore/PlatformGTK.cmake (193819 => 193820)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-12-09 11:26:30 UTC (rev 193819)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-12-09 11:27:56 UTC (rev 193820)
@@ -90,6 +90,7 @@
platform/glib/KeyedDecoderGlib.cpp
platform/glib/KeyedEncoderGlib.cpp
+ platform/glib/MainThreadSharedTimerGLib.cpp
platform/graphics/GLContext.cpp
platform/graphics/GraphicsContext3DPrivate.cpp
@@ -162,7 +163,6 @@
platform/gtk/LanguageGtk.cpp
platform/gtk/LoggingGtk.cpp
platform/gtk/MIMETypeRegistryGtk.cpp
- platform/gtk/MainThreadSharedTimerGtk.cpp
platform/gtk/SharedBufferGtk.cpp
platform/gtk/TemporaryLinkStubs.cpp
platform/gtk/UserAgentGtk.cpp
Added: trunk/Source/WebCore/platform/glib/MainThreadSharedTimerGLib.cpp (0 => 193820)
--- trunk/Source/WebCore/platform/glib/MainThreadSharedTimerGLib.cpp (rev 0)
+++ trunk/Source/WebCore/platform/glib/MainThreadSharedTimerGLib.cpp 2015-12-09 11:27:56 UTC (rev 193820)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2006 Apple Inc. All rights reserved.
+ * Copyright (C) 2006 Michael Emmel mike.em...@gmail.com
+ * 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. ``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
+ * 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 "MainThreadSharedTimer.h"
+
+#include <glib.h>
+
+namespace WebCore {
+
+MainThreadSharedTimer::MainThreadSharedTimer()
+ : m_timer(RunLoop::main(), this, &MainThreadSharedTimer::fired)
+{
+ // This is GDK_PRIORITY_REDRAW, but we don't want to depend on GDK here just to use a constant.
+ m_timer.setPriority(G_PRIORITY_HIGH_IDLE + 20);
+}
+
+void MainThreadSharedTimer::setFireInterval(double interval)
+{
+ ASSERT(m_firedFunction);
+ m_timer.startOneShot(interval);
+}
+
+void MainThreadSharedTimer::stop()
+{
+ m_timer.stop();
+}
+
+void MainThreadSharedTimer::invalidate()
+{
+}
+
+} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp (193819 => 193820)
--- trunk/Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp 2015-12-09 11:26:30 UTC (rev 193819)
+++ trunk/Source/WebCore/platform/gtk/MainThreadSharedTimerGtk.cpp 2015-12-09 11:27:56 UTC (rev 193820)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2006 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Michael Emmel mike.em...@gmail.com
- * 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. ``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
- * 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 "MainThreadSharedTimer.h"
-
-#include <glib.h>
-
-namespace WebCore {
-
-MainThreadSharedTimer::MainThreadSharedTimer()
- : m_timer(RunLoop::main(), this, &MainThreadSharedTimer::fired)
-{
- // This is GDK_PRIORITY_REDRAW, but we don't want to depend on GDK here just to use a constant.
- m_timer.setPriority(G_PRIORITY_HIGH_IDLE + 20);
-}
-
-void MainThreadSharedTimer::setFireInterval(double interval)
-{
- ASSERT(m_firedFunction);
- m_timer.startOneShot(interval);
-}
-
-void MainThreadSharedTimer::stop()
-{
- m_timer.stop();
-}
-
-void MainThreadSharedTimer::invalidate()
-{
-}
-
-}
