121200 – Merge RenderPart into RenderWidget.

Bug 121200 - Merge RenderPart into RenderWidget.

Summary: Merge RenderPart into RenderWidget.

Status:	RESOLVED FIXED

Alias:	None

Product:	WebKit
Classification:	Unclassified
Component:	Layout and Rendering (show other bugs)
Version:	528+ (Nightly build)
Hardware:	Unspecified Unspecified

Importance:	P2 Normal
Assignee:	Andreas Kling

URL:
Keywords:

Depends on:
Blocks:

Reported:	2013-09-11 18:47 PDT by Andreas Kling
Modified:	2013-09-16 12:57 PDT (History)
CC List:	3 users (show)

See Also:

Attachments
Patch (62.76 KB, patch) 2013-09-11 18:52 PDT, Andreas Kling	no flags	Details \| Formatted Diff \| Diff
Patch (62.93 KB, patch) 2013-09-11 19:13 PDT, Andreas Kling	no flags	Details \| Formatted Diff \| Diff
Patch (62.83 KB, patch) 2013-09-11 19:32 PDT, Andreas Kling	no flags	Details \| Formatted Diff \| Diff
Patch (63.15 KB, patch) 2013-09-11 21:36 PDT, Andreas Kling	no flags	Details \| Formatted Diff \| Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Andreas Kling 2013-09-11 18:47:57 PDT

Merge RenderPart into RenderWidget.

Comment 1 Andreas Kling 2013-09-11 18:52:23 PDT

Created attachment 211379 [details]
Patch

Comment 2 WebKit Commit Bot 2013-09-11 18:53:49 PDT

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.

Comment 3 Andreas Kling 2013-09-11 19:13:58 PDT

Created attachment 211381 [details]
Patch

Comment 4 Andreas Kling 2013-09-11 19:32:47 PDT

Created attachment 211388 [details]
Patch

Comment 5 Andreas Kling 2013-09-11 21:36:13 PDT

Created attachment 211393 [details]
Patch

Comment 6 Andreas Kling 2013-09-11 22:20:21 PDT

Comment on attachment 211393 [details]
Patch

Clearing flags on attachment: 211393

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

Comment 7 Andreas Kling 2013-09-11 22:20:27 PDT

All reviewed patches have been landed.  Closing bug.

Comment 8 Daniel Bates 2013-09-16 12:57:06 PDT

(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.