[webkit-changes] [150625] trunk/Source/WebKit/blackberry

Thu, 23 May 2013 23:06:18 -0700

Title: [150625] trunk/Source/WebKit/blackberry
Revision
150625
Author
[email protected]
Date
2013-05-23 23:07:56 -0700 (Thu, 23 May 2013)

Log Message

[BlackBerry] Compositor API change: Don't pass the unused "viewport" parameter.
https://bugs.webkit.org/show_bug.cgi?id=116545
Internal PR 189775

Patch by Jakob Petsovits <[email protected]> on 2013-05-23
Reviewed by Rob Buis.

Also change the name of the "documentContents" parameter
to the more descriptive "documentSrcRect".

* Api/WebPageCompositor.cpp:
(BlackBerry::WebKit::WebPageCompositorPrivate::render):
(BlackBerry::WebKit::WebPageCompositor::render):
* Api/WebPageCompositor.h:
* Api/WebPageCompositor_p.h:
(WebPageCompositorPrivate):

Modified Paths

Diff

Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp (150624 => 150625)


--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp	2013-05-24 05:14:54 UTC (rev 150624)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp	2013-05-24 06:07:56 UTC (rev 150625)
@@ -144,7 +144,7 @@
         m_layerRenderer->prepareFrame(animationTime, m_compositingThreadOverlayLayer.get());
 }
 
-void WebPageCompositorPrivate::render(const IntRect& targetRect, const IntRect& clipRect, const TransformationMatrix& transformIn, const FloatRect& documentContents, const FloatRect& /*viewport*/)
+void WebPageCompositorPrivate::render(const IntRect& targetRect, const IntRect& clipRect, const TransformationMatrix& transformIn, const FloatRect& documentSrcRect)
 {
     // m_layerRenderer should have been created in prepareFrame
     if (!m_layerRenderer)
@@ -157,13 +157,13 @@
     if (!m_webPage || m_webPage->compositor() != this)
         return;
 
-    m_layerRenderer->setViewport(targetRect, clipRect, documentContents, m_layoutRect, m_documentRect.size());
+    m_layerRenderer->setViewport(targetRect, clipRect, documentSrcRect, m_layoutRect, m_documentRect.size());
 
     TransformationMatrix transform(transformIn);
     transform.translate(-m_documentRect.x(), -m_documentRect.y());
 
     if (!drawsRootLayer())
-        m_webPage->m_backingStore->d->compositeContents(m_layerRenderer.get(), transform, documentContents, !m_backgroundColor.hasAlpha());
+        m_webPage->m_backingStore->d->compositeContents(m_layerRenderer.get(), transform, documentSrcRect, !m_backgroundColor.hasAlpha());
 
     compositeLayers(transform);
 }
@@ -344,10 +344,10 @@
     d->prepareFrame(animationTime);
 }
 
-void WebPageCompositor::render(Platform::Graphics::GLES2Context* context, const Platform::IntRect& targetRect, const Platform::IntRect& clipRect, const Platform::TransformationMatrix& transform, const Platform::FloatRect& documentContents, const Platform::FloatRect& viewport)
+void WebPageCompositor::render(Platform::Graphics::GLES2Context* context, const Platform::IntRect& targetRect, const Platform::IntRect& clipRect, const Platform::TransformationMatrix& transform, const Platform::FloatRect& documentSrcRect)
 {
     d->setContext(context);
-    d->render(targetRect, clipRect, TransformationMatrix(reinterpret_cast<const TransformationMatrix&>(transform)), documentContents, viewport);
+    d->render(targetRect, clipRect, TransformationMatrix(reinterpret_cast<const TransformationMatrix&>(transform)), documentSrcRect);
 }
 
 void WebPageCompositor::cleanup(Platform::Graphics::GLES2Context*)
@@ -397,7 +397,6 @@
     const Platform::IntRect&,
     const Platform::IntRect&,
     const Platform::TransformationMatrix&,
-    const Platform::FloatRect&,
     const Platform::FloatRect&)
 {
 }

Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h (150624 => 150625)


--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h	2013-05-24 05:14:54 UTC (rev 150624)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h	2013-05-24 06:07:56 UTC (rev 150625)
@@ -54,8 +54,7 @@
         const Platform::IntRect& targetRect,
         const Platform::IntRect& clipRect,
         const Platform::TransformationMatrix&,
-        const Platform::FloatRect& documentContents,
-        const Platform::FloatRect& viewport);
+        const Platform::FloatRect& documentSrcRect);
 
     void cleanup(Platform::Graphics::GLES2Context*);

Modified: trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h (150624 => 150625)


--- trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h	2013-05-24 05:14:54 UTC (rev 150624)
+++ trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h	2013-05-24 06:07:56 UTC (rev 150625)
@@ -58,11 +58,7 @@
     // Public API
     void setChildWindowPlacement(WebPageCompositor::ChildWindowPlacement placement) { m_childWindowPlacement = placement; }
     void prepareFrame(double animationTime);
-    void render(const WebCore::IntRect& targetRect,
-        const WebCore::IntRect& clipRect,
-        const WebCore::TransformationMatrix&,
-        const WebCore::FloatRect& documentContents,
-        const WebCore::FloatRect& viewport);
+    void render(const WebCore::IntRect& targetRect, const WebCore::IntRect& clipRect, const WebCore::TransformationMatrix&, const WebCore::FloatRect& documentSrcRect);
 
     Platform::Graphics::GLES2Context* context() const { return m_context; }
     void setContext(Platform::Graphics::GLES2Context*);

Modified: trunk/Source/WebKit/blackberry/ChangeLog (150624 => 150625)


--- trunk/Source/WebKit/blackberry/ChangeLog	2013-05-24 05:14:54 UTC (rev 150624)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2013-05-24 06:07:56 UTC (rev 150625)
@@ -1,3 +1,21 @@
+2013-05-23  Jakob Petsovits  <[email protected]>
+
+        [BlackBerry] Compositor API change: Don't pass the unused "viewport" parameter.
+        https://bugs.webkit.org/show_bug.cgi?id=116545
+        Internal PR 189775
+
+        Reviewed by Rob Buis.
+
+        Also change the name of the "documentContents" parameter
+        to the more descriptive "documentSrcRect".
+
+        * Api/WebPageCompositor.cpp:
+        (BlackBerry::WebKit::WebPageCompositorPrivate::render):
+        (BlackBerry::WebKit::WebPageCompositor::render):
+        * Api/WebPageCompositor.h:
+        * Api/WebPageCompositor_p.h:
+        (WebPageCompositorPrivate):
+
 2013-05-23  Ed Baker  <[email protected]>
 
         [BlackBerry] The web context does not contain any link properties if the context node is an image enclosed by a link node

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to