Title: [157652] trunk/Source/WebCore
Revision
157652
Author
[email protected]
Date
2013-10-18 16:35:38 -0700 (Fri, 18 Oct 2013)

Log Message

Cleaning warning messages from StyleResolveTree
https://bugs.webkit.org/show_bug.cgi?id=123030

Patch by Thiago de Barros Lacerda <[email protected]> on 2013-10-18
Reviewed by Andreas Kling.

No new tests needed.

* style/StyleResolveTree.cpp:
(WebCore::Style::elementInsideRegionNeedsRenderer):
(WebCore::Style::createRendererIfNeeded):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (157651 => 157652)


--- trunk/Source/WebCore/ChangeLog	2013-10-18 23:23:53 UTC (rev 157651)
+++ trunk/Source/WebCore/ChangeLog	2013-10-18 23:35:38 UTC (rev 157652)
@@ -1,3 +1,16 @@
+2013-10-18  Thiago de Barros Lacerda  <[email protected]>
+
+        Cleaning warning messages from StyleResolveTree
+        https://bugs.webkit.org/show_bug.cgi?id=123030
+
+        Reviewed by Andreas Kling.
+
+        No new tests needed.
+
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::elementInsideRegionNeedsRenderer):
+        (WebCore::Style::createRendererIfNeeded):
+
 2013-10-18  Brady Eidson  <[email protected]>
 
         Get rid of IDBFactoryBackendLevelDB and IDBTransactionBackendLevelDB in IDBDatabaseBackendLevelDB.

Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (157651 => 157652)


--- trunk/Source/WebCore/style/StyleResolveTree.cpp	2013-10-18 23:23:53 UTC (rev 157651)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp	2013-10-18 23:35:38 UTC (rev 157652)
@@ -59,7 +59,7 @@
 
 enum DetachType { NormalDetach, ReattachDetach };
 
-static void attachRenderTree(Element&, PassRefPtr<RenderStyle> resolvedStyle);
+static void attachRenderTree(Element&, PassRefPtr<RenderStyle>);
 static void detachRenderTree(Element&, DetachType);
 
 Change determineChange(const RenderStyle* s1, const RenderStyle* s2, Settings* settings)
@@ -180,6 +180,10 @@
 
     if (element.shouldMoveToFlowThread(*style))
         return true;
+#else
+    UNUSED_PARAM(element);
+    UNUSED_PARAM(renderingParentNode);
+    UNUSED_PARAM(style);
 #endif
     return false;
 }
@@ -200,7 +204,6 @@
 {
     ASSERT(!element.renderer());
 
-    Document& document = element.document();
     ContainerNode* renderingParentNode = NodeRenderingTraversal::parent(&element);
 
     RefPtr<RenderStyle> style = resolvedStyle;
@@ -248,6 +251,7 @@
     newRenderer->setAnimatableStyle(style.release()); // setAnimatableStyle() can depend on renderer() already being set.
 
 #if ENABLE(FULLSCREEN_API)
+    Document& document = element.document();
     if (document.webkitIsFullScreen() && document.webkitCurrentFullScreenElement() == &element) {
         newRenderer = RenderFullScreen::wrapRenderer(newRenderer, parentRenderer, document);
         if (!newRenderer)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to