Title: [197451] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 197451
- Author
- [email protected]
- Date
- 2016-03-02 09:32:28 -0800 (Wed, 02 Mar 2016)
Log Message
Fix the build with VIDEO disabled.
Patch by Milan Crha <[email protected]> on 2016-03-02
Reviewed by Carlos Garcia Campos.
* platform/gtk/RenderThemeGtk2.cpp:
* platform/gtk/RenderThemeGtk3.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (197450 => 197451)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-03-02 17:16:05 UTC (rev 197450)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2016-03-02 17:32:28 UTC (rev 197451)
@@ -1,3 +1,12 @@
+2016-03-02 Milan Crha <[email protected]>
+
+ Fix the build with VIDEO disabled.
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/gtk/RenderThemeGtk2.cpp:
+ * platform/gtk/RenderThemeGtk3.cpp:
+
2016-02-29 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix the build with GTK+ < 3.19.
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp (197450 => 197451)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-03-02 17:16:05 UTC (rev 197450)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-03-02 17:32:28 UTC (rev 197451)
@@ -908,6 +908,7 @@
}
}
+#if ENABLE(VIDEO)
bool RenderThemeGtk::paintMediaButton(RenderObject* renderObject, GraphicsContext* context, const IntRect& rect, const char* symbolicIconName, const char* fallbackStockIconName)
{
static const unsigned mediaIconSize = 16;
@@ -919,6 +920,7 @@
paintGdkPixbuf(context, icon.get(), iconRect);
return false;
}
+#endif
static void gtkStyleSetCallback(GtkWidget* widget, GtkStyle* previous, RenderTheme* renderTheme)
{
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp (197450 => 197451)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2016-03-02 17:16:05 UTC (rev 197450)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp 2016-03-02 17:32:28 UTC (rev 197451)
@@ -37,6 +37,7 @@
#include "Page.h"
#include "PaintInfo.h"
#include "PlatformContextCairo.h"
+#include "RenderBox.h"
#include "RenderElement.h"
#include "ScrollbarThemeGtk.h"
#include "TextDirection.h"
@@ -1157,6 +1158,7 @@
}
}
+#if ENABLE(VIDEO)
bool RenderThemeGtk::paintMediaButton(RenderObject* renderObject, GraphicsContext* graphicsContext, const IntRect& rect, const char* iconName, const char*)
{
GRefPtr<GtkStyleContext> context = createStyleContext(MediaButton);
@@ -1166,6 +1168,7 @@
IntRect iconRect(rect.x() + (rect.width() - mediaIconSize) / 2, rect.y() + (rect.height() - mediaIconSize) / 2, mediaIconSize, mediaIconSize);
return !paintIcon(context.get(), *graphicsContext, iconRect, iconName);
}
+#endif
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
