diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a /WebCore/html | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Diffstat (limited to 'WebCore/html')
| -rw-r--r-- | WebCore/html/HTMLInputElement.cpp | 3 | ||||
| -rw-r--r-- | WebCore/html/HTMLMediaElement.cpp | 9 |
2 files changed, 0 insertions, 12 deletions
diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp index 5689e73..5050237 100644 --- a/WebCore/html/HTMLInputElement.cpp +++ b/WebCore/html/HTMLInputElement.cpp @@ -60,13 +60,10 @@ #include "RenderTextControlSingleLine.h" #include "RenderTheme.h" #include "TextEvent.h" -<<<<<<< HEAD:WebCore/html/HTMLInputElement.cpp #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS #include "WebViewCore.h" #endif -======= #include <wtf/MathExtras.h> ->>>>>>> webkit.org at 49305:WebCore/html/HTMLInputElement.cpp #include <wtf/StdLibExtras.h> using namespace std; diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp index e90db4a..0136e08 100644 --- a/WebCore/html/HTMLMediaElement.cpp +++ b/WebCore/html/HTMLMediaElement.cpp @@ -1630,20 +1630,11 @@ void HTMLMediaElement::updatePlayState() m_playbackProgressTimer.stop(); m_playing = false; float time = currentTime(); -<<<<<<< HEAD:WebCore/html/HTMLMediaElement.cpp - if (m_lastSeekTime < time) - m_playedTimeRanges->add(m_lastSeekTime, time); -======= if (time > m_lastSeekTime) addPlayedRange(m_lastSeekTime, time); ->>>>>>> webkit.org at 49305:WebCore/html/HTMLMediaElement.cpp } else if (couldPlayIfEnoughData() && playerPaused) m_player->prepareToPlay(); -<<<<<<< HEAD:WebCore/html/HTMLMediaElement.cpp - -======= ->>>>>>> webkit.org at 49305:WebCore/html/HTMLMediaElement.cpp if (renderer()) renderer()->updateFromElement(); } |