[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
noam.rosenthal at nokia.com
noam.rosenthal at nokia.com
Wed Dec 22 15:11:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 8201cf7ac1a29288d2b2962c25d9b45f128fc366
Author: noam.rosenthal at nokia.com <noam.rosenthal at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 28 22:57:32 2010 +0000
2010-10-28 Noam Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Ariya Hidayat.
[Texmap] [Qt] Texture mapper initial implementation
https://bugs.webkit.org/show_bug.cgi?id=47070
Build fix, some wrong changes slipped into the previous patch.
No new tests: build fix.
* platform/graphics/GraphicsLayer.h:
* platform/graphics/opengl/TextureMapperGL.cpp:
(WebCore::BitmapTextureGL::setContentsToImage):
* platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
(WebCore::TextureMapperNode::uploadTextureFromContent):
(WebCore::TextureMapperNode::paintRecursive):
* platform/qt/QWebPageClient.h:
(QWebPageClient::setRootGraphicsLayer):
2010-10-28 Noam Rosenthal <noam.rosenthal at nokia.com>
Reviewed by Ariya Hidayat.
[Texmap] [Qt] Texture mapper initial implementation
https://bugs.webkit.org/show_bug.cgi?id=47070
Build fix,
* WebCoreSupport/PageClientQt.cpp:
(WebCore::PlatformLayerProxyQGraphicsObject::PlatformLayerProxyQGraphicsObject):
(WebCore::PageClientQGraphicsWidget::~PageClientQGraphicsWidget):
(WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
* WebCoreSupport/PageClientQt.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70819 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index aefeb60..45710ca 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-28 Noam Rosenthal <noam.rosenthal at nokia.com>
+
+ Reviewed by Ariya Hidayat.
+
+ [Texmap] [Qt] Texture mapper initial implementation
+ https://bugs.webkit.org/show_bug.cgi?id=47070
+
+ Build fix, some wrong changes slipped into the previous patch.
+ No new tests: build fix.
+
+ * platform/graphics/GraphicsLayer.h:
+ * platform/graphics/opengl/TextureMapperGL.cpp:
+ (WebCore::BitmapTextureGL::setContentsToImage):
+ * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
+ (WebCore::TextureMapperNode::uploadTextureFromContent):
+ (WebCore::TextureMapperNode::paintRecursive):
+ * platform/qt/QWebPageClient.h:
+ (QWebPageClient::setRootGraphicsLayer):
+
2010-10-28 David Hyatt <hyatt at apple.com>
Reviewed by James Robinson.
diff --git a/WebCore/platform/graphics/GraphicsLayer.h b/WebCore/platform/graphics/GraphicsLayer.h
index a476054..991ca32 100644
--- a/WebCore/platform/graphics/GraphicsLayer.h
+++ b/WebCore/platform/graphics/GraphicsLayer.h
@@ -40,6 +40,10 @@
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
+#if USE(TEXTURE_MAPPER)
+#include "texmap/TextureMapperPlatformLayer.h"
+#endif
+
#if PLATFORM(MAC)
#ifdef __OBJC__
@class WebLayer;
@@ -67,8 +71,10 @@ typedef TextureMapperPlatformLayer* NativeLayer;
QT_BEGIN_NAMESPACE
class QGraphicsObject;
QT_END_NAMESPACE
+namespace WebCore {
typedef QGraphicsObject PlatformLayer;
typedef QGraphicsObject* NativeLayer;
+}
#endif
#elif PLATFORM(CHROMIUM)
namespace WebCore {
diff --git a/WebCore/platform/graphics/opengl/TextureMapperGL.cpp b/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
index 5662f21..966656b 100644
--- a/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
+++ b/WebCore/platform/graphics/opengl/TextureMapperGL.cpp
@@ -29,7 +29,7 @@
#if defined(TEXMAP_OPENGL_ES_2)
#include <GLES2/gl2.h>
-#elif PLATFORM(MAC)
+#elif OS(MAC_OS_X)
#include <gl.h>
#else
#include <GL/gl.h>
@@ -65,7 +65,7 @@ extern "C" {
void glBufferSubData(GLenum, GLsizeiptr, GLsizeiptr, const GLvoid*);
void glGetProgramInfoLog(GLuint program, GLsizei, GLsizei*, GLchar*);
-#if !PLATFORM(MAC)
+#if !OS(MAC_OS_X)
GLint glGetUniformLocation(GLuint, const GLchar*);
GLint glBindAttribLocation(GLuint, GLuint, const GLchar*);
#endif
@@ -459,7 +459,7 @@ void BitmapTextureGL::setContentsToImage(Image* image)
m_image = nativeImage;
if (!found) {
GraphicsContext context(beginPaint(IntRect(0, 0, m_textureSize.width(), m_textureSize.height())));
- context.drawImage(image, DeviceColorSpace, IntPoint(0, 0), CompositeCopy);
+ context.drawImage(image, ColorSpaceDeviceRGB, IntPoint(0, 0), CompositeCopy);
endPaint();
}
}
diff --git a/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp b/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
index cf90cb1..057bcfc 100644
--- a/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
+++ b/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
@@ -683,7 +683,6 @@ void TextureMapperNode::uploadTextureFromContent(TextureMapper* textureMapper, c
|| (!m_currentContent.needsDisplay && m_currentContent.needsDisplayRect.isEmpty() && !needsReset))
return;
- WTF::StopWatch stopWatch;
IntRect dirtyRect = IntRect(0, 0, m_size.width(), m_size.height());
if (!needsReset && !m_currentContent.needsDisplay)
dirtyRect.intersect(m_currentContent.needsDisplayRect);
@@ -701,15 +700,6 @@ void TextureMapperNode::uploadTextureFromContent(TextureMapper* textureMapper, c
m_layer->paintGraphicsLayerContents(context, dirtyRect);
}
m_texture->endPaint();
- {
-#if 0
- LOG("[TextureMapper] Re-render(%d) layer(%p) %d::%d::%d (%dx%d) [%dms]\n", ++renderCount, this,
- needsReset, m_currentContent.needsDisplay, !m_currentContent.needsDisplayRect.isEmpty(),
- dirtyRect.width(), dirtyRect.height(), int(stopWatch.elapsed() * 1000));
- static int renderCount = 0;
- m_texture->save(String().format("/tmp/layer_%d.png", renderCount));
-#endif
- }
m_currentContent.needsDisplay = false;
}
@@ -739,8 +729,6 @@ void TextureMapperNode::paintSelf(const TexmapPaintOptions& options)
void TextureMapperNode::paintRecursive(TexmapPaintOptions options)
{
- WTF::StopWatch stopWatch;
-
bool isDirty = m_state.dirty;
m_state.dirty = false;
diff --git a/WebCore/platform/qt/QWebPageClient.h b/WebCore/platform/qt/QWebPageClient.h
index 95ae88c..d8f4171 100644
--- a/WebCore/platform/qt/QWebPageClient.h
+++ b/WebCore/platform/qt/QWebPageClient.h
@@ -52,7 +52,7 @@ public:
virtual void setInputMethodEnabled(bool enable) = 0;
virtual bool inputMethodEnabled() const = 0;
#if USE(ACCELERATED_COMPOSITING)
- virtual void setRootGraphicsLayer(PlatformLayer* layer) { }
+ virtual void setRootGraphicsLayer(WebCore::PlatformLayer* layer) { }
// this gets called when the compositor wants us to sync the layers
// if scheduleSync is true, we schedule a sync ourselves. otherwise,
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 71d0da9..236b04e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-28 Noam Rosenthal <noam.rosenthal at nokia.com>
+
+ Reviewed by Ariya Hidayat.
+
+ [Texmap] [Qt] Texture mapper initial implementation
+ https://bugs.webkit.org/show_bug.cgi?id=47070
+
+ Build fix,
+
+ * WebCoreSupport/PageClientQt.cpp:
+ (WebCore::PlatformLayerProxyQGraphicsObject::PlatformLayerProxyQGraphicsObject):
+ (WebCore::PageClientQGraphicsWidget::~PageClientQGraphicsWidget):
+ (WebCore::PageClientQGraphicsWidget::setRootGraphicsLayer):
+ * WebCoreSupport/PageClientQt.h:
+
2010-10-28 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
Reviewed by Andreas Kling.
diff --git a/WebKit/qt/WebCoreSupport/PageClientQt.cpp b/WebKit/qt/WebCoreSupport/PageClientQt.cpp
index 4e51f81..4d42c39 100644
--- a/WebKit/qt/WebCoreSupport/PageClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/PageClientQt.cpp
@@ -97,11 +97,11 @@ private:
QWidget* m_widget;
};
-class PlatformLayerProxyQGraphicsObject : public PlatfromLayerProxyQt {
+class PlatformLayerProxyQGraphicsObject : public PlatformLayerProxyQt {
public:
- PlatformLayerProxyQGraphicsWidget(QWebFrame* frame, TextureMapperContentLayer* layer, QGraphicsObject* object)
- : QObject(object)
- , m_graphicsItem(graphicsObject)
+ PlatformLayerProxyQGraphicsObject(QWebFrame* frame, TextureMapperContentLayer* layer, QGraphicsObject* object)
+ : PlatformLayerProxyQt(frame, layer, object)
+ , m_graphicsItem(object)
{
}
@@ -228,12 +228,16 @@ PageClientQGraphicsWidget::~PageClientQGraphicsWidget()
{
delete overlay;
#if USE(ACCELERATED_COMPOSITING)
+#if USE(TEXTURE_MAPPER)
+ delete platformLayerProxy;
+#else
if (!rootGraphicsLayer)
return;
// we don't need to delete the root graphics layer. The lifecycle is managed in GraphicsLayerQt.cpp.
rootGraphicsLayer.data()->setParentItem(0);
view->scene()->removeItem(rootGraphicsLayer.data());
#endif
+#endif
}
void PageClientQGraphicsWidget::scroll(int dx, int dy, const QRect& rectToScroll)
@@ -293,7 +297,7 @@ void PageClientQGraphicsWidget::syncLayers()
void PageClientQGraphicsWidget::setRootGraphicsLayer(TextureMapperPlatformLayer* layer)
{
if (layer) {
- platformLayerProxy = new PlatformLayerProxyQGraphicsObject(page->mainFrame(), static_cast<TextureMapperContentLayer*>(layer), 0, view);
+ platformLayerProxy = new PlatformLayerProxyQGraphicsObject(page->mainFrame(), static_cast<TextureMapperContentLayer*>(layer), view);
return;
}
delete platformLayerProxy;
diff --git a/WebKit/qt/WebCoreSupport/PageClientQt.h b/WebKit/qt/WebCoreSupport/PageClientQt.h
index 6d989fa..924d2a7 100644
--- a/WebKit/qt/WebCoreSupport/PageClientQt.h
+++ b/WebKit/qt/WebCoreSupport/PageClientQt.h
@@ -47,11 +47,7 @@
namespace WebCore {
-class PageClientQWidget : public QWebPageClient
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
- , public virtual TextureMapperLayerClient
-#endif
-{
+class PageClientQWidget : public QWebPageClient {
public:
PageClientQWidget(QWidget* newView, QWebPage* newPage)
: view(newView)
@@ -143,11 +139,7 @@ class QGraphicsItemOverlay : public QGraphicsObject {
};
-class PageClientQGraphicsWidget : public QWebPageClient
-#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
- , public virtual TextureMapperLayerClient
-#endif
-{
+class PageClientQGraphicsWidget : public QWebPageClient {
public:
PageClientQGraphicsWidget(QGraphicsWebView* newView, QWebPage* newPage)
: view(newView)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list