Diff
Modified: trunk/ChangeLog (110705 => 110706)
--- trunk/ChangeLog 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/ChangeLog 2012-03-14 16:04:38 UTC (rev 110706)
@@ -1,3 +1,12 @@
+2012-03-14 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: add didCancelFrame timeline event
+ https://bugs.webkit.org/show_bug.cgi?id=80994
+
+ Reviewed by Pavel Feldman.
+
+ * Source/autotools/symbols.filter:
+
2012-03-14 Tor Arne Vestbø <[email protected]>
[Qt] Deal with multiple paths in QMAKE_EXTRA_MODULE_FORWARDS
Modified: trunk/LayoutTests/ChangeLog (110705 => 110706)
--- trunk/LayoutTests/ChangeLog 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/LayoutTests/ChangeLog 2012-03-14 16:04:38 UTC (rev 110706)
@@ -1,3 +1,15 @@
+2012-03-14 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: add didCancelFrame timeline event
+ https://bugs.webkit.org/show_bug.cgi?id=80994
+
+ Reviewed by Pavel Feldman.
+
+ - added test for didBeginFrame()/didCancelFrame()
+
+ * inspector/timeline/timeline-frames-expected.txt: Added.
+ * inspector/timeline/timeline-frames.html: Added.
+
2012-03-14 Sudarsana Nagineni <[email protected]>
[EFL] Implement LayoutTestController::clearBackForwardList
Added: trunk/LayoutTests/inspector/timeline/timeline-frames-expected.txt (0 => 110706)
--- trunk/LayoutTests/inspector/timeline/timeline-frames-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-frames-expected.txt 2012-03-14 16:04:38 UTC (rev 110706)
@@ -0,0 +1,7 @@
+Tests reporting and canceling of didBeginFrame events in Timeline
+
+BeginFrame
+TimeStamp : FRAME 1
+BeginFrame
+TimeStamp : FRAME 2
+
Added: trunk/LayoutTests/inspector/timeline/timeline-frames.html (0 => 110706)
--- trunk/LayoutTests/inspector/timeline/timeline-frames.html (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-frames.html 2012-03-14 16:04:38 UTC (rev 110706)
@@ -0,0 +1,55 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+
+function performActions()
+{
+ window.internals.emitInspectorDidBeginFrame();
+ console.timeStamp("FRAME 1");
+
+ window.internals.emitInspectorDidBeginFrame();
+ window.internals.emitInspectorDidCancelFrame();
+
+ window.internals.emitInspectorDidBeginFrame();
+ console.timeStamp("FRAME 2");
+ window.internals.emitInspectorDidCancelFrame();
+}
+
+function test()
+{
+ function formatRecord(record)
+ {
+ if (record.type === WebInspector.TimelineModel.RecordType.TimeStamp ||
+ record.type === WebInspector.TimelineModel.RecordType.BeginFrame) {
+ InspectorTest.dumpTimelineRecord(record);
+ }
+ }
+
+ InspectorTest.startTimeline(function() {
+ InspectorTest.evaluateInPage("performActions()", step2);
+ });
+
+ function step2()
+ {
+ InspectorTest.stopTimeline(finish);
+ }
+
+ function finish()
+ {
+ InspectorTest.printTimelineRecords(null, formatRecord);
+ InspectorTest.completeTest();
+ }
+}
+
+</script>
+</head>
+
+<body _onload_="runTest()">
+<p>
+Tests reporting and canceling of didBeginFrame events in Timeline
+</p>
+
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (110705 => 110706)
--- trunk/Source/WebCore/ChangeLog 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/ChangeLog 2012-03-14 16:04:38 UTC (rev 110706)
@@ -1,3 +1,44 @@
+2012-03-14 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: add didCancelFrame timeline event
+ https://bugs.webkit.org/show_bug.cgi?id=80994
+
+ Reviewed by Pavel Feldman.
+
+ - add an ability to cancel certain timeline events, unless they've been followed by other events.
+ - implement didCancelFrame() event, fired when a platform decides not to render frame after didBeginFrame() was called.
+
+ Test: inspector/timeline/timeline-frames.html
+
+ * WebCore.exp.in:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didCancelFrameImpl):
+ (WebCore):
+ * inspector/InspectorInstrumentation.h:
+ (InspectorInstrumentation):
+ (WebCore::InspectorInstrumentation::didCancelFrame):
+ (WebCore):
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didBeginFrame):
+ (WebCore):
+ (WebCore::InspectorTimelineAgent::didCancelFrame):
+ (WebCore::InspectorTimelineAgent::appendRecord):
+ (WebCore::InspectorTimelineAgent::pushCurrentRecord):
+ (WebCore::InspectorTimelineAgent::pushCancelableRecord):
+ (WebCore::InspectorTimelineAgent::commitCancelableRecords):
+ (WebCore::InspectorTimelineAgent::cancelRecord):
+ * inspector/InspectorTimelineAgent.h:
+ (InspectorTimelineAgent):
+ (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
+ (TimelineRecordEntry):
+ * testing/Internals.cpp:
+ (WebCore::Internals::emitInspectorDidBeginFrame):
+ (WebCore):
+ (WebCore::Internals::emitInspectorDidCancelFrame):
+ * testing/Internals.h:
+ (Internals):
+ * testing/Internals.idl:
+
2012-03-14 Dana Jansens <[email protected]>
Region can acquire an empty span by subtracting an empty Region
Modified: trunk/Source/WebCore/WebCore.exp.in (110705 => 110706)
--- trunk/Source/WebCore/WebCore.exp.in 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-03-14 16:04:38 UTC (rev 110706)
@@ -1775,6 +1775,10 @@
__ZN7WebCore28InspectorFrontendClientLocalC2EPNS_19InspectorControllerEPNS_4PageEN3WTF10PassOwnPtrINS0_8SettingsEEE
__ZN7WebCore28InspectorFrontendClientLocalD2Ev
__ZNK7WebCore19InspectorController13drawHighlightERNS_15GraphicsContextE
+__ZN7WebCore24InspectorInstrumentation26instrumentingAgentsForPageEPNS_4PageE
+__ZN7WebCore24InspectorInstrumentation17s_frontendCounterE
+__ZN7WebCore24InspectorInstrumentation17didBeginFrameImplEPNS_19InstrumentingAgentsE
+__ZN7WebCore24InspectorInstrumentation18didCancelFrameImplEPNS_19InstrumentingAgentsE
#endif
#if ENABLE(JAVA_BRIDGE)
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (110705 => 110706)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2012-03-14 16:04:38 UTC (rev 110706)
@@ -388,6 +388,12 @@
timelineAgent->didBeginFrame();
}
+void InspectorInstrumentation::didCancelFrameImpl(InstrumentingAgents* instrumentingAgents)
+{
+ if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent())
+ timelineAgent->didCancelFrame();
+}
+
InspectorInstrumentationCookie InspectorInstrumentation::willLayoutImpl(InstrumentingAgents* instrumentingAgents)
{
int timelineAgentId = 0;
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (110705 => 110706)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2012-03-14 16:04:38 UTC (rev 110706)
@@ -121,6 +121,7 @@
static InspectorInstrumentationCookie willFireTimer(ScriptExecutionContext*, int timerId);
static void didFireTimer(const InspectorInstrumentationCookie&);
static void didBeginFrame(Page*);
+ static void didCancelFrame(Page*);
static InspectorInstrumentationCookie willLayout(Frame*);
static void didLayout(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willLoadXHR(ScriptExecutionContext*, XMLHttpRequest*);
@@ -274,6 +275,7 @@
static InspectorInstrumentationCookie willFireTimerImpl(InstrumentingAgents*, int timerId);
static void didFireTimerImpl(const InspectorInstrumentationCookie&);
static void didBeginFrameImpl(InstrumentingAgents*);
+ static void didCancelFrameImpl(InstrumentingAgents*);
static InspectorInstrumentationCookie willLayoutImpl(InstrumentingAgents*);
static void didLayoutImpl(const InspectorInstrumentationCookie&);
static InspectorInstrumentationCookie willLoadXHRImpl(InstrumentingAgents*, XMLHttpRequest*);
@@ -721,6 +723,15 @@
#endif
}
+inline void InspectorInstrumentation::didCancelFrame(Page* page)
+{
+#if ENABLE(INSPECTOR)
+ FAST_RETURN_IF_NO_FRONTENDS(void());
+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
+ didCancelFrameImpl(instrumentingAgents);
+#endif
+}
+
inline InspectorInstrumentationCookie InspectorInstrumentation::willLayout(Frame* frame)
{
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (110705 => 110706)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2012-03-14 16:04:38 UTC (rev 110706)
@@ -174,9 +174,14 @@
void InspectorTimelineAgent::didBeginFrame()
{
- appendRecord(InspectorObject::create(), TimelineRecordType::BeginFrame, true);
+ pushCancelableRecord(InspectorObject::create(), TimelineRecordType::BeginFrame);
}
+void InspectorTimelineAgent::didCancelFrame()
+{
+ cancelRecord(TimelineRecordType::BeginFrame);
+}
+
void InspectorTimelineAgent::willCallFunction(const String& scriptName, int scriptLine)
{
pushCurrentRecord(TimelineRecordFactory::createFunctionCallData(scriptName, scriptLine), TimelineRecordType::FunctionCall, true);
@@ -433,6 +438,7 @@
void InspectorTimelineAgent::appendRecord(PassRefPtr<InspectorObject> data, const String& type, bool captureCallStack)
{
pushGCEventRecords();
+ commitCancelableRecords();
RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
record->setObject("data", data);
record->setString("type", type);
@@ -442,10 +448,38 @@
void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<InspectorObject> data, const String& type, bool captureCallStack)
{
pushGCEventRecords();
+ commitCancelableRecords();
RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type));
}
+void InspectorTimelineAgent::pushCancelableRecord(PassRefPtr<InspectorObject> data, const String& type)
+{
+ RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), 0);
+ m_recordStack.append(TimelineRecordEntry(record.release(), data, 0, type, true));
+}
+
+void InspectorTimelineAgent::commitCancelableRecords()
+{
+ while (!m_recordStack.isEmpty()) {
+ TimelineRecordEntry entry = m_recordStack.last();
+ if (!m_recordStack.last().cancelable)
+ break;
+ m_recordStack.removeLast();
+ entry.record->setObject("data", entry.data);
+ addRecordToTimeline(entry.record, entry.type);
+ }
+}
+
+void InspectorTimelineAgent::cancelRecord(const String& type)
+{
+ if (m_recordStack.isEmpty())
+ return;
+ TimelineRecordEntry entry = m_recordStack.last();
+ if (entry.cancelable && entry.type == type)
+ m_recordStack.removeLast();
+}
+
void InspectorTimelineAgent::clearRecordStack()
{
m_recordStack.clear();
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (110705 => 110706)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2012-03-14 16:04:38 UTC (rev 110706)
@@ -84,6 +84,7 @@
void didDispatchEvent();
void didBeginFrame();
+ void didCancelFrame();
void willLayout();
void didLayout();
@@ -133,14 +134,15 @@
private:
struct TimelineRecordEntry {
- TimelineRecordEntry(PassRefPtr<InspectorObject> record, PassRefPtr<InspectorObject> data, PassRefPtr<InspectorArray> children, const String& type)
- : record(record), data(data), children(children), type(type)
+ TimelineRecordEntry(PassRefPtr<InspectorObject> record, PassRefPtr<InspectorObject> data, PassRefPtr<InspectorArray> children, const String& type, bool cancelable = false)
+ : record(record), data(data), children(children), type(type), cancelable(cancelable)
{
}
RefPtr<InspectorObject> record;
RefPtr<InspectorObject> data;
RefPtr<InspectorArray> children;
String type;
+ bool cancelable;
};
InspectorTimelineAgent(InstrumentingAgents*, InspectorState*, InspectorType);
@@ -150,7 +152,9 @@
void didCompleteCurrentRecord(const String& type);
void appendRecord(PassRefPtr<InspectorObject> data, const String& type, bool captureCallStack);
-
+ void pushCancelableRecord(PassRefPtr<InspectorObject>, const String& type);
+ void commitCancelableRecords();
+ void cancelRecord(const String& type);
void addRecordToTimeline(PassRefPtr<InspectorObject>, const String& type);
void pushGCEventRecords();
Modified: trunk/Source/WebCore/testing/Internals.cpp (110705 => 110706)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-03-14 16:04:38 UTC (rev 110706)
@@ -42,6 +42,7 @@
#include "HTMLNames.h"
#include "HTMLTextAreaElement.h"
#include "InspectorController.h"
+#include "InspectorInstrumentation.h"
#include "InternalSettings.h"
#include "IntRect.h"
#include "Language.h"
@@ -703,4 +704,14 @@
return document->nodesFromRect(x, y, topPadding, rightPadding, bottomPadding, leftPadding, ignoreClipping);
}
+void Internals::emitInspectorDidBeginFrame()
+{
+ InspectorInstrumentation::didBeginFrame(frame()->page());
}
+
+void Internals::emitInspectorDidCancelFrame()
+{
+ InspectorInstrumentation::didCancelFrame(frame()->page());
+}
+
+}
Modified: trunk/Source/WebCore/testing/Internals.h (110705 => 110706)
--- trunk/Source/WebCore/testing/Internals.h 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/testing/Internals.h 2012-03-14 16:04:38 UTC (rev 110706)
@@ -129,6 +129,9 @@
PassRefPtr<NodeList> nodesFromRect(Document*, int x, int y, unsigned topPadding, unsigned rightPadding,
unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, ExceptionCode&) const;
+ void emitInspectorDidBeginFrame();
+ void emitInspectorDidCancelFrame();
+
static const char* internalsId;
InternalSettings* settings() const { return m_settings.get(); }
Modified: trunk/Source/WebCore/testing/Internals.idl (110705 => 110706)
--- trunk/Source/WebCore/testing/Internals.idl 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebCore/testing/Internals.idl 2012-03-14 16:04:38 UTC (rev 110706)
@@ -96,6 +96,7 @@
void setShouldDisplayTrackKind(in Document document, in DOMString kind, in boolean enabled) raises (DOMException);
boolean shouldDisplayTrackKind(in Document document, in DOMString trackKind) raises (DOMException);
#endif
+
attribute [Custom] Array userPreferredLanguages;
unsigned long wheelEventHandlerCount(in Document document) raises (DOMException);
@@ -105,6 +106,9 @@
in unsigned long topPadding, in unsigned long rightPadding, in unsigned long bottomPadding, in unsigned long leftPadding,
in boolean ignoreClipping) raises (DOMException);
+ void emitInspectorDidBeginFrame();
+ void emitInspectorDidCancelFrame();
+
readonly attribute InternalSettings settings;
};
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (110705 => 110706)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-14 16:04:38 UTC (rev 110706)
@@ -1,3 +1,22 @@
+2012-03-14 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: add didCancelFrame timeline event
+ https://bugs.webkit.org/show_bug.cgi?id=80994
+
+ Reviewed by Pavel Feldman.
+
+ - add intrumentCanceFrame(), called when renderer decides not to
+ render frame after instrumentBeginFrame() was called.
+
+ * public/WebWidget.h:
+ (WebWidget):
+ (WebKit::WebWidget::instrumentCancelFrame):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::instrumentCancelFrame):
+ (WebKit):
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
2012-03-14 Dana Jansens <[email protected]>
Region can acquire an empty span by subtracting an empty Region
Modified: trunk/Source/WebKit/chromium/public/WebWidget.h (110705 => 110706)
--- trunk/Source/WebKit/chromium/public/WebWidget.h 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebKit/chromium/public/WebWidget.h 2012-03-14 16:04:38 UTC (rev 110706)
@@ -195,6 +195,9 @@
// Instrumentation method that marks beginning of frame update that includes
// things like animate()/layout()/paint()/composite().
virtual void instrumentBeginFrame() { }
+ // Cancels the effect of instrumentBeginFrame() in case there were no events
+ // following the call to instrumentBeginFrame().
+ virtual void instrumentCancelFrame() { }
protected:
~WebWidget() { }
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (110705 => 110706)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-03-14 16:04:38 UTC (rev 110706)
@@ -1250,6 +1250,11 @@
InspectorInstrumentation::didBeginFrame(m_page.get());
}
+void WebViewImpl::instrumentCancelFrame()
+{
+ InspectorInstrumentation::didCancelFrame(m_page.get());
+}
+
void WebViewImpl::animate(double frameBeginTime)
{
#if ENABLE(REQUEST_ANIMATION_FRAME)
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (110705 => 110706)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-03-14 16:04:38 UTC (rev 110706)
@@ -140,6 +140,7 @@
virtual void didLosePointerLock();
virtual void didChangeWindowResizerRect();
virtual void instrumentBeginFrame();
+ virtual void instrumentCancelFrame();
// WebView methods:
virtual void initializeMainFrame(WebFrameClient*);
Modified: trunk/Source/WebKit2/ChangeLog (110705 => 110706)
--- trunk/Source/WebKit2/ChangeLog 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-14 16:04:38 UTC (rev 110706)
@@ -1,3 +1,13 @@
+2012-03-14 Andrey Kosyakov <[email protected]>
+
+ Web Inspector: add didCancelFrame timeline event
+ https://bugs.webkit.org/show_bug.cgi?id=80994
+
+ Reviewed by Pavel Feldman.
+
+ * win/WebKit2.def:
+ * win/WebKit2CFLite.def:
+
2012-03-13 Anders Carlsson <[email protected]>
Find bouncy doesn’t hide when a subframe is scrolled
Modified: trunk/Source/WebKit2/win/WebKit2.def (110705 => 110706)
--- trunk/Source/WebKit2/win/WebKit2.def 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebKit2/win/WebKit2.def 2012-03-14 16:04:38 UTC (rev 110706)
@@ -119,6 +119,8 @@
?createThread@WTF@@YAIP6AXPAX@Z0PBD@Z
?currentThread@WTF@@YAIXZ
?detachThread@WTF@@YAXI@Z
+ ?didBeginFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
+ ?didCancelFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
?initializeMainThread@WTF@@YAXXZ
?initializeThreading@WTF@@YAXXZ
?isMainThread@WTF@@YA_NXZ
@@ -170,6 +172,7 @@
?getHighlight@InspectorController@WebCore@@QBEXPAUHighlight@2@@Z
?getLocationAndLengthFromRange@TextIterator@WebCore@@SA_NPAVElement@2@PBVRange@2@AAI2@Z
?hasShadowRoot@Element@WebCore@@QBE_NXZ
+ ?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@CAPAVInstrumentingAgents@2@PAVPage@2@@Z
?isPreloaded@CachedResourceLoader@WebCore@@QBE_NABVString@WTF@@@Z
?jsStringSlowCase@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@AAV?$HashMap@PAVStringImpl@WTF@@V?$Weak@VJSString@JSC@@@JSC@@UStringHash@2@U?$HashTraits@PAVStringImpl@WTF@@@2@U?$HashTraits@V?$Weak@VJSString@JSC@@@JSC@@@2@@WTF@@PAVStringImpl@6@@Z
?lastChangeWasUserEdit@HTMLTextFormControlElement@WebCore@@QBE_NXZ
@@ -181,6 +184,7 @@
?paintControlTints@FrameView@WebCore@@AAEXXZ
?rangeFromLocationAndLength@TextIterator@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@PAVElement@2@HH_N@Z
?removeAllShadowRoots@ShadowTree@WebCore@@QAEXXZ
+ ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
Modified: trunk/Source/WebKit2/win/WebKit2CFLite.def (110705 => 110706)
--- trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/WebKit2/win/WebKit2CFLite.def 2012-03-14 16:04:38 UTC (rev 110706)
@@ -153,6 +153,8 @@
?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@V?$PassRefPtr@VDocument@WebCore@@@4@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
?create@ShadowRoot@WebCore@@SA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@PAVElement@2@AAH@Z
?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z
+ ?didBeginFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
+ ?didCancelFrameImpl@InspectorInstrumentation@WebCore@@CAXPAVInstrumentingAgents@2@@Z
?equal@WTF@@YA_NPBVStringImpl@1@PBE@Z
?equalIgnoringCase@WTF@@YA_NPAVStringImpl@1@PBE@Z
?externalRepresentation@WebCore@@YA?AVString@WTF@@PAVElement@1@I@Z
@@ -163,6 +165,7 @@
?getHighlight@InspectorController@WebCore@@QBEXPAUHighlight@2@@Z
?getLocationAndLengthFromRange@TextIterator@WebCore@@SA_NPAVElement@2@PBVRange@2@AAI2@Z
?hasShadowRoot@Element@WebCore@@QBE_NXZ
+ ?instrumentingAgentsForPage@InspectorInstrumentation@WebCore@@CAPAVInstrumentingAgents@2@PAVPage@2@@Z
?isPreloaded@CachedResourceLoader@WebCore@@QBE_NABVString@WTF@@@Z
?jsStringSlowCase@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@AAV?$HashMap@PAVStringImpl@WTF@@V?$Weak@VJSString@JSC@@@JSC@@UStringHash@2@U?$HashTraits@PAVStringImpl@WTF@@@2@U?$HashTraits@V?$Weak@VJSString@JSC@@@JSC@@@2@@WTF@@PAVStringImpl@6@@Z
?lastChangeWasUserEdit@HTMLTextFormControlElement@WebCore@@QBE_NXZ
@@ -174,6 +177,7 @@
?paintControlTints@FrameView@WebCore@@AAEXXZ
?rangeFromLocationAndLength@TextIterator@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@PAVElement@2@HH_N@Z
?removeShadowRootList@Element@WebCore@@QAEXXZ
+ ?s_frontendCounter@InspectorInstrumentation@WebCore@@0HA
?s_info@JSNode@WebCore@@2UClassInfo@JSC@@B
?scriptExecutionContext@JSDOMGlobalObject@WebCore@@QBEPAVScriptExecutionContext@2@XZ
?scrollElementToRect@FrameView@WebCore@@QAEXPAVElement@2@ABVIntRect@2@@Z
Modified: trunk/Source/autotools/symbols.filter (110705 => 110706)
--- trunk/Source/autotools/symbols.filter 2012-03-14 15:42:51 UTC (rev 110705)
+++ trunk/Source/autotools/symbols.filter 2012-03-14 16:04:38 UTC (rev 110706)
@@ -94,6 +94,10 @@
_ZNK7WebCore9TreeScope14getElementByIdERKN3WTF12AtomicStringE;
_ZNK7WebCore14DocumentMarker11descriptionEv;
_ZNK7WebCore19InspectorController12getHighlightEPNS_9HighlightE;
+_ZN7WebCore24InspectorInstrumentation26instrumentingAgentsForPageEPNS_4PageE;
+_ZN7WebCore24InspectorInstrumentation17s_frontendCounterE;
+_ZN7WebCore24InspectorInstrumentation17didBeginFrameImplEPNS_19InstrumentingAgentsE;
+_ZN7WebCore24InspectorInstrumentation18didCancelFrameImplEPNS_19InstrumentingAgentsE;
_ZN7WebCore14ScrollableArea28setScrollOffsetFromInternalsERKNS_8IntPointE;
_ZN7WebCore10ScrollView23setScrollbarsSuppressedEbb;
_ZN7WebCore8Settings24setMockScrollbarsEnabledEb;
