diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/page/Frame.h | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebCore/page/Frame.h')
| -rw-r--r-- | WebCore/page/Frame.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h index 36803f8..eb3cdba 100644 --- a/WebCore/page/Frame.h +++ b/WebCore/page/Frame.h @@ -164,10 +164,6 @@ namespace WebCore { void clearTimers(); static void clearTimers(FrameView*, Document*); - void setNeedsReapplyStyles(); - bool needsReapplyStyles() const; - void reapplyStyles(); - String documentTypeString() const; // This method -- and the corresponding list of former DOM windows -- @@ -197,7 +193,6 @@ namespace WebCore { void setMark(const VisibleSelection&); void computeAndSetTypingStyle(CSSStyleDeclaration* , EditAction = EditActionUnspecified); - String selectionStartStylePropertyValue(int stylePropertyID) const; void applyEditingStyleToBodyElement() const; void applyEditingStyleToElement(Element*) const; @@ -208,7 +203,7 @@ namespace WebCore { RenderStyle* styleForSelectionStart(Node*& nodeToRemove) const; - unsigned markAllMatchesForText(const String&, bool caseFlag, unsigned limit); + unsigned countMatchesForText(const String&, bool caseFlag, unsigned limit, bool markMatches); bool markedTextMatchesAreHighlighted() const; void setMarkedTextMatchesAreHighlighted(bool flag); @@ -329,7 +324,6 @@ namespace WebCore { bool m_highlightTextMatches; bool m_inViewSourceMode; - bool m_needsReapplyStyles; bool m_isDisconnected; bool m_excludeFromTextSearch; @@ -398,11 +392,6 @@ namespace WebCore { m_mark = s; } - inline bool Frame::needsReapplyStyles() const - { - return m_needsReapplyStyles; - } - inline CSSMutableStyleDeclaration* Frame::typingStyle() const { return m_typingStyle.get(); |