Title: [89815] trunk/Source/WebCore
Revision
89815
Author
[email protected]
Date
2011-06-27 04:54:32 -0700 (Mon, 27 Jun 2011)

Log Message

2011-06-27  Pavel Feldman  <[email protected]>

        Reviewed by Yury Semikhatsky.

        Web Inspector: [REGRESSION r84481] updateLayout called from DrawNodeHighlight
        https://bugs.webkit.org/show_bug.cgi?id=63405

        We should not call layout from paint.

        * inspector/DOMNodeHighlighter.cpp:
        (WebCore::DOMNodeHighlighter::drawNodeHighlight):
        * inspector/DOMNodeHighlighter.h:
        * inspector/InspectorDOMAgent.cpp:
        (WebCore::InspectorDOMAgent::drawNodeHighlight):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (89814 => 89815)


--- trunk/Source/WebCore/ChangeLog	2011-06-27 11:33:27 UTC (rev 89814)
+++ trunk/Source/WebCore/ChangeLog	2011-06-27 11:54:32 UTC (rev 89815)
@@ -1,3 +1,18 @@
+2011-06-27  Pavel Feldman  <[email protected]>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: [REGRESSION r84481] updateLayout called from DrawNodeHighlight
+        https://bugs.webkit.org/show_bug.cgi?id=63405
+
+        We should not call layout from paint.
+
+        * inspector/DOMNodeHighlighter.cpp:
+        (WebCore::DOMNodeHighlighter::drawNodeHighlight):
+        * inspector/DOMNodeHighlighter.h:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::drawNodeHighlight):
+
 2011-06-27  Gyuyoung Kim  <[email protected]>
 
         Unreviewed. Fix style error in EFL port.

Modified: trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp (89814 => 89815)


--- trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp	2011-06-27 11:33:27 UTC (rev 89814)
+++ trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp	2011-06-27 11:54:32 UTC (rev 89815)
@@ -223,9 +223,8 @@
 
 namespace DOMNodeHighlighter {
 
-void DrawNodeHighlight(GraphicsContext& context, Node* node, HighlightMode mode)
+void drawNodeHighlight(GraphicsContext& context, Node* node, HighlightMode mode)
 {
-    node->document()->updateLayoutIgnorePendingStylesheets();
     RenderObject* renderer = node->renderer();
     Frame* containingFrame = node->document()->frame();
 

Modified: trunk/Source/WebCore/inspector/DOMNodeHighlighter.h (89814 => 89815)


--- trunk/Source/WebCore/inspector/DOMNodeHighlighter.h	2011-06-27 11:33:27 UTC (rev 89814)
+++ trunk/Source/WebCore/inspector/DOMNodeHighlighter.h	2011-06-27 11:54:32 UTC (rev 89815)
@@ -44,7 +44,7 @@
     HighlightMargin
 };
 
-void DrawNodeHighlight(GraphicsContext&, Node*, HighlightMode);
+void drawNodeHighlight(GraphicsContext&, Node*, HighlightMode);
 
 } // namespace DOMNodeHighlighter
 

Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (89814 => 89815)


--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2011-06-27 11:33:27 UTC (rev 89814)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2011-06-27 11:54:32 UTC (rev 89815)
@@ -1488,7 +1488,7 @@
         mode = DOMNodeHighlighter::HighlightBorder;
     else if (m_highlightMode == "margin")
         mode = DOMNodeHighlighter::HighlightMargin;
-    DOMNodeHighlighter::DrawNodeHighlight(context, m_highlightedNode.get(), mode);
+    DOMNodeHighlighter::drawNodeHighlight(context, m_highlightedNode.get(), mode);
 }
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to