LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590

Browse Source 
Change-Id: Id521afd66935db6149a341f89ab6b4d7440e4695
This commit is contained in:
Ben Murdoch
2010-05-12 14:09:26 +01:00
parent edb8628b41
commit 3b6f45dbd2
16 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/BrowserPlugin/jni/form/FormPlugin.cpp
View File

@@ -43,12 +43,12 @@ static void inval(NPP instance) {
browser->invalidaterect(instance, NULL);
}
static uint16 rnd16(float x, int inset) {
static uint16_t rnd16(float x, int inset) {
int ix = (int)roundf(x) + inset;
if (ix < 0) {
ix = 0;
}
return static_cast<uint16>(ix);
return static_cast<uint16_t>(ix);
}
static void inval(NPP instance, const ANPRectF& r, bool doAA) {
@@ -199,7 +199,7 @@ void FormPlugin::drawPassword(ANPCanvas* canvas, TextInput passwordInput) {
}
}
int16 FormPlugin::handleEvent(const ANPEvent* evt) {
int16_t FormPlugin::handleEvent(const ANPEvent* evt) {
NPP instance = this->inst();
switch (evt->eventType) {