Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (135717 => 135718)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-26 14:47:40 UTC (rev 135717)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-26 15:01:24 UTC (rev 135718)
@@ -1,3 +1,17 @@
+2012-11-26 Scott Violet <[email protected]>
+
+ [chromium] Make use_default_render_theme compile the right set of files
+ https://bugs.webkit.org/show_bug.cgi?id=102952
+
+ Reviewed by Kent Tamura.
+
+ * WebKit.gyp: Adds WebRenderTheme.* and updates rules as to when to compile them.
+ * features.gypi: Removes use_default_render_theme default values as common.gypi sets them.
+ * public/default: Added.
+ * public/default/WebRenderTheme.h: Copy of linux/WebRenderTheme.h
+ * src/default: Added.
+ * src/default/WebRenderTheme.cpp: Copy of linux/WebRenderTheme.cpp
+
2012-11-24 Silvia Pfeiffer <[email protected]>
[chromium] Remove traces of MediaControlRootElement
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (135717 => 135718)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-11-26 14:47:40 UTC (rev 135717)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-11-26 15:01:24 UTC (rev 135718)
@@ -288,6 +288,7 @@
'public/WebWorkerInfo.h',
'public/android/WebInputEventFactory.h',
'public/android/WebSandboxSupport.h',
+ 'public/default/WebRenderTheme.h',
'public/gtk/WebInputEventFactory.h',
'public/linux/WebFontRenderStyle.h',
'public/linux/WebFontRendering.h',
@@ -432,6 +433,7 @@
'src/PrerendererClientImpl.h',
'src/PrerendererClientImpl.cpp',
'src/android/WebInputEventFactory.cpp',
+ 'src/default/WebRenderTheme.cpp',
'src/linux/WebFontInfo.cpp',
'src/linux/WebFontRendering.cpp',
'src/linux/WebFontRenderStyle.cpp',
@@ -840,6 +842,20 @@
}],
],
}],
+ ['use_default_render_theme==1', {
+ 'sources/': [
+ ['exclude', 'src/linux/WebRenderTheme.cpp'],
+ ['exclude', 'public/linux/WebRenderTheme.h'],
+ ],
+ 'include_dirs': [
+ 'public/default',
+ ],
+ }, { # else use_default_render_theme==0
+ 'sources/': [
+ ['exclude', 'src/default/WebRenderTheme.cpp'],
+ ['exclude', 'public/default/WebRenderTheme.h'],
+ ],
+ }],
],
'target_conditions': [
['OS=="android"', {
Modified: trunk/Source/WebKit/chromium/features.gypi (135717 => 135718)
--- trunk/Source/WebKit/chromium/features.gypi 2012-11-26 14:47:40 UTC (rev 135717)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-11-26 15:01:24 UTC (rev 135718)
@@ -146,13 +146,11 @@
'enable_touch_events%': 1,
'enable_touch_icon_loading%' : 0,
'enable_mutation_observers%': 1,
- 'use_default_render_theme%': 0,
},
'use_accelerated_compositing%': '<(use_accelerated_compositing)',
'enable_skia_text%': '<(enable_skia_text)',
'enable_svg%': '<(enable_svg)',
'enable_touch_events%': '<(enable_touch_events)',
- 'use_default_render_theme%': '<(use_default_render_theme)',
'conditions': [
['OS=="android"', {
'feature_defines': [
Added: trunk/Source/WebKit/chromium/public/default/WebRenderTheme.h (0 => 135718)
--- trunk/Source/WebKit/chromium/public/default/WebRenderTheme.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/default/WebRenderTheme.h 2012-11-26 15:01:24 UTC (rev 135718)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2009 Joel Stanley. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebRenderTheme_h
+#define WebRenderTheme_h
+
+#include "../platform/WebCommon.h"
+
+namespace WebKit {
+
+// Set caret blink interval for text input areas.
+WEBKIT_EXPORT void setCaretBlinkInterval(double);
+
+} // namespace WebKit
+
+#endif
Added: trunk/Source/WebKit/chromium/src/default/WebRenderTheme.cpp (0 => 135718)
--- trunk/Source/WebKit/chromium/src/default/WebRenderTheme.cpp (rev 0)
+++ trunk/Source/WebKit/chromium/src/default/WebRenderTheme.cpp 2012-11-26 15:01:24 UTC (rev 135718)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 Joel Stanley. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebRenderTheme.h"
+
+#include "RenderThemeChromiumDefault.h"
+#include "WebView.h"
+
+using WebCore::RenderTheme;
+using WebCore::RenderThemeChromiumDefault;
+
+namespace WebKit {
+
+void setCaretBlinkInterval(double interval)
+{
+ RenderThemeChromiumDefault::setCaretBlinkInterval(interval);
+}
+
+} // namespace WebKit
