fixup! Implement Chromium Theme for Tizen.

Since https://codereview.chromium.org/738113003,
LayoutTheme::theme method is not defined in LayoutThemeChromiumDefault
anymore. Instead, each subclass (Win,Android,Mac and Tizen)
that needs a implementation of ::theme adds its own.

Following that, Efl/Tizen port can now have its own
implementation of LayoutTheme::theme without the
RenderThemeChromiumDefault_override hack.

Patch removes the hack, accordingly.
Reviewed by: Balazs Kelemen, SeungSeop Park, arno renevier

Change-Id: I5cdaa53abe0d39d8afd701361337dbcda29ec936
Signed-off-by: Antonio Gomes <a1.gomes@samsung.com>

diff --git a/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi b/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi
index 9652aee..9c8e6bc 100644 (file)
--- a/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi
+++ b/tizen_src/chromium_impl/third_party/WebKit/Source/core/core_efl.gypi
@@ -8,11 +8,9 @@
 
       ['_target_name=="webcore_rendering"', {
         'sources/': [
-          [ 'exclude', 'layout/LayoutThemeChromiumDefault\\.cpp$' ],
           [ 'exclude', 'layout/LayoutThemeChromiumLinux\\.cpp$' ],
         ],
         'sources': [
-          'rendering/RenderThemeChromiumDefault_override.cpp',
           'rendering/RenderThemeChromiumTizen.cpp',
           'rendering/RenderThemeChromiumTizen.h',
         ],

diff --git a/tizen_src/chromium_impl/third_party/WebKit/Source/core/rendering/RenderThemeChromiumDefault_override.cpp b/tizen_src/chromium_impl/third_party/WebKit/Source/core/rendering/RenderThemeChromiumDefault_override.cpp
deleted file mode 100644 (file)
index 2ff49ba..0000000
--- a/tizen_src/chromium_impl/third_party/WebKit/Source/core/rendering/RenderThemeChromiumDefault_override.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Define theme method to something else, because we want to have our own
-#define theme not_theme
-#include "third_party/WebKit/Source/core/layout/LayoutThemeChromiumDefault.cpp"

diff --git a/tizen_src/chromium_impl/third_party/WebKit/Source/core/rendering/RenderThemeChromiumTizen.h b/tizen_src/chromium_impl/third_party/WebKit/Source/core/rendering/RenderThemeChromiumTizen.h
index 0faaa8d..ee605fc 100644 (file)
--- a/tizen_src/chromium_impl/third_party/WebKit/Source/core/rendering/RenderThemeChromiumTizen.h
+++ b/tizen_src/chromium_impl/third_party/WebKit/Source/core/rendering/RenderThemeChromiumTizen.h
@@ -12,12 +12,12 @@ namespace blink {
 class RenderThemeChromiumTizen final : public LayoutThemeChromiumDefault {
 public:
     static PassRefPtr<LayoutTheme> create();
-    virtual String extraDefaultStyleSheet() override;
+    String extraDefaultStyleSheet() override;
 
-    virtual bool delegatesMenuListRendering() const override { return true; }
+    bool delegatesMenuListRendering() const override { return true; }
 
 private:
-    virtual ~RenderThemeChromiumTizen();
+    ~RenderThemeChromiumTizen() override;
 };
 
 } // namespace blink