Changeset 155217 in webkit
- Timestamp:
- Sep 6, 2013 3:08:14 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 added
- 1 deleted
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r155215 r155217 1 2013-09-06 Andreas Kling <akling@apple.com> 2 3 Include Frame.h in fewer places. 4 <https://webkit.org/b/120868> 5 6 Reviewed by Anders Carlsson. 7 8 - Move JSMainThreadExecState::instrumentFunctionCall() to a separate header. 9 This avoids including InspectorInstrumentation.h from JSMainThreadExecState.h 10 which caused all JS and Objective-C bindings to depend on Frame.h 11 12 - Out-of-line the three methods on FrameView that were operating on Frames. 13 Most of the call sites were in FrameView.cpp so they will still get inlined. 14 15 - Removed GenericBinding.h, nothing was using it anyway. 16 17 After this, touching Frame.h and doing a (debug) rebuild goes from 9m30 to 3m30 18 on my laptop. 19 20 * GNUmakefile.list.am: 21 * WebCore.exp.in: 22 * WebCore.vcxproj/WebCore.vcxproj: 23 * WebCore.vcxproj/WebCore.vcxproj.filters: 24 * WebCore.xcodeproj/project.pbxproj: 25 * bindings/generic/GenericBinding.h: Removed. 26 * bindings/js/JSCallbackData.cpp: 27 * bindings/js/JSEventListener.cpp: 28 * bindings/js/JSMainThreadExecState.h: 29 * bindings/js/JSMainThreadExecStateInstrumentation.h: Added. 30 (WebCore::JSMainThreadExecState::instrumentFunctionCall): 31 * bindings/js/JSMutationCallback.cpp: 32 * bindings/js/ScheduledAction.cpp: 33 * css/DeprecatedStyleBuilder.cpp: 34 * css/ElementRuleCollector.cpp: 35 * css/MediaQueryEvaluator.cpp: 36 * css/SelectorChecker.h: 37 * dom/StyledElement.cpp: 38 * html/HTMLPlugInImageElement.cpp: 39 * inspector/InspectorPageAgent.h: 40 * inspector/NetworkResourcesData.h: 41 * inspector/PageRuntimeAgent.cpp: 42 * loader/cache/CachedImage.cpp: 43 * page/FrameView.cpp: 44 (WebCore::FrameView::renderView): 45 (WebCore::FrameView::mapFromLayoutToCSSUnits): 46 (WebCore::FrameView::mapFromCSSToLayoutUnits): 47 * page/FrameView.h: 48 * page/TouchAdjustment.cpp: 49 * rendering/RenderBoxModelObject.cpp: 50 * rendering/RenderLayer.cpp: 51 * rendering/RenderLayerCompositor.h: 52 * rendering/RenderText.cpp: 53 * svg/graphics/SVGImage.cpp: 54 1 55 2013-09-06 Brent Fulgham <bfulgham@apple.com> 2 56 -
trunk/Source/WebCore/GNUmakefile.list.am
r155211 r155217 2280 2280 Source/WebCore/bindings/generic/BindingSecurity.cpp \ 2281 2281 Source/WebCore/bindings/generic/BindingSecurity.h \ 2282 Source/WebCore/bindings/generic/GenericBinding.h \2283 2282 Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp \ 2284 2283 Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h \ -
trunk/Source/WebCore/WebCore.exp.in
r155174 r155217 1672 1672 __ZNK7WebCore9FrameTree4findERKN3WTF12AtomicStringE 1673 1673 __ZNK7WebCore9FrameTree6parentEv 1674 __ZNK7WebCore9FrameView10renderViewEv 1674 1675 __ZNK7WebCore9FrameView11needsLayoutEv 1675 1676 __ZNK7WebCore9FrameView13isTransparentEv -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r155215 r155217 20718 20718 <ClInclude Include="..\bindings\generic\ActiveDOMCallback.h" /> 20719 20719 <ClInclude Include="..\bindings\generic\BindingSecurity.h" /> 20720 <ClInclude Include="..\bindings\generic\GenericBinding.h" />20721 20720 <ClInclude Include="..\bindings\generic\RuntimeEnabledFeatures.h" /> 20722 20721 <ClInclude Include="..\bindings\js\ArrayValue.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r155215 r155217 11563 11563 <Filter>bindings\generic</Filter> 11564 11564 </ClInclude> 11565 <ClInclude Include="..\bindings\generic\GenericBinding.h">11566 <Filter>bindings\generic</Filter>11567 </ClInclude>11568 11565 <ClInclude Include="..\bindings\generic\RuntimeEnabledFeatures.h"> 11569 11566 <Filter>bindings\generic</Filter> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r155211 r155217 3495 3495 A6148A7812E41E3B0044A784 /* JSHTMLKeygenElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6148A7612E41E3B0044A784 /* JSHTMLKeygenElement.cpp */; }; 3496 3496 A6148A7912E41E3B0044A784 /* JSHTMLKeygenElement.h in Headers */ = {isa = PBXBuildFile; fileRef = A6148A7712E41E3B0044A784 /* JSHTMLKeygenElement.h */; }; 3497 A622A8FF122C44A600A785B3 /* GenericBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = A622A8F9122C44A600A785B3 /* GenericBinding.h */; };3498 3497 A6D169621346B49B000EB770 /* ShadowRoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A6D169611346B49B000EB770 /* ShadowRoot.cpp */; }; 3499 3498 A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */ = {isa = PBXBuildFile; fileRef = A6D169631346B4C1000EB770 /* ShadowRoot.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 10096 10095 A6148A7712E41E3B0044A784 /* JSHTMLKeygenElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSHTMLKeygenElement.h; sourceTree = "<group>"; }; 10097 10096 A6148A7F12E41ED10044A784 /* HTMLKeygenElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLKeygenElement.idl; sourceTree = "<group>"; }; 10098 A622A8F9122C44A600A785B3 /* GenericBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GenericBinding.h; path = generic/GenericBinding.h; sourceTree = "<group>"; };10099 10097 A6D169611346B49B000EB770 /* ShadowRoot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShadowRoot.cpp; sourceTree = "<group>"; }; 10100 10098 A6D169631346B4C1000EB770 /* ShadowRoot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShadowRoot.h; sourceTree = "<group>"; }; … … 11449 11447 B562DB5E17D3CD560010AF96 /* HTMLElementTypeHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HTMLElementTypeHelpers.h; sourceTree = "<group>"; }; 11450 11448 B562DB5F17D3CD560010AF96 /* SVGElementTypeHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SVGElementTypeHelpers.h; sourceTree = "<group>"; }; 11449 B56576E417DA599F00A56BDC /* JSMainThreadExecStateInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecStateInstrumentation.h; sourceTree = "<group>"; }; 11451 11450 B58CEB6711913607002A6790 /* JSDatabaseSync.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabaseSync.h; sourceTree = "<group>"; }; 11452 11451 B58CEB6811913607002A6790 /* JSDatabaseSync.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabaseSync.cpp; sourceTree = "<group>"; }; … … 19054 19053 973AA3F715D0891B00E38A85 /* BindingSecurity.cpp */, 19055 19054 973AA3F815D0891B00E38A85 /* BindingSecurity.h */, 19056 A622A8F9122C44A600A785B3 /* GenericBinding.h */,19057 19055 ); 19058 19056 name = generic; … … 19139 19137 8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */, 19140 19138 8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */, 19139 B56576E417DA599F00A56BDC /* JSMainThreadExecStateInstrumentation.h */, 19141 19140 C6F420A016B7164E0052A9F2 /* JSMutationCallback.cpp */, 19142 19141 C6F420A116B7164E0052A9F2 /* JSMutationCallback.h */, … … 22369 22368 BC23F0DB0DAFF4A4009FDC91 /* GeneratedImage.h in Headers */, 22370 22369 2D481F04146B5C6B00AA7834 /* GeneratorGeneratedImage.h in Headers */, 22371 A622A8FF122C44A600A785B3 /* GenericBinding.h in Headers */,22372 22370 0720B0A114D3323500642955 /* GenericEventQueue.h in Headers */, 22373 22371 9746AF2414F4DDE6003E7A70 /* Geolocation.h in Headers */, -
trunk/Source/WebCore/bindings/js/JSCallbackData.cpp
r153872 r155217 33 33 #include "JSDOMBinding.h" 34 34 #include "JSMainThreadExecState.h" 35 #include "JSMainThreadExecStateInstrumentation.h" 35 36 36 37 using namespace JSC; -
trunk/Source/WebCore/bindings/js/JSEventListener.cpp
r154962 r155217 27 27 #include "JSEventTarget.h" 28 28 #include "JSMainThreadExecState.h" 29 #include "JSMainThreadExecStateInstrumentation.h" 29 30 #include "ScriptController.h" 30 31 #include "WorkerGlobalScope.h" -
trunk/Source/WebCore/bindings/js/JSMainThreadExecState.h
r154629 r155217 27 27 #define JSMainThreadExecState_h 28 28 29 #include "InspectorInstrumentation.h"30 29 #include "JSDOMBinding.h" 31 30 #include <runtime/Completion.h> … … 37 36 namespace WebCore { 38 37 38 class InspectorInstrumentationCookie; 39 39 class ScriptExecutionContext; 40 40 … … 54 54 }; 55 55 56 static inline InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext* context, JSC::CallType callType, const JSC::CallData& callData) 57 { 58 if (!InspectorInstrumentation::timelineAgentEnabled(context)) 59 return InspectorInstrumentationCookie(); 60 String resourceName; 61 int lineNumber = 1; 62 if (callType == JSC::CallTypeJS) { 63 resourceName = callData.js.functionExecutable->sourceURL(); 64 lineNumber = callData.js.functionExecutable->lineNo(); 65 } else 66 resourceName = "undefined"; 67 return InspectorInstrumentation::willCallFunction(context, resourceName, lineNumber); 68 } 56 static InspectorInstrumentationCookie instrumentFunctionCall(ScriptExecutionContext*, JSC::CallType, const JSC::CallData&); 69 57 70 58 static JSC::JSValue evaluate(JSC::ExecState* exec, const JSC::SourceCode& source, JSC::JSValue thisValue, JSC::JSValue* exception) -
trunk/Source/WebCore/bindings/js/JSMutationCallback.cpp
r148696 r155217 30 30 #include "JSDOMGlobalObject.h" 31 31 #include "JSMainThreadExecState.h" 32 #include "JSMainThreadExecStateInstrumentation.h" 32 33 #include "JSMutationObserver.h" 33 34 #include "JSMutationRecord.h" -
trunk/Source/WebCore/bindings/js/ScheduledAction.cpp
r154192 r155217 33 33 #include "JSDOMWindow.h" 34 34 #include "JSMainThreadExecState.h" 35 #include "JSMainThreadExecStateInstrumentation.h" 35 36 #include "ScriptController.h" 36 37 #include "ScriptExecutionContext.h" -
trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp
r155119 r155217 39 39 #include "Document.h" 40 40 #include "Element.h" 41 #include "Frame.h" 41 42 #include "Pair.h" 42 43 #include "Rect.h" -
trunk/Source/WebCore/css/ElementRuleCollector.cpp
r155109 r155217 37 37 #include "CSSValueKeywords.h" 38 38 #include "HTMLElement.h" 39 #include "InspectorInstrumentation.h" 39 40 #include "RenderRegion.h" 40 41 #include "SVGElement.h" -
trunk/Source/WebCore/css/MediaQueryEvaluator.cpp
r154658 r155217 40 40 #include "Frame.h" 41 41 #include "FrameView.h" 42 #include "InspectorInstrumentation.h" 42 43 #include "IntRect.h" 43 44 #include "MediaFeatureNames.h" -
trunk/Source/WebCore/css/SelectorChecker.h
r154887 r155217 30 30 31 31 #include "CSSSelector.h" 32 #include " InspectorInstrumentation.h"32 #include "Element.h" 33 33 #include "SpaceSplitString.h" 34 34 #include <wtf/HashSet.h> -
trunk/Source/WebCore/dom/StyledElement.cpp
r154877 r155217 38 38 #include "HTMLNames.h" 39 39 #include "HTMLParserIdioms.h" 40 #include "InspectorInstrumentation.h" 40 41 #include "PropertySetCSSStyleDeclaration.h" 41 42 #include "ScriptableDocumentParser.h" -
trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp
r155194 r155217 38 38 #include "NodeList.h" 39 39 #include "NodeRenderStyle.h" 40 #include "Page.h" 40 41 #include "PlugInClient.h" 41 42 #include "PluginViewBase.h" -
trunk/Source/WebCore/inspector/InspectorPageAgent.h
r154828 r155217 35 35 36 36 #include "DeviceOrientationData.h" 37 #include "Frame.h"38 37 #include "GeolocationPosition.h" 39 38 #include "InspectorBaseAgent.h" 40 39 #include "InspectorFrontend.h" 40 #include "IntSize.h" 41 #include "LayoutRect.h" 41 42 #include <wtf/HashMap.h> 42 43 #include <wtf/RefCounted.h> -
trunk/Source/WebCore/inspector/NetworkResourcesData.h
r148921 r155217 32 32 #include "HTTPHeaderMap.h" 33 33 #include "InspectorPageAgent.h" 34 #include "KURL.h" 34 35 #include "TextResourceDecoder.h" 35 36 #include <wtf/Deque.h> … … 45 46 class CachedResource; 46 47 class FormData; 48 class ResourceResponse; 47 49 class SharedBuffer; 48 50 class TextResourceDecoder; -
trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp
r154658 r155217 36 36 37 37 #include "Document.h" 38 #include "Frame.h" 38 39 #include "InjectedScript.h" 39 40 #include "InjectedScriptManager.h" -
trunk/Source/WebCore/loader/cache/CachedImage.cpp
r154858 r155217 30 30 #include "CachedResourceClientWalker.h" 31 31 #include "CachedResourceLoader.h" 32 #include "Frame.h" 33 #include "FrameLoader.h" 32 34 #include "FrameLoaderClient.h" 33 35 #include "FrameLoaderTypes.h" -
trunk/Source/WebCore/page/FrameView.cpp
r155174 r155217 4228 4228 } 4229 4229 4230 RenderView* FrameView::renderView() const 4231 { 4232 return frame().contentRenderer(); 4233 } 4234 4235 int FrameView::mapFromLayoutToCSSUnits(LayoutUnit value) const 4236 { 4237 return value / (frame().pageZoomFactor() * frame().frameScaleFactor()); 4238 } 4239 4240 LayoutUnit FrameView::mapFromCSSToLayoutUnits(int value) const 4241 { 4242 return value * frame().pageZoomFactor() * frame().frameScaleFactor(); 4243 } 4244 4230 4245 } // namespace WebCore -
trunk/Source/WebCore/page/FrameView.h
r155174 r155217 28 28 #include "AdjustViewSizeOrNot.h" 29 29 #include "Color.h" 30 #include " Frame.h"30 #include "LayoutMilestones.h" 31 31 #include "LayoutRect.h" 32 32 #include "Pagination.h" … … 43 43 class Event; 44 44 class FloatSize; 45 class Frame; 45 46 class FrameActionScheduler; 47 class HTMLFrameOwnerElement; 46 48 class KURL; 47 49 class Node; … … 53 55 class RenderScrollbarPart; 54 56 class RenderStyle; 57 class RenderView; 55 58 56 59 Pagination::Mode paginationModeForRenderStyle(RenderStyle*); … … 79 82 Frame& frame() const { return *m_frame; } 80 83 81 RenderView* renderView() const { return frame().contentRenderer(); }82 83 int mapFromLayoutToCSSUnits(LayoutUnit) ;84 LayoutUnit mapFromCSSToLayoutUnits(int) ;84 RenderView* renderView() const; 85 86 int mapFromLayoutToCSSUnits(LayoutUnit) const; 87 LayoutUnit mapFromCSSToLayoutUnits(int) const; 85 88 86 89 LayoutUnit marginWidth() const { return m_margins.width(); } // -1 means default … … 698 701 } 699 702 700 inline int FrameView::mapFromLayoutToCSSUnits(LayoutUnit value)701 {702 return value / (frame().pageZoomFactor() * frame().frameScaleFactor());703 }704 705 inline LayoutUnit FrameView::mapFromCSSToLayoutUnits(int value)706 {707 return value * frame().pageZoomFactor() * frame().frameScaleFactor();708 }709 710 703 inline FrameView* toFrameView(Widget* widget) 711 704 { -
trunk/Source/WebCore/page/TouchAdjustment.cpp
r155074 r155217 26 26 #include "FloatPoint.h" 27 27 #include "FloatQuad.h" 28 #include "Frame.h" 28 29 #include "FrameView.h" 29 30 #include "HTMLFrameOwnerElement.h" -
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
r155077 r155217 27 27 #include "RenderBoxModelObject.h" 28 28 29 #include "Frame.h" 29 30 #include "GraphicsContext.h" 30 31 #include "HTMLFrameOwnerElement.h" -
trunk/Source/WebCore/rendering/RenderLayer.cpp
r155131 r155217 73 73 #include "HitTestRequest.h" 74 74 #include "HitTestResult.h" 75 #include "InspectorInstrumentation.h" 75 76 #include "OverflowEvent.h" 76 77 #include "OverlapTestRequestClient.h" -
trunk/Source/WebCore/rendering/RenderLayerCompositor.h
r154937 r155217 30 30 31 31 #include "ChromeClient.h" 32 #include "Frame.h"33 32 #include "GraphicsLayerClient.h" 34 33 #include "GraphicsLayerUpdater.h" … … 49 48 #endif 50 49 class TiledBacking; 50 51 typedef unsigned LayerTreeFlags; 51 52 52 53 enum CompositingUpdateType { -
trunk/Source/WebCore/rendering/RenderText.cpp
r154937 r155217 30 30 #include "FloatQuad.h" 31 31 #include "FontTranscoder.h" 32 #include "Frame.h" 32 33 #include "FrameView.h" 33 34 #include "Hyphenation.h" -
trunk/Source/WebCore/svg/graphics/SVGImage.cpp
r155174 r155217 34 34 #include "DocumentLoader.h" 35 35 #include "ElementIterator.h" 36 #include "Frame.h" 36 37 #include "FrameView.h" 37 38 #include "ImageBuffer.h" -
trunk/Source/WebKit/efl/ewk/ewk_paint_context.cpp
r154184 r155217 21 21 #include "config.h" 22 22 23 #include "Frame.h" 23 24 #include "TiledBackingStore.h" 24 25 #include "ewk_paint_context_private.h" -
trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
r154314 r155217 30 30 #import "WebFrameView.h" 31 31 #import "WebHTMLViewInternal.h" 32 #import <WebCore/Frame.h> 32 33 #import <WebCore/FrameView.h> 33 34 #import <WebKitSystemInterface.h>
Note: See TracChangeset
for help on using the changeset viewer.