diff options
Diffstat (limited to 'WebCore/rendering')
| -rw-r--r-- | WebCore/rendering/RenderTableCell.h | 9 | ||||
| -rw-r--r-- | WebCore/rendering/style/StyleRareInheritedData.cpp | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/WebCore/rendering/RenderTableCell.h b/WebCore/rendering/RenderTableCell.h index 3eccfbd..9532bb6 100644 --- a/WebCore/rendering/RenderTableCell.h +++ b/WebCore/rendering/RenderTableCell.h @@ -55,16 +55,13 @@ public: virtual void calcPrefWidths(); -#ifdef MANUAL_MERGE_REQUIRED - virtual void calcPrefWidths(); - virtual void calcWidth(); +#if PLATFORM(ANDROID) #ifdef ANDROID_LAYOUT // RenderTableSection needs to access this in setCellWidths() int getVisibleWidth() { return m_visibleWidth; } -#endif +#endif +#endif -#else // MANUAL_MERGE_REQUIRED -#endif // MANUAL_MERGE_REQUIRED void updateWidth(int); int borderLeft() const; diff --git a/WebCore/rendering/style/StyleRareInheritedData.cpp b/WebCore/rendering/style/StyleRareInheritedData.cpp index a765a46..0f3b7e7 100644 --- a/WebCore/rendering/style/StyleRareInheritedData.cpp +++ b/WebCore/rendering/style/StyleRareInheritedData.cpp @@ -86,13 +86,10 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const && nbspMode == o.nbspMode && khtmlLineBreak == o.khtmlLineBreak && textSizeAdjust == o.textSizeAdjust -#ifdef MANUAL_MERGE_REQUIRED #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR && tapHighlightColor == o.tapHighlightColor #endif -#else // MANUAL_MERGE_REQUIRED && resize == o.resize -#endif // MANUAL_MERGE_REQUIRED && userSelect == o.userSelect; } |