View | Details | Raw Unified | Return to bug 228699 | Differences between
and this patch

Collapse All | Expand All

(-)Source/WebKit2/Shared/Plugins/unix/PluginSearchPath.cpp (+3 lines)
Lines 36-41 Link Here
36
#include "OpenGLShims.h"
36
#include "OpenGLShims.h"
37
#endif
37
#endif
38
38
39
#include <X11/Xlib.h>
40
39
#if ENABLE(ACCELERATED_2D_CANVAS)
41
#if ENABLE(ACCELERATED_2D_CANVAS)
40
// cairo-gl.h includes some definitions from GLX that conflict with
42
// cairo-gl.h includes some definitions from GLX that conflict with
41
// the ones provided by us. Since GLContextEGL doesn't use any GLX
43
// the ones provided by us. Since GLContextEGL doesn't use any GLX
Lines 50-55 Vector<String> pluginsDirectories() Link Here
50
50
51
    result.append(homeDirectoryPath() + "/.mozilla/plugins");
51
    result.append(homeDirectoryPath() + "/.mozilla/plugins");
52
    result.append(homeDirectoryPath() + "/.netscape/plugins");
52
    result.append(homeDirectoryPath() + "/.netscape/plugins");
53
    result.append("/usr/local/lib/browser_plugins/symlinks/webkit-gtk3");
53
    result.append("/usr/lib/browser/plugins");
54
    result.append("/usr/lib/browser/plugins");
54
    result.append("/usr/local/lib/mozilla/plugins");
55
    result.append("/usr/local/lib/mozilla/plugins");
55
    result.append("/usr/lib/firefox/plugins");
56
    result.append("/usr/lib/firefox/plugins");

Return to bug 228699