Changeset 150625 in webkit

Timestamp:

May 23, 2013 11:07:56 PM (11 years ago)

Author:

commit-queue@webkit.org

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 <​jpetsovits@blackberry.com> 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):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPageCompositor.cpp (modified) (5 diffs)
• Api/WebPageCompositor.h (modified) (1 diff)
• Api/WebPageCompositor_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPageCompositor.cpp

@@ -145 +145 @@
 }
 
-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
@@ -158 +158 @@
         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);
@@ -164 +164 @@
 
     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);
@@ -345 +345 @@
 }
 
-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);
 }
 
@@ -398 +398 @@
     const Platform::IntRect&,
     const Platform::TransformationMatrix&,
-    const Platform::FloatRect&,
     const Platform::FloatRect&)
 {

trunk/Source/WebKit/blackberry/Api/WebPageCompositor.h

@@ -55 +55 @@
         const Platform::IntRect& clipRect,
         const Platform::TransformationMatrix&,
-        const Platform::FloatRect& documentContents,
-        const Platform::FloatRect& viewport);
+        const Platform::FloatRect& documentSrcRect);
 
     void cleanup(Platform::Graphics::GLES2Context*);

trunk/Source/WebKit/blackberry/Api/WebPageCompositor_p.h

@@ -59 +59 @@
     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; }

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-23  Jakob Petsovits  <jpetsovits@blackberry.com>
+
+        [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  <edbaker@blackberry.com>