Changeset 89815 in webkit

Timestamp:

Jun 27, 2011 4:54:32 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-06-27 Pavel Feldman <​pfeldman@google.com>

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/DOMNodeHighlighter.cpp (modified) (1 diff)
• inspector/DOMNodeHighlighter.h (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-27  Pavel Feldman  <pfeldman@google.com>
+
+        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  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp

@@ -224 +224 @@
 namespace DOMNodeHighlighter {
 
-void DrawNodeHighlight(GraphicsContext& context, Node* node, HighlightMode mode)
-{
-    node->document()->updateLayoutIgnorePendingStylesheets();
+void drawNodeHighlight(GraphicsContext& context, Node* node, HighlightMode mode)
+{
     RenderObject* renderer = node->renderer();
     Frame* containingFrame = node->document()->frame();

trunk/Source/WebCore/inspector/DOMNodeHighlighter.h

@@ -45 +45 @@
 };
 
-void DrawNodeHighlight(GraphicsContext&, Node*, HighlightMode);
+void drawNodeHighlight(GraphicsContext&, Node*, HighlightMode);
 
 } // namespace DOMNodeHighlighter

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1489 +1489 @@
     else if (m_highlightMode == "margin")
         mode = DOMNodeHighlighter::HighlightMargin;
-    DOMNodeHighlighter::DrawNodeHighlight(context, m_highlightedNode.get(), mode);
+    DOMNodeHighlighter::drawNodeHighlight(context, m_highlightedNode.get(), mode);
 }