summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderTableCell.h
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/rendering/RenderTableCell.h')
-rw-r--r--WebCore/rendering/RenderTableCell.h9
1 files changed, 3 insertions, 6 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;