Title: [121411] trunk/Source/WebKit2
- Revision
- 121411
- Author
- [email protected]
- Date
- 2012-06-27 23:24:56 -0700 (Wed, 27 Jun 2012)
Log Message
Unreviewed. Fix the build without TEXTURE_MAPPER_GL.
* WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
(WebKit::WebPage::platformInitialize):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (121410 => 121411)
--- trunk/Source/WebKit2/ChangeLog 2012-06-28 06:09:50 UTC (rev 121410)
+++ trunk/Source/WebKit2/ChangeLog 2012-06-28 06:24:56 UTC (rev 121411)
@@ -1,3 +1,12 @@
+2012-06-27 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix the build without TEXTURE_MAPPER_GL.
+
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+ * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+ (WebKit::WebPage::platformInitialize):
+
2012-06-25 Mark Hahnenberg <[email protected]>
JSLock should be per-JSGlobalData
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (121410 => 121411)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2012-06-28 06:09:50 UTC (rev 121410)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp 2012-06-28 06:24:56 UTC (rev 121411)
@@ -27,6 +27,8 @@
#include "config.h"
#include "LayerTreeHostGtk.h"
+#if USE(TEXTURE_MAPPER_GL)
+
#include "DrawingAreaImpl.h"
#include "TextureMapperGL.h"
#include "WebPage.h"
@@ -392,3 +394,5 @@
}
} // namespace WebKit
+
+#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (121410 => 121411)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2012-06-28 06:09:50 UTC (rev 121410)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2012-06-28 06:24:56 UTC (rev 121411)
@@ -27,6 +27,8 @@
#ifndef LayerTreeHostGtk_h
#define LayerTreeHostGtk_h
+#if USE(TEXTURE_MAPPER_GL)
+
#include "LayerTreeContext.h"
#include "LayerTreeHost.h"
#include "TextureMapperLayer.h"
@@ -104,4 +106,6 @@
} // namespace WebKit
+#endif
+
#endif // LayerTreeHostGtk_h
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp (121410 => 121411)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2012-06-28 06:09:50 UTC (rev 121410)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2012-06-28 06:24:56 UTC (rev 121411)
@@ -55,7 +55,9 @@
GOwnPtr<gchar> plugID(atk_plug_get_id(ATK_PLUG(m_accessibilityObject)));
send(Messages::WebPageProxy::BindAccessibilityTree(String(plugID.get())));
+#if USE(TEXTURE_MAPPER_GL)
m_nativeWindowHandle = 0;
+#endif
}
void WebPage::updateAccessibilityTree()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
