Diff
Modified: trunk/Source/WebCore/ChangeLog (147919 => 147920)
--- trunk/Source/WebCore/ChangeLog 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/ChangeLog 2013-04-08 16:51:01 UTC (rev 147920)
@@ -1,3 +1,33 @@
+2013-04-08 Zan Dobersek <[email protected]>
+
+ Remove WebCore::(enable|disable)SecureTextInput methods
+ https://bugs.webkit.org/show_bug.cgi?id=114126
+
+ Reviewed by Alexey Proskuryakov.
+
+ Remove the enableSecureTextInput and disableSecureTextInput methods and all the codepaths leading to them.
+ These were used only by the Chromium port and are as such not required anymore.
+
+ No new tests - no changes in functionality.
+
+ * GNUmakefile.list.am:
+ * WebCore.order:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ * dom/Document.h:
+ (Document):
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::focusedOrActiveStateChanged):
+ * editing/FrameSelection.h:
+ (FrameSelection):
+ * html/PasswordInputType.cpp:
+ * html/PasswordInputType.h:
+ (PasswordInputType):
+ * page/Frame.cpp:
+ (WebCore::Frame::setDocument):
+ * platform/SecureTextInput.h: Removed.
+
2013-04-08 Jer Noble <[email protected]>
Unreviewed build fix; r147892 moved an export definition out of
Modified: trunk/Source/WebCore/GNUmakefile.list.am (147919 => 147920)
--- trunk/Source/WebCore/GNUmakefile.list.am 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-04-08 16:51:01 UTC (rev 147920)
@@ -6014,7 +6014,6 @@
Source/WebCore/platform/ScrollView.cpp \
Source/WebCore/platform/ScrollView.h \
Source/WebCore/platform/SearchPopupMenu.h \
- Source/WebCore/platform/SecureTextInput.h \
Source/WebCore/platform/SharedBuffer.cpp \
Source/WebCore/platform/SharedBuffer.h \
Source/WebCore/platform/SharedBufferChunkReader.cpp \
Modified: trunk/Source/WebCore/WebCore.order (147919 => 147920)
--- trunk/Source/WebCore/WebCore.order 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/WebCore.order 2013-04-08 16:51:01 UTC (rev 147920)
@@ -1532,7 +1532,6 @@
__ZN7WebCore16enclosingIntRectERKNS_9FloatRectE
__ZN7WebCore10RenderView41repaintRectangleInViewAndCompositedLayersERKNS_7IntRectEb
__ZN7WebCore12EventHandler27capsLockStateMayHaveChangedEv
-__ZNK7WebCore8Document32useSecureKeyboardEntryWhenActiveEv
__ZNK7WebCore6Editor7canEditEv
__ZNK7WebCore16VisibleSelection19rootEditableElementEv
__ZN7WebCore23editableRootForPositionERKNS_8PositionE
@@ -7829,7 +7828,6 @@
__ZN7WebCore17PasswordInputType31shouldResetOnDocumentActivationEv
__ZN7WebCore11RenderStyle15setTextSecurityENS_13ETextSecurityE
__ZNK7WebCore17PasswordInputType15isPasswordFieldEv
-__ZN7WebCore8Document35setUseSecureKeyboardEntryWhenActiveEb
__ZN7WebCore21PlatformKeyboardEvent20currentCapsLockStateEv
__ZNK7WebCore17PasswordInputType20shouldUseInputMethodEv
-[AccessibilityObjectWrapper textMarkerRangeFromVisiblePositions:endPosition:]
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (147919 => 147920)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-04-08 16:51:01 UTC (rev 147920)
@@ -950,7 +950,6 @@
3390CA550FFC157B00921962 /* NotificationCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3390CA510FFC157B00921962 /* NotificationCenter.cpp */; };
3390CA560FFC157B00921962 /* NotificationCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3390CA520FFC157B00921962 /* NotificationCenter.h */; };
339B5B63131DAA3200F48D02 /* CookiesStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 339B5B62131DAA3200F48D02 /* CookiesStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 33C0CCD5112C5E6200CE057D /* SecureTextInput.h in Headers */ = {isa = PBXBuildFile; fileRef = 33C0CCD3112C5E6200CE057D /* SecureTextInput.h */; };
33D0212D131DB37B004091A8 /* CookieStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E13F01EA1270E10D00DFBA71 /* CookieStorage.h */; settings = {ATTRIBUTES = (Private, ); }; };
371941961566B37200A276D8 /* WebCoreNSCellExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 371941941566B37200A276D8 /* WebCoreNSCellExtras.m */; };
371941971566B37200A276D8 /* WebCoreNSCellExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 371941951566B37200A276D8 /* WebCoreNSCellExtras.h */; };
@@ -7263,7 +7262,6 @@
3390CA520FFC157B00921962 /* NotificationCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotificationCenter.h; path = Modules/notifications/NotificationCenter.h; sourceTree = "<group>"; };
3390CA530FFC157B00921962 /* NotificationCenter.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NotificationCenter.idl; path = Modules/notifications/NotificationCenter.idl; sourceTree = "<group>"; };
339B5B62131DAA3200F48D02 /* CookiesStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CookiesStrategy.h; sourceTree = "<group>"; };
- 33C0CCD3112C5E6200CE057D /* SecureTextInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SecureTextInput.h; sourceTree = "<group>"; };
371941941566B37200A276D8 /* WebCoreNSCellExtras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebCoreNSCellExtras.m; sourceTree = "<group>"; };
371941951566B37200A276D8 /* WebCoreNSCellExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreNSCellExtras.h; sourceTree = "<group>"; };
371A67CA11C6C7DB00047B8B /* HyphenationCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HyphenationCF.cpp; sourceTree = "<group>"; };
@@ -19370,7 +19368,6 @@
BC2441C30E8B65D00055320F /* ScrollView.cpp */,
BC6D6E2509AF943500F59759 /* ScrollView.h */,
AB7170880B3118080017123E /* SearchPopupMenu.h */,
- 33C0CCD3112C5E6200CE057D /* SecureTextInput.h */,
1A4A954B0B4EDCCB002D8C3C /* SharedBuffer.cpp */,
1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */,
37569E0013AF172C00CDBA8E /* SharedBufferChunkReader.cpp */,
@@ -23351,7 +23348,6 @@
F55B3DD21251F12D003EF269 /* SearchInputType.h in Headers */,
AB7170890B3118080017123E /* SearchPopupMenu.h in Headers */,
D39D009D11F907E6006041F2 /* SearchPopupMenuMac.h in Headers */,
- 33C0CCD5112C5E6200CE057D /* SecureTextInput.h in Headers */,
976F36EB14686225005E93B4 /* SecurityContext.h in Headers */,
BCD0E0FB0E972C3500265DEA /* SecurityOrigin.h in Headers */,
BCD0E0FC0E972C3500265DEA /* SecurityOriginHash.h in Headers */,
Modified: trunk/Source/WebCore/dom/Document.cpp (147919 => 147920)
--- trunk/Source/WebCore/dom/Document.cpp 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-04-08 16:51:01 UTC (rev 147920)
@@ -453,7 +453,6 @@
, m_createRenderers(true)
, m_inPageCache(false)
, m_accessKeyMapValid(false)
- , m_useSecureKeyboardEntryWhenActive(false)
, m_isXHTML(isXHTML)
, m_isHTML(isHTML)
, m_isViewSource(false)
@@ -4612,20 +4611,6 @@
f->loader()->didChangeIcons(iconType);
}
-void Document::setUseSecureKeyboardEntryWhenActive(bool usesSecureKeyboard)
-{
- if (m_useSecureKeyboardEntryWhenActive == usesSecureKeyboard)
- return;
-
- m_useSecureKeyboardEntryWhenActive = usesSecureKeyboard;
- m_frame->selection()->updateSecureKeyboardEntryIfActive();
-}
-
-bool Document::useSecureKeyboardEntryWhenActive() const
-{
- return m_useSecureKeyboardEntryWhenActive;
-}
-
static bool isEligibleForSeamless(Document* parent, Document* child)
{
// It should not matter what we return for the top-most document.
Modified: trunk/Source/WebCore/dom/Document.h (147919 => 147920)
--- trunk/Source/WebCore/dom/Document.h 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/dom/Document.h 2013-04-08 16:51:01 UTC (rev 147920)
@@ -933,9 +933,6 @@
const Vector<IconURL>& iconURLs(int iconTypesMask);
void addIconURL(const String& url, const String& mimeType, const String& size, IconType);
- void setUseSecureKeyboardEntryWhenActive(bool);
- bool useSecureKeyboardEntryWhenActive() const;
-
void updateFocusAppearanceSoon(bool restorePreviousSelection);
void cancelFocusAppearanceUpdate();
@@ -1490,8 +1487,6 @@
OwnPtr<SelectorQueryCache> m_selectorQueryCache;
- bool m_useSecureKeyboardEntryWhenActive;
-
bool m_isXHTML;
bool m_isHTML;
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (147919 => 147920)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-04-08 16:51:01 UTC (rev 147920)
@@ -57,7 +57,6 @@
#include "RenderView.h"
#include "RenderWidget.h"
#include "RenderedPosition.h"
-#include "SecureTextInput.h"
#include "Settings.h"
#include "SpatialNavigation.h"
#include "StylePropertySet.h"
@@ -1711,10 +1710,6 @@
if (renderer && renderer->style()->hasAppearance())
renderer->theme()->stateChanged(renderer, FocusState);
}
-
- // Secure keyboard entry is set by the active frame.
- if (m_frame->document()->useSecureKeyboardEntryWhenActive())
- setUseSecureKeyboardEntry(activeAndFocused);
}
void FrameSelection::pageActivationChanged()
@@ -1722,20 +1717,6 @@
focusedOrActiveStateChanged();
}
-void FrameSelection::updateSecureKeyboardEntryIfActive()
-{
- if (m_frame->document() && isFocusedAndActive())
- setUseSecureKeyboardEntry(m_frame->document()->useSecureKeyboardEntryWhenActive());
-}
-
-void FrameSelection::setUseSecureKeyboardEntry(bool enable)
-{
- if (enable)
- enableSecureTextInput();
- else
- disableSecureTextInput();
-}
-
void FrameSelection::setFocused(bool flag)
{
if (m_focused == flag)
Modified: trunk/Source/WebCore/editing/FrameSelection.h (147919 => 147920)
--- trunk/Source/WebCore/editing/FrameSelection.h 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/editing/FrameSelection.h 2013-04-08 16:51:01 UTC (rev 147920)
@@ -227,8 +227,6 @@
// Painting.
void updateAppearance();
- void updateSecureKeyboardEntryIfActive();
-
#ifndef NDEBUG
void formatForDebugger(char* buffer, unsigned length) const;
void showTreeForThis() const;
@@ -287,8 +285,6 @@
void caretBlinkTimerFired(Timer<FrameSelection>*);
- void setUseSecureKeyboardEntry(bool);
-
void setCaretVisibility(CaretVisibility);
bool dispatchSelectStart();
Modified: trunk/Source/WebCore/html/PasswordInputType.cpp (147919 => 147920)
--- trunk/Source/WebCore/html/PasswordInputType.cpp 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/html/PasswordInputType.cpp 2013-04-08 16:51:01 UTC (rev 147920)
@@ -95,18 +95,4 @@
return true;
}
-void PasswordInputType::handleFocusEvent(Node* oldFocusedNode, FocusDirection direction)
-{
- BaseTextInputType::handleFocusEvent(oldFocusedNode, direction);
- if (element()->document()->frame())
- element()->document()->setUseSecureKeyboardEntryWhenActive(true);
-}
-
-void PasswordInputType::handleBlurEvent()
-{
- if (element()->document()->frame())
- element()->document()->setUseSecureKeyboardEntryWhenActive(false);
- BaseTextInputType::handleBlurEvent();
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/html/PasswordInputType.h (147919 => 147920)
--- trunk/Source/WebCore/html/PasswordInputType.h 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/html/PasswordInputType.h 2013-04-08 16:51:01 UTC (rev 147920)
@@ -50,8 +50,6 @@
virtual bool shouldRespectListAttribute() OVERRIDE;
virtual bool shouldRespectSpeechAttribute() OVERRIDE;
virtual bool isPasswordField() const OVERRIDE;
- virtual void handleFocusEvent(Node* oldFocusedNode, FocusDirection) OVERRIDE;
- virtual void handleBlurEvent() OVERRIDE;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/page/Frame.cpp (147919 => 147920)
--- trunk/Source/WebCore/page/Frame.cpp 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/page/Frame.cpp 2013-04-08 16:51:01 UTC (rev 147920)
@@ -290,8 +290,6 @@
ASSERT(!m_doc || m_doc->domWindow());
ASSERT(!m_doc || m_doc->domWindow()->frame() == this);
- selection()->updateSecureKeyboardEntryIfActive();
-
if (m_doc && !m_doc->attached())
m_doc->attach();
Deleted: trunk/Source/WebCore/platform/SecureTextInput.h (147919 => 147920)
--- trunk/Source/WebCore/platform/SecureTextInput.h 2013-04-08 16:29:51 UTC (rev 147919)
+++ trunk/Source/WebCore/platform/SecureTextInput.h 2013-04-08 16:51:01 UTC (rev 147920)
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2009, Google Inc. 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 SecureTextInput_h
-#define SecureTextInput_h
-
-namespace WebCore {
-
-// FIXME: Remove these methods. (http://wkb.ug/114126)
-inline void enableSecureTextInput() { }
-inline void disableSecureTextInput() { }
-
-} // namespace WebCore
-
-#endif // SecureTextInput_h
