Bug 121200 – Merge RenderPart into RenderWidget.

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[Andreas Kling]

Merge RenderPart into RenderWidget.

[Andreas Kling]

Created attachment 211379 [details]
Patch

[WebKit Commit Bot]

Attachment 211379 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/CMakeLists.txt', u'Source/WebCore/ChangeLog', u'Source/WebCore/GNUmakefile.list.am', u'Source/WebCore/Target.pri', u'Source/WebCore/WebCore.exp.in', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/accessibility/AccessibilityScrollView.cpp', u'Source/WebCore/editing/Editor.cpp', u'Source/WebCore/html/HTMLAppletElement.cpp', u'Source/WebCore/html/HTMLFrameElementBase.cpp', u'Source/WebCore/html/HTMLFrameOwnerElement.cpp', u'Source/WebCore/html/HTMLFrameOwnerElement.h', u'Source/WebCore/html/HTMLObjectElement.cpp', u'Source/WebCore/html/HTMLPlugInImageElement.cpp', u'Source/WebCore/html/PluginDocument.cpp', u'Source/WebCore/html/shadow/MediaControlElements.cpp', u'Source/WebCore/loader/SubframeLoader.cpp', u'Source/WebCore/page/Frame.cpp', u'Source/WebCore/page/Frame.h', u'Source/WebCore/page/FrameView.cpp', u'Source/WebCore/rendering/RenderEmbeddedObject.cpp', u'Source/WebCore/rendering/RenderEmbeddedObject.h', u'Source/WebCore/rendering/RenderFrameBase.cpp', u'Source/WebCore/rendering/RenderFrameBase.h', u'Source/WebCore/rendering/RenderLayerBacking.cpp', u'Source/WebCore/rendering/RenderLayerCompositor.cpp', u'Source/WebCore/rendering/RenderLayerCompositor.h', u'Source/WebCore/rendering/RenderObject.h', u'Source/WebCore/rendering/RenderPart.cpp', u'Source/WebCore/rendering/RenderPart.h', u'Source/WebCore/rendering/RenderScrollbar.cpp', u'Source/WebCore/rendering/RenderTreeAsText.cpp', u'Source/WebCore/rendering/RenderWidget.cpp', u'Source/WebCore/rendering/RenderWidget.h', u'Source/WebCore/rendering/svg/RenderSVGRoot.cpp', u'Source/WebCore/svg/SVGLengthContext.cpp', u'Source/WebCore/svg/SVGSVGElement.cpp', u'Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp', u'Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp', u'Source/WebKit/mac/WebView/WebFrame.mm', u'Source/WebKit/mac/WebView/WebFrameView.mm', u'Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp', u'Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp', u'Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp']" exit_code: 1
Source/WebCore/rendering/RenderWidget.cpp:31:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 32 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Andreas Kling]

Created attachment 211381 [details]
Patch

[Andreas Kling]

Created attachment 211388 [details]
Patch

[Andreas Kling]

Created attachment 211393 [details]
Patch

[Andreas Kling]

Comment on attachment 211393 [details]
Patch

Clearing flags on attachment: 211393

Committed r155591: <http://trac.webkit.org/changeset/155591>

[Andreas Kling]

All reviewed patches have been landed.  Closing bug.

[Daniel Bates]

(In reply to comment #6)
> (From update of attachment 211393 [details])
> Clearing flags on attachment: 211393
> 
> Committed r155591: <http://trac.webkit.org/changeset/155591>

Committed build fix in <http://trac.webkit.org/changeset/155892> for ports that build with PLUGIN_PROXY_FOR_VIDEO enabled, such as iOS WebKit. I substituted isWidget() for isRenderWidget() as the latter doesn't exist.