Title: [126766] trunk/Source
- Revision
- 126766
- Author
- [email protected]
- Date
- 2012-08-27 08:49:10 -0700 (Mon, 27 Aug 2012)
Log Message
For convenience, make RenderLayer::enclosingElement a public method.
https://bugs.webkit.org/show_bug.cgi?id=95018
Reviewed by George Staikos.
Patch by Antonio Gomes <[email protected]>
Source/WebCore:
It can be useful for outsiders of this class.
No new tests needed.
* rendering/RenderLayer.h:
(RenderLayer):
Source/WebKit/blackberry:
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea): Make use
of the new public RenderLayer::enclosingElement method and remove duplicated code.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126765 => 126766)
--- trunk/Source/WebCore/ChangeLog 2012-08-27 15:46:15 UTC (rev 126765)
+++ trunk/Source/WebCore/ChangeLog 2012-08-27 15:49:10 UTC (rev 126766)
@@ -1,3 +1,18 @@
+2012-08-25 Antonio Gomes <[email protected]>
+
+ For convenience, make RenderLayer::enclosingElement a public method.
+ https://bugs.webkit.org/show_bug.cgi?id=95018
+
+ Reviewed by George Staikos.
+
+ ... this way some platform specific code could make use of it
+ and remove code duplications.
+
+ No new tests needed.
+
+ * rendering/RenderLayer.h:
+ (RenderLayer):
+
2012-08-27 Andrey Kosyakov <[email protected]>
Web Inspector: display a dimmed warning icon on a timeline record if it has children with warning
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (126765 => 126766)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2012-08-27 15:46:15 UTC (rev 126765)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2012-08-27 15:49:10 UTC (rev 126766)
@@ -670,6 +670,8 @@
void setLayerListMutationAllowed(bool flag) { m_layerListMutationAllowed = flag; }
#endif
+ Node* enclosingElement() const;
+
private:
void updateZOrderLists();
void rebuildZOrderLists();
@@ -823,8 +825,6 @@
// Both updates the status, and returns true if descendants of this have 3d.
bool update3DTransformedDescendantStatus();
- Node* enclosingElement() const;
-
void createReflection();
void removeReflection();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (126765 => 126766)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-27 15:46:15 UTC (rev 126765)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-27 15:49:10 UTC (rev 126766)
@@ -1,3 +1,16 @@
+2012-08-25 Antonio Gomes <[email protected]>
+
+ For convenience, make RenderLayer::enclosingElement a public method.
+ https://bugs.webkit.org/show_bug.cgi?id=95018
+
+ Reviewed by George Staikos.
+
+ Make use of the new public RenderLayer::enclosingElement method and
+ remove duplicated code.
+
+ * WebKitSupport/InRegionScrollableArea.cpp:
+ (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+
2012-08-27 Mikhail Pozdnyakov <[email protected]>
Rename RegisterProtocolHandler API to NavigatorContentUtils
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (126765 => 126766)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-08-27 15:46:15 UTC (rev 126765)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-08-27 15:49:10 UTC (rev 126766)
@@ -46,17 +46,6 @@
m_cachedCompositedScrollableLayer->clearOverride();
}
-// FIXME: Make RenderLayer::enclosingElement public so this one can be removed.
-static Node* enclosingLayerNode(RenderLayer* layer)
-{
- for (RenderObject* r = layer->renderer(); r; r = r->parent()) {
- if (Node* e = r->node())
- return e;
- }
- ASSERT_NOT_REACHED();
- return 0;
-}
-
InRegionScrollableArea::InRegionScrollableArea(WebPagePrivate* webPage, RenderLayer* layer)
: m_webPage(webPage)
, m_layer(layer)
@@ -111,8 +100,8 @@
m_cachedCompositedScrollableLayer = m_layer->backing()->scrollingLayer()->platformLayer();
ASSERT(!m_cachedNonCompositedScrollableNode);
} else {
- m_camouflagedCompositedScrollableLayer = reinterpret_cast<unsigned>(enclosingLayerNode(m_layer));
- m_cachedNonCompositedScrollableNode = enclosingLayerNode(m_layer);
+ m_camouflagedCompositedScrollableLayer = reinterpret_cast<unsigned>(m_layer->enclosingElement());
+ m_cachedNonCompositedScrollableNode = m_layer->enclosingElement();
ASSERT(!m_cachedCompositedScrollableLayer);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
