Title: [108963] trunk/Source/WebKit/blackberry
- Revision
- 108963
- Author
- leo.y...@torchmobile.com.cn
- Date
- 2012-02-27 00:27:54 -0800 (Mon, 27 Feb 2012)
Log Message
[BlackBerry] Upstream accelerated compositing helper class
https://bugs.webkit.org/show_bug.cgi?id=78448
Reviewed by Antonio Gomes.
Initial upstream, no new tests.
* WebKitSupport/FrameLayers.cpp: Added.
* WebKitSupport/FrameLayers.h: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (108962 => 108963)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-02-27 07:50:54 UTC (rev 108962)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-02-27 08:27:54 UTC (rev 108963)
@@ -1,3 +1,15 @@
+2012-02-27 Leo Yang <leo.y...@torchmobile.com.cn>
+
+ [BlackBerry] Upstream accelerated compositing helper class
+ https://bugs.webkit.org/show_bug.cgi?id=78448
+
+ Reviewed by Antonio Gomes.
+
+ Initial upstream, no new tests.
+
+ * WebKitSupport/FrameLayers.cpp: Added.
+ * WebKitSupport/FrameLayers.h: Added.
+
2012-02-26 Hajime Morrita <morr...@chromium.org>
Move ChromeClient::showContextMenu() to ContextMenuClient
Added: trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.cpp (0 => 108963)
--- trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.cpp (rev 0)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.cpp 2012-02-27 08:27:54 UTC (rev 108963)
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+
+#if USE(ACCELERATED_COMPOSITING)
+#include "FrameLayers.h"
+
+#include "Frame.h"
+#include "FrameView.h"
+#include "LayerWebKitThread.h"
+#include "Page.h"
+#include "RenderPart.h"
+#include "WebPage_p.h"
+#include <wtf/Assertions.h>
+
+using namespace WebCore;
+
+namespace BlackBerry {
+namespace WebKit {
+
+static FloatSize frameLayerAbsoluteOffset(Frame* frame)
+{
+ ASSERT(frame);
+
+ if (!frame->view() || !frame->page() || !frame->page()->mainFrame() || !frame->page()->mainFrame()->view())
+ return FloatSize();
+
+ IntPoint offset = frame->page()->mainFrame()->view()->windowToContents(frame->view()->contentsToWindow(IntPoint::zero()));
+ return FloatSize(offset.x(), offset.y());
+}
+
+FrameLayers::FrameLayers(WebPagePrivate* page)
+ : m_pagePrivate(page)
+ , m_rootGraphicsLayer()
+ , m_rootLayer(0)
+{
+}
+
+FrameLayers::~FrameLayers()
+{
+ m_frameLayers.clear();
+}
+
+bool FrameLayers::containsLayerForFrame(Frame* frame)
+{
+ ASSERT(frame);
+ return m_frameLayers.contains(frame);
+}
+
+void FrameLayers::addLayer(Frame* frame, LayerWebKitThread* layer)
+{
+ // If we have main frame layer we don't accept other layers.
+ // This should not happen actually.
+ ASSERT(frame != m_pagePrivate->m_mainFrame || !isRootLayerMainFrameLayer());
+ if (frame == m_pagePrivate->m_mainFrame && isRootLayerMainFrameLayer())
+ return;
+
+ ASSERT(frame && layer && !m_frameLayers.contains(frame));
+
+ m_frameLayers.add(frame, layer);
+
+ calculateRootLayer();
+ if (!m_rootLayer) {
+ ASSERT(!m_rootGraphicsLayer);
+ m_rootGraphicsLayer = GraphicsLayer::create(0);
+ m_rootLayer = m_rootGraphicsLayer->platformLayer();
+ }
+
+ if (m_rootLayer != layer)
+ m_rootLayer->addSublayer(layer);
+}
+
+void FrameLayers::removeLayerByFrame(Frame* frame)
+{
+ ASSERT(frame);
+ FrameLayerMap::iterator it = m_frameLayers.find(frame);
+ if (it != m_frameLayers.end()) {
+ LayerWebKitThread* layer = it->second;
+ if (layer->superlayer())
+ layer->removeFromSuperlayer();
+ m_frameLayers.remove(it);
+ calculateRootLayer();
+ }
+}
+
+void FrameLayers::commitOnWebKitThread(double scale)
+{
+ ASSERT(m_rootLayer);
+ if (!isRootLayerMainFrameLayer()) {
+ for (FrameLayerMap::iterator it = m_frameLayers.begin(); it != m_frameLayers.end(); ++it)
+ it->second->setAbsoluteOffset(frameLayerAbsoluteOffset(it->first));
+ }
+ m_rootLayer->commitOnWebKitThread(scale);
+}
+
+void FrameLayers::calculateRootLayer()
+{
+ if (m_frameLayers.size() == 1 && m_frameLayers.begin()->first == m_pagePrivate->m_mainFrame)
+ m_rootLayer = m_frameLayers.begin()->second;
+ else if (m_rootGraphicsLayer)
+ m_rootLayer = m_rootGraphicsLayer->platformLayer();
+ else
+ m_rootLayer = 0;
+}
+
+} // namespace BlackBerry
+} // namespace WebKit
+
+#endif // USE(ACCELERATED_COMPOSITING)
Added: trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.h (0 => 108963)
--- trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.h (rev 0)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/FrameLayers.h 2012-02-27 08:27:54 UTC (rev 108963)
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef FrameLayers_h
+#define FrameLayers_h
+
+#if USE(ACCELERATED_COMPOSITING)
+
+#include "GraphicsLayer.h"
+#include <wtf/HashMap.h>
+#include <wtf/OwnPtr.h>
+
+namespace WebCore {
+class Frame;
+class LayerWebKitThread;
+}
+
+namespace BlackBerry {
+namespace WebKit {
+
+class WebPagePrivate;
+
+// This class may only be used on the WebKit thread.
+class FrameLayers {
+public:
+ FrameLayers(WebPagePrivate*);
+ ~FrameLayers();
+
+ bool containsLayerForFrame(WebCore::Frame*);
+ void addLayer(WebCore::Frame*, WebCore::LayerWebKitThread*);
+ void removeLayerByFrame(WebCore::Frame*);
+
+ bool hasLayer() const { return m_frameLayers.size(); }
+
+ void commitOnWebKitThread(double scale);
+
+ void calculateRootLayer();
+
+ bool isRootLayerMainFrameLayer() const { return m_rootLayer && !m_rootGraphicsLayer; }
+
+ // FIXME: This function should only be called on the WebKit thread.
+ // But it's now also being called on the Compositing thread.
+ WebCore::LayerWebKitThread* rootLayer() const { return m_rootLayer; }
+
+private:
+ WebPagePrivate* m_pagePrivate;
+ OwnPtr<WebCore::GraphicsLayer> m_rootGraphicsLayer;
+ WebCore::LayerWebKitThread* m_rootLayer;
+ typedef HashMap<WebCore::Frame*, WebCore::LayerWebKitThread*> FrameLayerMap;
+ FrameLayerMap m_frameLayers;
+};
+
+} // namespace BlackBerry
+} // namespace WebKit
+
+#endif // USE(ACCELERATED_COMPOSITING)
+
+#endif // FrameLayers_h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
