Skip to content

Commit

Permalink
Merge r175087 - Do not build WidgetBackingStoreGtkX11 when not used.
Browse files Browse the repository at this point in the history
<https://webkit.org/b/137972>.

Patch by Milan Crha <mcrha@redhat.com> on 2014-10-22
Reviewed by Carlos Garcia Campos.

* platform/gtk/WidgetBackingStoreGtkX11.cpp:
* platform/gtk/WidgetBackingStoreGtkX11.h:

Canonical link: https://commits.webkit.org/154760.153@webkitgtk/2.6
git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@175905 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
mcrha authored and carlosgcampos committed Nov 11, 2014
1 parent 186aee7 commit 1d81e12
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
2014-10-22 Milan Crha <mcrha@redhat.com>

Do not build WidgetBackingStoreGtkX11 when not used.
<https://webkit.org/b/137972>.

Reviewed by Carlos Garcia Campos.

* platform/gtk/WidgetBackingStoreGtkX11.cpp:
* platform/gtk/WidgetBackingStoreGtkX11.h:

2014-10-22 Said Abou-Hallawa <sabouhallawa@apple.com>

SVG loaded through html <img> can't request to load any external resources.
Expand Down
4 changes: 4 additions & 0 deletions Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp
Expand Up @@ -19,6 +19,8 @@
#include "config.h"
#include "WidgetBackingStoreGtkX11.h"

#if PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)

#include "CairoUtilities.h"
#include "GtkVersioning.h"
#include "RefPtrCairo.h"
Expand Down Expand Up @@ -89,3 +91,5 @@ void WidgetBackingStoreGtkX11::scroll(const IntRect& scrollRect, const IntSize&
}

} // namespace WebCore

#endif // PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
3 changes: 3 additions & 0 deletions Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h
Expand Up @@ -22,6 +22,7 @@
#include "WidgetBackingStore.h"
#include <wtf/RefPtr.h>

#if PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)
#include <X11/Xlib.h>

namespace WebCore {
Expand All @@ -44,4 +45,6 @@ class WidgetBackingStoreGtkX11 : public WidgetBackingStore {

} // namespace WebCore

#endif // PLATFORM(GTK) && PLATFORM(X11) && defined(GDK_WINDOWING_X11)

#endif // GtkWidgetBackingStoreX11_h

0 comments on commit 1d81e12

Please sign in to comment.