Title: [120741] trunk/Source/WebCore
- Revision
- 120741
- Author
- [email protected]
- Date
- 2012-06-19 12:09:49 -0700 (Tue, 19 Jun 2012)
Log Message
Fix link error with fillWithEmptyClients
https://bugs.webkit.org/show_bug.cgi?id=89484
Patch by Alexandre Elias <[email protected]> on 2012-06-19
Reviewed by Ryosuke Niwa.
fillWithEmptyClients() was within #if ENABLE() guard in the .cpp file
but not in the header. There is now a caller unrelated to these ENABLEs
in WebHelperPluginImpl, so linking fails if both SVG and PAGE_POPUP
are disabled.
This function looks generic, so just remove the ENABLE guards.
No new tests. (Build fix.)
* loader/EmptyClients.cpp:
(WebCore::fillWithEmptyClients):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120740 => 120741)
--- trunk/Source/WebCore/ChangeLog 2012-06-19 18:27:29 UTC (rev 120740)
+++ trunk/Source/WebCore/ChangeLog 2012-06-19 19:09:49 UTC (rev 120741)
@@ -1,3 +1,22 @@
+2012-06-19 Alexandre Elias <[email protected]>
+
+ Fix link error with fillWithEmptyClients
+ https://bugs.webkit.org/show_bug.cgi?id=89484
+
+ Reviewed by Ryosuke Niwa.
+
+ fillWithEmptyClients() was within #if ENABLE() guard in the .cpp file
+ but not in the header. There is now a caller unrelated to these ENABLEs
+ in WebHelperPluginImpl, so linking fails if both SVG and PAGE_POPUP
+ are disabled.
+
+ This function looks generic, so just remove the ENABLE guards.
+
+ No new tests. (Build fix.)
+
+ * loader/EmptyClients.cpp:
+ (WebCore::fillWithEmptyClients):
+
2012-06-19 Abhishek Arya <[email protected]>
Crash in RenderInline::willBeDestroyed.
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (120740 => 120741)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2012-06-19 18:27:29 UTC (rev 120740)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2012-06-19 19:09:49 UTC (rev 120741)
@@ -45,7 +45,6 @@
namespace WebCore {
-#if ENABLE(SVG) || ENABLE(PAGE_POPUP)
void fillWithEmptyClients(Page::PageClients& pageClients)
{
#if ENABLE(CONTEXT_MENUS)
@@ -64,7 +63,6 @@
static InspectorClient* dummyInspectorClient = adoptPtr(new EmptyInspectorClient).leakPtr();
pageClients.inspectorClient = dummyInspectorClient;
}
-#endif
class EmptyPopupMenu : public PopupMenu {
public:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
