Diff
Modified: trunk/Source/WebCore/ChangeLog (108337 => 108338)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 12:04:57 UTC (rev 108337)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 12:13:42 UTC (rev 108338)
@@ -1,3 +1,22 @@
+2012-02-21 'Pavel Feldman' <[email protected]>
+
+ Not reviewed: fixing Mac build.
+
+ * inspector/DOMNodeHighlighter.cpp:
+ (WebCore::DOMNodeHighlighter::drawOutline):
+ * inspector/DOMNodeHighlighter.h:
+ (DOMNodeHighlighter):
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::willPaintImpl):
+ * inspector/InspectorInstrumentation.h:
+ (InspectorInstrumentation):
+ (WebCore::InspectorInstrumentation::willPaint):
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::InspectorPageAgent):
+ (WebCore::InspectorPageAgent::willPaint):
+ (WebCore::InspectorPageAgent::didPaint):
+ * inspector/InspectorPageAgent.h:
+
2012-02-21 Peter Rybin <[email protected]>
Web Inspector: Switch Debugger agent to TypeBuilder
Modified: trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp (108337 => 108338)
--- trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2012-02-21 12:04:57 UTC (rev 108337)
+++ trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2012-02-21 12:13:42 UTC (rev 108338)
@@ -514,7 +514,7 @@
getOrDrawRectHighlight(0, document, highlightData, highlight);
}
-void drawOutline(GraphicsContext& context, FrameView* view, const LayoutRect& rect, const Color& color)
+void drawOutline(GraphicsContext& context, const LayoutRect& rect, const Color& color)
{
FloatRect outlineRect = rect;
drawOutlinedQuad(context, outlineRect, Color(), color);
Modified: trunk/Source/WebCore/inspector/DOMNodeHighlighter.h (108337 => 108338)
--- trunk/Source/WebCore/inspector/DOMNodeHighlighter.h 2012-02-21 12:04:57 UTC (rev 108337)
+++ trunk/Source/WebCore/inspector/DOMNodeHighlighter.h 2012-02-21 12:13:42 UTC (rev 108338)
@@ -79,7 +79,7 @@
void drawHighlight(GraphicsContext&, Document*, HighlightData*);
void getHighlight(Document*, HighlightData*, Highlight*);
-void drawOutline(GraphicsContext&, FrameView*, const LayoutRect&, const Color&);
+void drawOutline(GraphicsContext&, const LayoutRect&, const Color&);
} // namespace DOMNodeHighlighter
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (108337 => 108338)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-02-21 12:04:57 UTC (rev 108337)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-02-21 12:13:42 UTC (rev 108338)
@@ -399,10 +399,10 @@
timelineAgent->didLoadXHR();
}
-InspectorInstrumentationCookie InspectorInstrumentation::willPaintImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, GraphicsContext* context, const LayoutRect& rect)
+InspectorInstrumentationCookie InspectorInstrumentation::willPaintImpl(InstrumentingAgents* instrumentingAgents, GraphicsContext* context, const LayoutRect& rect)
{
if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
- pageAgent->willPaint(frame, context, rect);
+ pageAgent->willPaint(context, rect);
int timelineAgentId = 0;
if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent()) {
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (108337 => 108338)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-02-21 12:04:57 UTC (rev 108337)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-02-21 12:13:42 UTC (rev 108338)
@@ -271,7 +271,7 @@
static void didLayoutImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willLoadXHRImpl(InstrumentingAgents*, XMLHttpRequest*);
static void didLoadXHRImpl(const InspectorInstrumentationCookie&);
- static InspectorInstrumentationCookie willPaintImpl(InstrumentingAgents*, Frame*, GraphicsContext*, const LayoutRect&);
+ static InspectorInstrumentationCookie willPaintImpl(InstrumentingAgents*, GraphicsContext*, const LayoutRect&);
static void didPaintImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willRecalculateStyleImpl(InstrumentingAgents*);
static void didRecalculateStyleImpl(const InspectorInstrumentationCookie&);
@@ -728,7 +728,7 @@
#if ENABLE(INSPECTOR)
FAST_RETURN_IF_NO_FRONTENDS(InspectorInstrumentationCookie());
if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
- return willPaintImpl(instrumentingAgents, frame, context, rect);
+ return willPaintImpl(instrumentingAgents, context, rect);
#endif
return InspectorInstrumentationCookie();
}
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (108337 => 108338)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-02-21 12:04:57 UTC (rev 108337)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-02-21 12:13:42 UTC (rev 108338)
@@ -284,7 +284,6 @@
, m_frontend(0)
, m_lastScriptIdentifier(0)
, m_originalUseFixedLayout(false)
- , m_lastPaintFrame(0)
, m_lastPaintContext(0)
{
}
@@ -765,10 +764,9 @@
*height = heightOverride;
}
-void InspectorPageAgent::willPaint(Frame* frame, GraphicsContext* context, const LayoutRect& rect)
+void InspectorPageAgent::willPaint(GraphicsContext* context, const LayoutRect& rect)
{
if (m_state->getBoolean(PageAgentState::showPaintRects)) {
- m_lastPaintFrame = frame;
m_lastPaintContext = context;
m_lastPaintRect = rect;
m_lastPaintRect.inflate(-1);
@@ -777,7 +775,7 @@
void InspectorPageAgent::didPaint()
{
- if (!m_lastPaintFrame || !m_state->getBoolean(PageAgentState::showPaintRects))
+ if (!m_lastPaintContext || !m_state->getBoolean(PageAgentState::showPaintRects))
return;
static int colorSelector = 0;
@@ -787,9 +785,8 @@
Color(0, 0, 0xFF, 0x3F),
};
- DOMNodeHighlighter::drawOutline(*m_lastPaintContext, m_lastPaintFrame->view(), m_lastPaintRect, colors[colorSelector++ % WTF_ARRAY_LENGTH(colors)]);
+ DOMNodeHighlighter::drawOutline(*m_lastPaintContext, m_lastPaintRect, colors[colorSelector++ % WTF_ARRAY_LENGTH(colors)]);
- m_lastPaintFrame = 0;
m_lastPaintContext = 0;
}
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.h (108337 => 108338)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.h 2012-02-21 12:04:57 UTC (rev 108337)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.h 2012-02-21 12:13:42 UTC (rev 108338)
@@ -113,7 +113,7 @@
void loaderDetachedFromFrame(DocumentLoader*);
void applyScreenWidthOverride(long*);
void applyScreenHeightOverride(long*);
- void willPaint(Frame*, GraphicsContext*, const LayoutRect&);
+ void willPaint(GraphicsContext*, const LayoutRect&);
void didPaint();
// Inspector Controller API
@@ -150,7 +150,6 @@
HashMap<DocumentLoader*, String> m_loaderToIdentifier;
OwnPtr<IntSize> m_originalFixedLayoutSize;
bool m_originalUseFixedLayout;
- Frame* m_lastPaintFrame;
GraphicsContext* m_lastPaintContext;
LayoutRect m_lastPaintRect;
};
