Fix merge error in TextAutosizer.cpp.

[Title] Fix merge error in TextAutosizer.cpp.
[Issue#] N/A
[Problem] Merge conflic messaes exist.
[Cause]
[Solution] Remove conflic message.

Change-Id: Idc926f65363dac863bb66f365665b5ae5c093926

diff --git a/Source/WebCore/rendering/TextAutosizer.cpp b/Source/WebCore/rendering/TextAutosizer.cpp
index 60f4060..13eee4c 100644 (file)
--- a/Source/WebCore/rendering/TextAutosizer.cpp
+++ b/Source/WebCore/rendering/TextAutosizer.cpp
@@ -115,13 +115,7 @@ bool TextAutosizer::processSubtree(RenderObject* layoutRoot)
     windowInfo.windowSize = m_document->settings()->textAutosizingWindowSizeOverride();
     if (windowInfo.windowSize.isEmpty()) {
         bool includeScrollbars = !InspectorInstrumentation::shouldApplyScreenWidthOverride(mainFrame);
-<<<<<<< HEAD
-        windowInfo.windowSize = mainFrame->view()->visibleContentRect(includeScrollbars).size();
-        if (!m_document->settings()->applyPageScaleFactorInCompositor())
-            windowInfo.windowSize.scale(1 / m_document->page()->deviceScaleFactor());
-=======
         windowInfo.windowSize = mainFrame->view()->unscaledVisibleContentSize(includeScrollbars ? ScrollableArea::IncludeScrollbars : ScrollableArea::ExcludeScrollbars);
->>>>>>> 91ba1f4... [chromium] Simplify computation of screenRect/windowRect.
     }
 
     // Largest area of block that can be visible at once (assuming the main