Diff
Modified: trunk/Source/WebCore/ChangeLog (161499 => 161500)
--- trunk/Source/WebCore/ChangeLog 2014-01-08 15:23:36 UTC (rev 161499)
+++ trunk/Source/WebCore/ChangeLog 2014-01-08 15:24:53 UTC (rev 161500)
@@ -1,3 +1,17 @@
+2014-01-08 Alberto Garcia <[email protected]>
+
+ Fix some compilation warnings
+ https://bugs.webkit.org/show_bug.cgi?id=126635
+
+ Reviewed by Csaba Osztrogonác.
+
+ Remove code that is no longer being used.
+
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.h:
+ * platform/gtk/PopupMenuGtk.cpp:
+ * platform/gtk/RedirectedXCompositeWindow.h:
+
2014-01-08 Zan Dobersek <[email protected]>
[Automake] Scripts for generated build targets do not necessarily produce their output
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (161499 => 161500)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-01-08 15:23:36 UTC (rev 161499)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2014-01-08 15:24:53 UTC (rev 161500)
@@ -1024,14 +1024,6 @@
cairo_set_fill_rule(cr, savedFillRule);
}
-static inline FloatPoint getPhase(const FloatRect& dest, const FloatRect& tile)
-{
- FloatPoint phase = dest.location();
- phase.move(-tile.x(), -tile.y());
-
- return phase;
-}
-
void GraphicsContext::fillRoundedRect(const IntRect& r, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color& color, ColorSpace)
{
if (paintingDisabled())
Modified: trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h (161499 => 161500)
--- trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-01-08 15:23:36 UTC (rev 161499)
+++ trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h 2014-01-08 15:24:53 UTC (rev 161500)
@@ -167,7 +167,6 @@
int m_changeMask;
bool m_needsDisplay;
- bool m_hasOwnBackingStore;
bool m_fixedToViewport;
Color m_solidColor;
Modified: trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp (161499 => 161500)
--- trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp 2014-01-08 15:23:36 UTC (rev 161499)
+++ trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp 2014-01-08 15:24:53 UTC (rev 161500)
@@ -37,8 +37,6 @@
namespace WebCore {
-static const uint32_t gSearchTimeoutMs = 1000;
-
PopupMenuGtk::PopupMenuGtk(PopupMenuClient* client)
: m_popupClient(client)
{
Modified: trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h (161499 => 161500)
--- trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h 2014-01-08 15:23:36 UTC (rev 161499)
+++ trunk/Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h 2014-01-08 15:24:53 UTC (rev 161500)
@@ -70,7 +70,6 @@
GLContextNeeded m_needsContext;
OwnPtr<GLContext> m_context;
RefPtr<cairo_surface_t> m_surface;
- unsigned int m_pendingResizeSourceId;
bool m_needsNewPixmapAfterResize;
Damage m_damage;
Modified: trunk/Tools/ChangeLog (161499 => 161500)
--- trunk/Tools/ChangeLog 2014-01-08 15:23:36 UTC (rev 161499)
+++ trunk/Tools/ChangeLog 2014-01-08 15:24:53 UTC (rev 161500)
@@ -1,3 +1,14 @@
+2014-01-08 Alberto Garcia <[email protected]>
+
+ Fix some compilation warnings
+ https://bugs.webkit.org/show_bug.cgi?id=126635
+
+ Reviewed by Csaba Osztrogonác.
+
+ * GtkLauncher/main.c:
+ (createWindow): This function is not supposed to receive any
+ parameter, yet we are passing one.
+
2014-01-08 Brian Holt <[email protected]>
[GTK][WK2] unskip passing unit tests
Modified: trunk/Tools/GtkLauncher/main.c (161499 => 161500)
--- trunk/Tools/GtkLauncher/main.c 2014-01-08 15:23:36 UTC (rev 161499)
+++ trunk/Tools/GtkLauncher/main.c 2014-01-08 15:24:53 UTC (rev 161500)
@@ -335,7 +335,7 @@
#else
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#endif
- statusbar = createStatusbar(webView);
+ statusbar = createStatusbar();
gtk_box_pack_start(GTK_BOX(vbox), createToolbar(window, uriEntry, webView), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), createBrowser(window, uriEntry, statusbar, webView, vbox), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);