Title: [135290] trunk/Source/WebCore
- Revision
- 135290
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-20 09:44:31 -0800 (Tue, 20 Nov 2012)
Log Message
Merge checks for creating renderers into shouldCreateRenderer
https://bugs.webkit.org/show_bug.cgi?id=102768
Patch by Elliott Sprehn <espr...@chromium.org> on 2012-11-20
Reviewed by Ojan Vafai.
Merge the checks for if renderers should be created into shouldCreateRenderer
so simplify the code and ensure correctness if doing
NodeRenderingContext(node).shouldCreateRenderer() in other places in webkit.
No new tests, just refactoring.
* dom/NodeRenderingContext.cpp:
(WebCore::NodeRenderingContext::shouldCreateRenderer):
(WebCore::NodeRendererFactory::createRendererIfNeeded):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135289 => 135290)
--- trunk/Source/WebCore/ChangeLog 2012-11-20 17:25:14 UTC (rev 135289)
+++ trunk/Source/WebCore/ChangeLog 2012-11-20 17:44:31 UTC (rev 135290)
@@ -1,3 +1,20 @@
+2012-11-20 Elliott Sprehn <espr...@chromium.org>
+
+ Merge checks for creating renderers into shouldCreateRenderer
+ https://bugs.webkit.org/show_bug.cgi?id=102768
+
+ Reviewed by Ojan Vafai.
+
+ Merge the checks for if renderers should be created into shouldCreateRenderer
+ so simplify the code and ensure correctness if doing
+ NodeRenderingContext(node).shouldCreateRenderer() in other places in webkit.
+
+ No new tests, just refactoring.
+
+ * dom/NodeRenderingContext.cpp:
+ (WebCore::NodeRenderingContext::shouldCreateRenderer):
+ (WebCore::NodeRendererFactory::createRendererIfNeeded):
+
2012-11-19 Pavel Feldman <pfeld...@chromium.org>
Web Inspector: simplify? damaged region computation in the editor
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.cpp (135289 => 135290)
--- trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-20 17:25:14 UTC (rev 135289)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-20 17:44:31 UTC (rev 135290)
@@ -142,6 +142,8 @@
bool NodeRenderingContext::shouldCreateRenderer() const
{
+ if (!m_node->document()->shouldCreateRenderers())
+ return false;
if (!m_parentDetails.node())
return false;
RenderObject* parentRenderer = this->parentRenderer();
@@ -235,12 +237,7 @@
void NodeRendererFactory::createRendererIfNeeded()
{
Node* node = m_context.node();
- Document* document = node->document();
- if (!document->shouldCreateRenderers())
- return;
-
ASSERT(!node->renderer());
- ASSERT(document->shouldCreateRenderers());
if (!m_context.shouldCreateRenderer())
return;
@@ -274,6 +271,7 @@
RenderObject* newRenderer = createRenderer();
#if ENABLE(FULLSCREEN_API)
+ Document* document = node->document();
if (document->webkitIsFullScreen() && document->webkitCurrentFullScreenElement() == node)
newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer, document);
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
