Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(841)

Unified Diff: Source/core/rendering/RenderingTestHelper.h

Issue 688703003: [New Multicolumn] Add RenderMultiColumnSpannerSet. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: There won't ever be any intervening non-multicol fragmentation contexts. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderPagedFlowThread.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderingTestHelper.h
diff --git a/Source/core/rendering/RenderingTestHelper.h b/Source/core/rendering/RenderingTestHelper.h
index d22eb520612bc1ed216cc12c90cb192f1c79972f..83b578f955775a35eec3eda5df7aade81422689d 100644
--- a/Source/core/rendering/RenderingTestHelper.h
+++ b/Source/core/rendering/RenderingTestHelper.h
@@ -4,6 +4,7 @@
#include "core/dom/Document.h"
#include "core/frame/FrameView.h"
+#include "core/frame/Settings.h"
#include "core/html/HTMLElement.h"
#include "core/testing/DummyPageHolder.h"
#include "wtf/OwnPtr.h"
@@ -17,6 +18,8 @@ protected:
{
m_pageHolder = DummyPageHolder::create(IntSize(800, 600));
+ document().settings()->setRegionBasedColumnsEnabled(true);
+
// This ensures that the minimal DOM tree gets attached
// correctly for tests that don't call setBodyInnerHTML.
document().view()->updateLayoutAndStyleIfNeededRecursive();
@@ -24,9 +27,9 @@ protected:
Document& document() const { return m_pageHolder->document(); }
- void setBodyInnerHTML(const char* htmlContent)
+ void setBodyInnerHTML(const String& htmlContent)
{
- document().body()->setInnerHTML(String::fromUTF8(htmlContent), ASSERT_NO_EXCEPTION);
+ document().body()->setInnerHTML(htmlContent, ASSERT_NO_EXCEPTION);
document().view()->updateLayoutAndStyleIfNeededRecursive();
}
« no previous file with comments | « Source/core/rendering/RenderPagedFlowThread.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698