From: Gyuyoung Kim <gyuyoung.kim@samsung.com>
Date: Mon, 15 Jul 2013 09:52:44 +0000 (+0900)
Subject: Remove work-around patch for naver
X-Git-Tag: submit/tizen_2.2/20130716.180414~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=093248aa99ddbce54d94191190dc0d068ec786b9;hp=1636b9db6646c0e467438cd67065a13ed747fabd;p=framework%2Fweb%2Fwebkit-efl.git

Remove work-around patch for naver

[Title] Remove work-around patch for naver
[Issue#] N_SE-46200
[Problem] Browser comes to crash when url is null in a work-around patch.
[Cause] There is no null check
[Solution] Remove it because the patch is not needed anymore

Change-Id: I4a946fa3c23b10188f601f5e1fe5df5f90e3a9e3
---

diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h
index 5fdf20e..eb85774 100755
--- a/Source/WebCore/loader/EmptyClients.h
+++ b/Source/WebCore/loader/EmptyClients.h
@@ -169,11 +169,6 @@ public:
     virtual PlatformPageClient platformPageClient() const { return 0; }
     virtual void contentsSizeChanged(Frame*, const IntSize&) const { }
 
-#if ENABLE(TIZEN_VIEWPORT_META_TAG)
-    virtual bool canContentsSizeChange(Frame*, const IntSize&) const { return true; }
-#endif
-
-
     virtual void scrollbarsModeDidChange() const { }
     virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned) { }
 
diff --git a/Source/WebCore/page/Chrome.cpp b/Source/WebCore/page/Chrome.cpp
index 3abff29..b18f505 100644
--- a/Source/WebCore/page/Chrome.cpp
+++ b/Source/WebCore/page/Chrome.cpp
@@ -131,13 +131,6 @@ PlatformPageClient Chrome::platformPageClient() const
     return m_client->platformPageClient();
 }
 
-#if ENABLE(TIZEN_VIEWPORT_META_TAG)
-bool Chrome::canContentsSizeChange(Frame* frame, const IntSize& size) const
-{
-    return m_client->canContentsSizeChange(frame, size);
-}
-#endif
-
 void Chrome::contentsSizeChanged(Frame* frame, const IntSize& size) const
 {
     m_client->contentsSizeChanged(frame, size);
diff --git a/Source/WebCore/page/Chrome.h b/Source/WebCore/page/Chrome.h
index 4a0285b..970191e 100644
--- a/Source/WebCore/page/Chrome.h
+++ b/Source/WebCore/page/Chrome.h
@@ -95,10 +95,6 @@ namespace WebCore {
 
         void scrollRectIntoView(const IntRect&) const;
 
-#if ENABLE(TIZEN_VIEWPORT_META_TAG)
-        bool canContentsSizeChange(Frame*, const IntSize&) const;
-#endif
-
         void contentsSizeChanged(Frame*, const IntSize&) const;
         void layoutUpdated(Frame*) const;
 
diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
index 7775f0b..9b01a21 100755
--- a/Source/WebCore/page/ChromeClient.h
+++ b/Source/WebCore/page/ChromeClient.h
@@ -188,10 +188,6 @@ namespace WebCore {
 
         virtual void dispatchViewportPropertiesDidChange(const ViewportArguments&) const { }
 
-#if ENABLE(TIZEN_VIEWPORT_META_TAG)
-        virtual bool canContentsSizeChange(Frame*, const IntSize&) const = 0;
-#endif
-
         virtual void contentsSizeChanged(Frame*, const IntSize&) const = 0;
         virtual void layoutUpdated(Frame*) const { }
         virtual void scrollRectIntoView(const IntRect&) const { }; // Currently only Mac has a non empty implementation.
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index fac4c62..8c42246 100755
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -533,32 +533,14 @@ void FrameView::setContentsSize(const IntSize& size)
     if (size == contentsSize())
         return;
 
-#if ENABLE(TIZEN_VIEWPORT_META_TAG)
-    Page* page = frame() ? frame()->page() : 0;
-    if (!page)
-        return;
-
-    // According to decision of port, content size can be changed.
-    if (!page->chrome()->canContentsSizeChange(frame(), size)) {
-        // FIXME: This patch should be removed when unexpected layout change problem is fixed.
-        m_deferSetNeedsLayouts++;
-        ScrollView::setContentsSize(IntSize(fixedLayoutSize().width(), size.height()));
-    } else {
-        m_deferSetNeedsLayouts++;
-        ScrollView::setContentsSize(size);
-    }
-#else
     m_deferSetNeedsLayouts++;
     ScrollView::setContentsSize(size);
-#endif
 
     ScrollView::contentsResized();
 
-#if !ENABLE(TIZEN_VIEWPORT_META_TAG)
     Page* page = frame() ? frame()->page() : 0;
     if (!page)
         return;
-#endif
 
     updateScrollableAreaSet();